netatalk: fix a crash on Solaris when registering with mDNS

[netatalk.git] / etc / afpd / afp_dsi.c

diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c
index 124db47a251af34771a60271ad3b813d1044d569..e3823de594b7d3f651d203e979df400a496644ae 100644 (file)
--- a/etc/afpd/afp_dsi.c
+++ b/etc/afpd/afp_dsi.c
@@ -436,13 +436,13 @@ void afp_over_dsi_sighandlers(AFPObj *obj)
     }
 #endif /* DEBUGGING */
 
-    /*  SIGCLD */
+    /*  SIGCHLD */
     action.sa_handler = child_handler;
 #ifdef SA_NOCLDWAIT
 /* this enhancement simplifies things for Solaris, it also improves performance */
     action.sa_flags |= SA_NOCLDWAIT;
 #endif
-    if (sigaction(SIGCLD, &action, NULL) < 0 ) {
+    if (sigaction(SIGCHLD, &action, NULL) < 0 ) {
         LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) );
         afp_dsi_die(EXITERR_SYS);
     }
@@ -493,10 +493,6 @@ void afp_over_dsi(AFPObj *obj)
     int flag = 1;
     setsockopt(dsi->socket, SOL_TCP, TCP_NODELAY, &flag, sizeof(flag));
 
-    /* Initialize Spotlight */
-    if ((obj->options.flags & OPTION_SPOTLIGHT) && (obj->options.slmod_path))
-        sl_mod_load(obj);
-
     ipc_child_state(obj, DSI_RUNNING);
 
     /* get stuck here until the end */
@@ -551,7 +547,7 @@ void afp_over_dsi(AFPObj *obj)
 
         if (reload_request) {
             reload_request = 0;
-            load_volumes(AFPobj, lv_none);
+            load_volumes(AFPobj, lv_force);
         }
 
         /* The first SIGINT enables debugging, the next restores the config */
@@ -645,7 +641,7 @@ void afp_over_dsi(AFPObj *obj)
                     replaycache[rc_idx].AFPcommand = function;
                     replaycache[rc_idx].result = err;
                 } else {
-                    LOG(log_error, logtype_afpd, "bad function %X", function);
+                    LOG(log_maxdebug, logtype_afpd, "bad function %X", function);
                     dsi->datalen = 0;
                     err = AFPERR_NOOP;
                 }