Merge branch 'develop' of netafp.com:git/netatalk into develop

diff --cc libatalk/util/netatalk_conf.c
index 787c8d2d8149ae89412daf1abf86368cbfe07857,e58f9a5fe5e47b927876222d74d1cdbeec05e7fd..c61ebe6f3071e435baa3b3d494743f5808155d7b
--- 1/libatalk/util/netatalk_conf.c
--- 2/libatalk/util/netatalk_conf.c
+++ b/libatalk/util/netatalk_conf.c
@@@ -1436,12 -1436,10 +1436,12 @@@ int afp_config_parse(AFPObj *AFPObj, ch
          options->flags |= OPTION_KEEPSESSIONS;
      if (iniparser_getboolean(config, INISEC_GLOBAL, "close vol", 0))
          options->flags |= OPTION_CLOSEVOL;
-     if (iniparser_getboolean(config, INISEC_GLOBAL, "client polling", 0))
-         options->flags &= ~OPTION_SERVERNOTIF;
+     if (!iniparser_getboolean(config, INISEC_GLOBAL, "client polling", 0))
+         options->flags |= OPTION_SERVERNOTIF;
      if (!iniparser_getboolean(config, INISEC_GLOBAL, "use sendfile", 1))
          options->flags |= OPTION_NOSENDFILE;
 +    if (iniparser_getboolean(config, INISEC_GLOBAL, "solaris share reservations", 1))
 +        options->flags |= OPTION_SHARE_RESERV;
      if (!iniparser_getboolean(config, INISEC_GLOBAL, "save password", 1))
          options->passwdbits |= PASSWD_NOSAVE;
      if (iniparser_getboolean(config, INISEC_GLOBAL, "set password", 0))