Merge branch-2-1

diff --cc etc/afpd/main.c
index 85b5147fceaea4e52f35930130ca21d605179335,8f63fc6e4013ed994d0ad9e89f4916e16db1c3d5..826ea44008b5bab922db7d20cbefd8613434fbdf
--- 1/etc/afpd/main.c
--- 2/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@@ -102,27 -98,38 +100,27 @@@ static void afp_goaway(int sig
  
      dsi_kill(sig);
      switch( sig ) {
 +
      case SIGTERM :
-         LOG(log_info, logtype_afpd, "shutting down on signal %d", sig );
+         LOG(log_note, logtype_afpd, "AFP Server shutting down on SIGTERM");
 +        AFPConfig *config;
 +        for (config = configs; config; config = config->next)
 +            if (config->server_cleanup)
 +                config->server_cleanup(config);
 +        afp_exit(0);
          break;
 +
      case SIGUSR1 :
 -    case SIGHUP :
 -        /* w/ a configuration file, we can force a re-read if we want */
          nologin++;
          auth_unload();
 -        if (sig == SIGHUP || ((nologin + 1) & 1)) {
 -            AFPConfig *config;
 -
 -            LOG(log_info, logtype_afpd, "re-reading configuration file");
 -            for (config = configs; config; config = config->next)
 -                if (config->server_cleanup)
 -                    config->server_cleanup(config);
 +        LOG(log_info, logtype_afpd, "disallowing logins");        
 +        break;
  
 -            /* configfree close atp socket used for DDP tickle, there's an issue
 -             * with atp tid.
 -            */
 -            configfree(configs, NULL);
 -            if (!(configs = configinit(&default_options))) {
 -                LOG(log_error, logtype_afpd, "config re-read: no servers configured");
 -                afp_exit(EXITERR_CONF);
 -            }
 -            set_fd(Ipc_fd);
 -        } else {
 -            LOG(log_info, logtype_afpd, "disallowing logins");
 -        }
 -        if (sig == SIGHUP) {
 -            nologin = 0;
 -        }
 +    case SIGHUP :
 +        /* w/ a configuration file, we can force a re-read if we want */
 +        reloadconfig = 1;
          break;
 +
      default :
          LOG(log_error, logtype_afpd, "afp_goaway: bad signal" );
      }