Merge branch 'branch-netatalk-3-0' into develop

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

diff --git a/etc/afpd/fce_api.c b/etc/afpd/fce_api.c
index 49dd3cd7d4d5b367616213ca9975a803f42ab046..4620378922d763010ac006a700670f5fd194fdc1 100644 (file)
--- a/etc/afpd/fce_api.c
+++ b/etc/afpd/fce_api.c
@@ -361,9 +361,10 @@ int fce_register(fce_ev_t event, const char *path, const char *oldpath, fce_obj_
         return AFP_OK;
 
     AFP_ASSERT(event >= FCE_FIRST_EVENT && event <= FCE_LAST_EVENT);
+    AFP_ASSERT(path);
 
     LOG(log_debug, logtype_fce, "register_fce(path: %s, type: %s, event: %s",
-        path , type == fce_dir ? "dir" : "file", fce_event_names[event]);
+        path, type == fce_dir ? "dir" : "file", fce_event_names[event]);
 
     bname = basename_safe(path);
 
@@ -371,8 +372,6 @@ int fce_register(fce_ev_t event, const char *path, const char *oldpath, fce_obj_
         /* No listeners configured */
         return AFP_OK;
 
-    if (path == NULL)
-        return AFPERR_PARAM;
 
        /* do some initialization on the fly the first time */
        if (first_event) {
@@ -425,6 +424,8 @@ static void check_saved_close_events(int fmodwait)
  * */
 void fce_pending_events(AFPObj *obj)
 {
+    if (!udp_sockets)
+        return;
     check_saved_close_events(obj->options.fce_fmodwait);
 }