put the default PRINTCAP_NAME def in includes.h not local.h so that

it can see the SYSV definitions
(This used to be commit e439115366804982af6faba75714dbe2626edead)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index cada77e73268c9628442638cca4537cf41fd81a0..5bfe02414532084a2967fd4bc9b2d711a41df2ec 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1073,6 +1073,23 @@ struct spwd { /* fake shadow password structure */
 #endif
 #endif
 
+/* This defines the name of the printcap file. It is MOST UNLIKELY that
+   this will change BUT! Specifying a file with the format of a printcap
+   file but containing only a subset of the printers actually in your real 
+   printcap file is a quick-n-dirty way to allow dynamic access to a subset
+   of available printers.
+*/
+#ifndef PRINTCAP_NAME
+#ifdef AIX
+#define PRINTCAP_NAME "/etc/qconfig"
+#elif defined(SYSV)
+#define PRINTCAP_NAME "lpstat"
+#else
+#define PRINTCAP_NAME "/etc/printcap"
+#endif
+#endif
+
+
 #ifdef USE_SYSV_IPC
 #include <sys/ipc.h>
 #include <sys/sem.h>

diff --git a/source3/include/local.h b/source3/include/local.h
index c4bdcc80d5a5ef0745af23640cddf58ac63ab405..10906d1ff1eeeae9eb841b8990c07c906a18e5fd 100644 (file)
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -17,23 +17,6 @@
    refer to the special "printers" service */
 #define PRINTERS_NAME "printers"
 
-/* This defines the name of the printcap file. It is MOST UNLIKELY that
-   this will change BUT! Specifying a file with the format of a printcap
-   file but containing only a subset of the printers actually in your real 
-   printcap file is a quick-n-dirty way to allow dynamic access to a subset
-   of available printers.
-*/
-
-#ifndef PRINTCAP_NAME
-#ifdef AIX
-#define PRINTCAP_NAME "/etc/qconfig"
-#elif defined(SYSV)
-#define PRINTCAP_NAME "lpstat"
-#else
-#define PRINTCAP_NAME "/etc/printcap"
-#endif
-#endif
-
 /* this affects server level security. With this set (recommended)
    samba will do a full NetWkstaUserLogon to confirm that the client
    really should have login rights. This can cause problems with