Moved PRINTCAP_NAME from smb.h to includes to allow it to

be tuned per system type.
Jeremy.

diff --git a/source/include/includes.h b/source/include/includes.h
index fc718961a954c9f595d9334b658d04694538c2dc..24fb84c803585b27a86274fe5293b0aad62ddfe7 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -29,6 +29,7 @@
 
 #ifdef AIX
 #define DEFAULT_PRINTING PRINT_AIX
 
 #ifdef AIX
 #define DEFAULT_PRINTING PRINT_AIX

+#define PRINTCAP_NAME "/etc/qconfig"

 #endif
 
 #ifdef HPUX
 #endif
 
 #ifdef HPUX


@@ -543,8 +544,10 @@ extern int errno;
 #ifndef DEFAULT_PRINTING
 #ifdef SYSV
 #define DEFAULT_PRINTING PRINT_SYSV
 #ifndef DEFAULT_PRINTING
 #ifdef SYSV
 #define DEFAULT_PRINTING PRINT_SYSV

+#define PRINTCAP_NAME "lpstat"

 #else
 #define DEFAULT_PRINTING PRINT_BSD
 #else
 #define DEFAULT_PRINTING PRINT_BSD

+#define PRINTCAP_NAME "/etc/printcap"

 #endif
 #endif
 
 #endif
 #endif
 

diff --git a/source/include/smb.h b/source/include/smb.h
index 0f1683e3c929497f1f0e48d9017a0f0d53dd22f6..0ffbcded1311467ff7c6d1af6a9a5833831c5c6c 100644 (file)
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -54,10 +54,6 @@ typedef int BOOL;
 #define DEF_CREATE_MASK (0755)
 #endif
 
 #define DEF_CREATE_MASK (0755)
 #endif
 

-#ifndef PRINTCAP_NAME
-#define PRINTCAP_NAME "/etc/printcap"
-#endif
-

 /* how long to wait for secondary SMB packets (milli-seconds) */
 #define SMB_SECONDARY_WAIT (60*1000)
 
 /* how long to wait for secondary SMB packets (milli-seconds) */
 #define SMB_SECONDARY_WAIT (60*1000)