X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=etc%2Fafpd%2Fafp_dsi.c;h=697aa435c9a06f4274516f29fe472e42a184bf79;hb=371efee757ed56fd9e2f46b39fae625924d2cfc2;hp=63d2f286499db68372e57bfa1e285e7fa9273b06;hpb=ec0ae51672bb9f91be79ba28edd70ac36bf36211;p=netatalk.git diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index 63d2f286..697aa435 100644 --- a/etc/afpd/afp_dsi.c +++ b/etc/afpd/afp_dsi.c @@ -322,9 +322,10 @@ static void alarm_handler(int sig _U_) return; } - if ((err = pollvoltime(AFPobj)) == 0) + if ((err = pollvoltime(AFPobj)) == 0) { LOG(log_debug, logtype_afpd, "afp_alarm: sending DSI tickle"); err = dsi_tickle(AFPobj->dsi); + } if (err <= 0) { if (geteuid() == 0) { LOG(log_note, logtype_afpd, "afp_alarm: unauthenticated user, connection problem"); @@ -476,7 +477,7 @@ void afp_over_dsi(AFPObj *obj) /* Initialize Spotlight */ if ((obj->options.flags & OPTION_SPOTLIGHT) && (obj->options.slmod_path)) - sl_mod_load(obj->options.slmod_path); + sl_mod_load(obj); ipc_child_state(obj, DSI_RUNNING); @@ -532,7 +533,7 @@ void afp_over_dsi(AFPObj *obj) if (reload_request) { reload_request = 0; - load_volumes(AFPobj); + load_volumes(AFPobj, lv_none); } /* The first SIGINT enables debugging, the next restores the config */