summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-04-15 20:40:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:15 -0500
commit578a7d254fa857a9cd109f27efe1071c0afc37c5 (patch)
treec002e807a7a36ad20a4ace4df10e502d336323df /source3/param
parent5b6286b26bd9543491623451d694ff4b225c2101 (diff)
downloadsamba-578a7d254fa857a9cd109f27efe1071c0afc37c5.tar.gz
samba-578a7d254fa857a9cd109f27efe1071c0afc37c5.tar.bz2
samba-578a7d254fa857a9cd109f27efe1071c0afc37c5.zip
r242: adding 'cups options' parameter to allow raw printing without changing /etc/cups/cupsd.conf -- documentation to follow
(This used to be commit 2f323b0991c37022fb59ef8c69454eff03296662)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 061af12494..edd1bc0be7 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -315,6 +315,7 @@ typedef struct
char *szPostExec;
char *szRootPreExec;
char *szRootPostExec;
+ char *szCupsOptions;
char *szPrintcommand;
char *szLpqcommand;
char *szLprmcommand;
@@ -438,6 +439,7 @@ static service sDefault = {
NULL, /* szPostExec */
NULL, /* szRootPreExec */
NULL, /* szRootPostExec */
+ NULL, /* szCupsOptions */
NULL, /* szPrintcommand */
NULL, /* szLpqcommand */
NULL, /* szLprmcommand */
@@ -952,6 +954,7 @@ static struct parm_struct parm_table[] = {
{"printable", P_BOOL, P_LOCAL, &sDefault.bPrint_ok, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT},
{"print ok", P_BOOL, P_LOCAL, &sDefault.bPrint_ok, NULL, NULL, FLAG_HIDE},
{"printing", P_ENUM, P_LOCAL, &sDefault.iPrinting, handle_printing, enum_printing, FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL},
+ {"cups options", P_STRING, P_LOCAL, &sDefault.szCupsOptions, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL},
{"print command", P_STRING, P_LOCAL, &sDefault.szPrintcommand, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL},
{"disable spoolss", P_BOOL, P_GLOBAL, &Globals.bDisableSpoolss, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL},
{"lpq command", P_STRING, P_LOCAL, &sDefault.szLpqcommand, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL},
@@ -1800,6 +1803,7 @@ FN_LOCAL_STRING(lp_username, szUsername)
FN_LOCAL_LIST(lp_invalid_users, szInvalidUsers)
FN_LOCAL_LIST(lp_valid_users, szValidUsers)
FN_LOCAL_LIST(lp_admin_users, szAdminUsers)
+FN_LOCAL_STRING(lp_cups_options, szCupsOptions)
FN_LOCAL_STRING(lp_printcommand, szPrintcommand)
FN_LOCAL_STRING(lp_lpqcommand, szLpqcommand)
FN_LOCAL_STRING(lp_lprmcommand, szLprmcommand)