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 | e94d5632392bb98d026ef2076702ef7b0870aea5 (patch) | |
| tree | c8e8bc8821227a460f7f2ddc668004240c0c013c | |
| parent | 7a668a7641cd747455b7a9854dbc208a3e4bc7ef (diff) | |
| download | samba-e94d5632392bb98d026ef2076702ef7b0870aea5.tar.gz samba-e94d5632392bb98d026ef2076702ef7b0870aea5.tar.bz2 samba-e94d5632392bb98d026ef2076702ef7b0870aea5.zip | |
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)
| -rw-r--r-- | source3/include/includes.h | 17 | ||||
| -rw-r--r-- | source3/include/local.h | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index cada77e732..5bfe024145 100644 --- 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 c4bdcc80d5..10906d1ff1 100644 --- 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 |