Merge remote-tracking branch 'origin/develop' into spotlight

[netatalk.git] / include / atalk / paths.h

diff --git a/include/atalk/paths.h b/include/atalk/paths.h
index c93451b7ec38ebe7f78352971997e867d18c9e07..1aab969094f0c22cb48b328abfa249ccdc3a4a89 100644 (file)
--- a/include/atalk/paths.h
+++ b/include/atalk/paths.h
@@ -33,23 +33,14 @@
 
 
 /*
- * afpd paths
+ * netatalk paths
  */
 #define _PATH_AFPTKT           "/tmp/AFPtktXXXXXX"
 #define _PATH_AFP_IPC       ATALKPATHCAT(_PATH_LOCKDIR,"afpd_ipc")
 #if defined (FHS_COMPATIBILITY) || defined (__NetBSD__) || defined (__OpenBSD__)
-#  define _PATH_AFPDLOCK       ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
+#  define _PATH_NETATALK_LOCK  ATALKPATHCAT(_PATH_LOCKDIR,"netatalk.pid")
 #else
-#  define _PATH_AFPDLOCK       ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
-#endif
-
-/*
- * cnid_metad paths
- */
-#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__) || defined (__OpenBSD__)
-#  define _PATH_CNID_METAD_LOCK        ATALKPATHCAT(_PATH_LOCKDIR,"cnid_metad.pid")
-#else
-#  define _PATH_CNID_METAD_LOCK        ATALKPATHCAT(_PATH_LOCKDIR,"cnid_metad")
+#  define _PATH_NETATALK_LOCK  ATALKPATHCAT(_PATH_LOCKDIR,"netatalk")
 #endif
 
 #endif /* atalk/paths.h */