Fixes

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

diff --git a/include/atalk/paths.h b/include/atalk/paths.h
index ae076a7a02743c5505ff52b94108d4de7d9e9a0a..793d4fc98e052421896543eb6f5d0175f75e61da 100644 (file)
--- a/include/atalk/paths.h
+++ b/include/atalk/paths.h
@@ -7,7 +7,7 @@
 #define BROKEN_ECHO(a)    a
 #define ATALKPATHCAT(a,b) BROKEN_ECHO(a)##BROKEN_ECHO(b)
 #else
-#define ATALKPATHCAT(a,b) a##b
+#define ATALKPATHCAT(a,b) a b
 #endif
 #else
 #define ATALKPATHCAT(a,b) a/**/b
@@ -16,7 +16,7 @@
 
 /* lock file path. this should be re-organized a bit. */
 #if ! defined (_PATH_LOCKDIR)
-#  if defined (FHS_COMPATIBILITY)
+#  if defined (FHS_COMPATIBILITY) || defined (__NetBSD__) || defined (__OpenBSD__)
 #    define _PATH_LOCKDIR      "/var/run/"
 #  elif defined (BSD4_4)
 #    ifdef MACOSX_SERVER
@@ -31,50 +31,25 @@
 #  endif
 #endif
 
-/*
- * papd paths
- */
-#define _PATH_PAPDPRINTCAP     "/etc/printcap"
-#ifdef ultrix
-#define _PATH_PAPDSPOOLDIR     "/usr/spool/lpd"
-#else ultrix
-#define _PATH_PAPDSPOOLDIR     "/var/spool/lpd"
-#endif ultrix
-#ifdef BSD4_4
-#define _PATH_DEVPRINTER       "/var/run/printer"
-#else BSD4_4
-#define _PATH_DEVPRINTER       "/dev/printer"
-#endif BSD4_4
-
-/*
- * atalkd paths
- */
-#define _PATH_ATALKDEBUG       "/tmp/atalkd.debug"
-#define _PATH_ATALKDTMP                "atalkd.tmp"
-#ifdef FHS_COMPATIBILITY
-#  define _PATH_ATALKDLOCK     ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid")
-#else
-#  define _PATH_ATALKDLOCK     ATALKPATHCAT(_PATH_LOCKDIR,"atalkd")
-#endif
 
 /*
- * psorder paths
+ * afpd paths
  */
-#define _PATH_TMPPAGEORDER     "/tmp/psorderXXXXXX"
-#ifdef FHS_COMPATIBILITY
-#  define _PATH_PAPDLOCK       ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid")
+#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")
 #else
-#  define _PATH_PAPDLOCK       ATALKPATHCAT(_PATH_LOCKDIR,"papd")
+#  define _PATH_AFPDLOCK       ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
 #endif
 
 /*
- * afpd paths
+ * cnid_metad paths
  */
-#define _PATH_AFPTKT           "/tmp/AFPtktXXXXXX"
-#ifdef FHS_COMPATIBILITY
-#  define _PATH_AFPDLOCK       ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
+#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__) || defined (__OpenBSD__)
+#  define _PATH_CNID_METAD_LOCK        ATALKPATHCAT(_PATH_LOCKDIR,"cnid_metad.pid")
 #else
-#  define _PATH_AFPDLOCK       ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
+#  define _PATH_CNID_METAD_LOCK        ATALKPATHCAT(_PATH_LOCKDIR,"cnid_metad")
 #endif
 
 #endif /* atalk/paths.h */