From: Jeremy Allison <jra@samba.org>
Date: Tue, 17 Nov 1998 00:31:39 +0000 (+0000)
Subject: Moved PRINTCAP_NAME from smb.h to includes to allow it to
X-Git-Tag: samba-4.0.0alpha6~801^2~21139
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=c1af0b40274752f85ba82f5a42426dbe3d3d890c

Moved PRINTCAP_NAME from smb.h to includes to allow it to
be tuned per system type.
Jeremy.
(This used to be commit c1a3346547d887bfd2402a6b0bcc185680eb4470)
---

diff --git a/source3/include/includes.h b/source3/include/includes.h
index fc718961a95..24fb84c8035 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -29,6 +29,7 @@
 
 #ifdef AIX
 #define DEFAULT_PRINTING PRINT_AIX
+#define PRINTCAP_NAME "/etc/qconfig"
 #endif
 
 #ifdef HPUX
@@ -543,8 +544,10 @@ extern int errno;
 #ifndef DEFAULT_PRINTING
 #ifdef SYSV
 #define DEFAULT_PRINTING PRINT_SYSV
+#define PRINTCAP_NAME "lpstat"
 #else
 #define DEFAULT_PRINTING PRINT_BSD
+#define PRINTCAP_NAME "/etc/printcap"
 #endif
 #endif
 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 0f1683e3c92..0ffbcded131 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -54,10 +54,6 @@ typedef int BOOL;
 #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)