Always check before committing, fix for cnid_metad PID lockfile

diff --git a/etc/cnid_dbd/cnid_metad.c b/etc/cnid_dbd/cnid_metad.c
index d38dab4ed24899774d5bd7fb29e0d8a4a0dcfd3c..09f90485e9886fe8926c547b94ffad5bf8b656e7 100644 (file)
--- a/etc/cnid_dbd/cnid_metad.c
+++ b/etc/cnid_dbd/cnid_metad.c
@@ -95,6 +95,7 @@
 #include <atalk/util.h>
 #include <atalk/logger.h>
 #include <atalk/cnid_dbd_private.h>
+#include <atalk/paths.h>
 
 #include "db_param.h"
 #include "usockfd.h"
@@ -484,7 +485,7 @@ int main(int argc, char *argv[])
     }
 
     /* Check PID lockfile and become a daemon */
-    switch(server_lock("cnid_metad", _PATH_LOCKDIR, 0)) {
+    switch(server_lock("cnid_metad", _PATH_CNID_METAD_LOCK, 0)) {
     case -1: /* error */
         exit(EXITERR_SYS);
     case 0: /* child */

diff --git a/include/atalk/paths.h b/include/atalk/paths.h
index 2d7d91bdff7e1a22649f0cf845076761df3f634c..2e75b461b53c0ab198b2a8f44aecf08057c32ea3 100644 (file)
--- a/include/atalk/paths.h
+++ b/include/atalk/paths.h
@@ -77,4 +77,13 @@
 #  define _PATH_AFPDLOCK       ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
 #endif
 
+/*
+ * cnid_metad paths
+ */
+#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+#  define _PATH_CNID_METAD_LOCK        ATALKPATHCAT(_PATH_LOCKDIR,"cnid_metad.pid")
+#else
+#  define _PATH_CNID_METAD_LOCK        ATALKPATHCAT(_PATH_LOCKDIR,"cnid_metad")
+#endif
+
 #endif /* atalk/paths.h */