diff options
| author | Andrew Tridgell <tridge@samba.org> | 1997-12-03 05:22:24 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1997-12-03 05:22:24 +0000 |
| commit | e439115366804982af6faba75714dbe2626edead (patch) | |
| tree | b57b450af01de37fd4103b9eebe8e860877725ff | |
| parent | 6a83de0ae954bb18d3f15382f2b0b3259fedff09 (diff) | |
| download | samba-e439115366804982af6faba75714dbe2626edead.tar.gz samba-e439115366804982af6faba75714dbe2626edead.tar.xz samba-e439115366804982af6faba75714dbe2626edead.zip | |
put the default PRINTCAP_NAME def in includes.h not local.h so that
it can see the SYSV definitions
| -rw-r--r-- | source/include/includes.h | 17 | ||||
| -rw-r--r-- | source/include/local.h | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/source/include/includes.h b/source/include/includes.h index cada77e7326..5bfe0241453 100644 --- a/source/include/includes.h +++ b/source/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/source/include/local.h b/source/include/local.h index c4bdcc80d5a..10906d1ff1e 100644 --- a/source/include/local.h +++ b/source/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 |