diff options
| author | Jeremy Allison <jra@samba.org> | 1998-07-16 00:06:29 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-07-16 00:06:29 +0000 |
| commit | f1cd3cb54c6495db2a91c473f91c78d24622d98e (patch) | |
| tree | ebcd5c9128b1025fbe19f1bb4911f9e6b47af286 /source3/param | |
| parent | 7ade0aa1d22367cb0d998d35573dc5e333a41f75 (diff) | |
| download | samba-f1cd3cb54c6495db2a91c473f91c78d24622d98e.tar.gz samba-f1cd3cb54c6495db2a91c473f91c78d24622d98e.tar.bz2 samba-f1cd3cb54c6495db2a91c473f91c78d24622d98e.zip | |
Makefile: Added CC=gcc to DGUX on Intel. Comment from ross@filmworks.com.
ipc.c:
loadparm.c:
printing.c:
Added code from <Dirk.DeWachter@rug.ac.be> to implement print
queue pausing. New parameters are "queuepause command" and
"queueresume command".
util.c: Added fix for mount options in autmount map.
lib/rpc/include/rpc_misc.h: Removed duplicate pipe names for Jean-Francois.
Jeremy.
(This used to be commit 559a9bf2bbdeae3e76ba9178779cd3a9537c4e91)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index d6ec24ab5b..10b261ed02 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -252,6 +252,8 @@ typedef struct char *szLprmcommand; char *szLppausecommand; char *szLpresumecommand; + char *szQueuepausecommand; + char *szQueueresumecommand; char *szPrintername; char *szPrinterDriver; char *szPrinterDriverLocation; @@ -340,6 +342,8 @@ static service sDefault = NULL, /* szLprmcommand */ NULL, /* szLppausecommand */ NULL, /* szLpresumecommand */ + NULL, /* szQueuepausecommand */ + NULL, /* szQueueresumecommand */ NULL, /* szPrintername */ NULL, /* szPrinterDriver - this is set in init_globals() */ NULL, /* szPrinterDriverLocation */ @@ -593,6 +597,9 @@ static struct parm_struct parm_table[] = {"lprm command", P_STRING, P_LOCAL, &sDefault.szLprmcommand, NULL, NULL, FLAG_PRINT|FLAG_GLOBAL}, {"lppause command", P_STRING, P_LOCAL, &sDefault.szLppausecommand, NULL, NULL, FLAG_GLOBAL}, {"lpresume command", P_STRING, P_LOCAL, &sDefault.szLpresumecommand,NULL, NULL, FLAG_GLOBAL}, + {"queuepause command", P_STRING, P_LOCAL, &sDefault.szQueuepausecommand, NULL, NULL, FLAG_GLOBAL}, + {"queueresume command", P_STRING, P_LOCAL, &sDefault.szQueueresumecommand, NULL, NULL, FLAG_GLOBAL}, + {"printer name", P_STRING, P_LOCAL, &sDefault.szPrintername, NULL, NULL, FLAG_PRINT}, {"printer", P_STRING, P_LOCAL, &sDefault.szPrintername, NULL, NULL, 0}, {"printer driver", P_STRING, P_LOCAL, &sDefault.szPrinterDriver, NULL, NULL, 0}, @@ -911,7 +918,12 @@ static void init_locals(void) #ifdef SVR4 string_initial(&sDefault.szLppausecommand,"lp -i %p-%j -H hold"); string_initial(&sDefault.szLpresumecommand,"lp -i %p-%j -H resume"); -#endif + string_initial(&sDefault.szQueuepausecommand, "lpc stop %p"); + string_initial(&sDefault.szQueueresumecommand, "lpc start %p"); +#else /* SVR4 */ + string_initial(&sDefault.szQueuepausecommand, "disable %p"); + string_initial(&sDefault.szQueueresumecommand, "enable %p"); +#endif /* SVR4 */ break; case PRINT_QNX: @@ -1153,6 +1165,8 @@ FN_LOCAL_STRING(lp_lpqcommand,szLpqcommand) FN_LOCAL_STRING(lp_lprmcommand,szLprmcommand) FN_LOCAL_STRING(lp_lppausecommand,szLppausecommand) FN_LOCAL_STRING(lp_lpresumecommand,szLpresumecommand) +FN_LOCAL_STRING(lp_queuepausecommand,szQueuepausecommand) +FN_LOCAL_STRING(lp_queueresumecommand,szQueueresumecommand) FN_LOCAL_STRING(lp_printername,szPrintername) FN_LOCAL_STRING(lp_printerdriver,szPrinterDriver) FN_LOCAL_STRING(lp_hostsallow,szHostsallow) |