Fixes

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

diff --git a/include/atalk/paths.h b/include/atalk/paths.h
index bd4bed72ae0add8502896f900619021fa45e22f3..793d4fc98e052421896543eb6f5d0175f75e61da 100644 (file)
--- a/include/atalk/paths.h
+++ b/include/atalk/paths.h
@@ -16,74 +16,40 @@
 
 /* lock file path. this should be re-organized a bit. */
 #if ! defined (_PATH_LOCKDIR)
-#  if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
-#    define _PATH_LOCKDIR      /var/run/
+#  if defined (FHS_COMPATIBILITY) || defined (__NetBSD__) || defined (__OpenBSD__)
+#    define _PATH_LOCKDIR      "/var/run/"
 #  elif defined (BSD4_4)
 #    ifdef MACOSX_SERVER
-#      define _PATH_LOCKDIR    /var/run/
+#      define _PATH_LOCKDIR    "/var/run/"
 #    else
-#      define _PATH_LOCKDIR    /var/spool/lock/
+#      define _PATH_LOCKDIR    "/var/spool/lock/"
 #    endif
 #  elif defined (linux)
-#    define _PATH_LOCKDIR      /var/lock/
+#    define _PATH_LOCKDIR      "/var/lock/"
 #  else
-#    define _PATH_LOCKDIR      /var/spool/locks/
+#    define _PATH_LOCKDIR      "/var/spool/locks/"
 #  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"
-#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
-#  define _PATH_ATALKDLOCK     ATALKPATHCAT("_PATH_LOCKDIR","atalkd.pid")
-#else
-#  define _PATH_ATALKDLOCK     ATALKPATHCAT("_PATH_LOCKDIR","atalkd")
-#endif
-
-/*
- * psorder paths
- */
-#define _PATH_TMPPAGEORDER     "/tmp/psorderXXXXXX"
-#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
-#  define _PATH_PAPDLOCK       ATALKPATHCAT("_PATH_LOCKDIR","papd.pid")
-#else
-#  define _PATH_PAPDLOCK       ATALKPATHCAT("_PATH_LOCKDIR","papd")
-#endif
 
 /*
  * afpd paths
  */
 #define _PATH_AFPTKT           "/tmp/AFPtktXXXXXX"
-#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
-#  define _PATH_AFPDLOCK       ATALKPATHCAT("_PATH_LOCKDIR","afpd.pid")
+#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_AFPDLOCK       ATALKPATHCAT("_PATH_LOCKDIR","afpd")
+#  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")
+#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_CNID_METAD_LOCK        ATALKPATHCAT(_PATH_LOCKDIR,"cnid_metad")
 #endif
 
 #endif /* atalk/paths.h */