From c5713acf5aa0f0a2a6ba93a4ac92ee474d734ec2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 26 Jul 2012 16:33:47 +1000 Subject: lib/param: Merge "Printing Options" section from source3/param This will reduced the weight of the eventual merge of all of source3/param. Andrew Bartlett --- lib/param/loadparm.c | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 290 insertions(+), 3 deletions(-) (limited to 'lib/param') diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index c211875d81..14fcdbf049 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -77,6 +77,8 @@ static bool defaults_saved = false; struct parmlist_entry *param_opt; \ char *szRealm; \ char *szConfigFile; \ + char *szPrintcapname; \ + int CupsEncrypt; \ int iPreferredMaster; \ char *szLdapMachineSuffix; \ char *szLdapUserSuffix; \ @@ -780,13 +782,61 @@ static struct parm_struct parm_table[] = { .flags = FLAG_ADVANCED, }, + {N_("Printing Options"), P_SEP, P_SEPARATOR}, + + { + .label = "max reported print jobs", + .type = P_INTEGER, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(iMaxReportedPrintJobs), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT, + }, { .label = "max print jobs", .type = P_INTEGER, .p_class = P_LOCAL, .offset = LOCAL_VAR(iMaxPrintJobs), .special = NULL, - .enum_list = NULL + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT, + }, + { + .label = "load printers", + .type = P_BOOL, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(bLoadPrinters), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT, + }, + { + .label = "printcap cache time", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(PrintcapCacheTime), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT, + }, + { + .label = "printcap name", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szPrintcapname), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT, + }, + { + .label = "printcap", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szPrintcapname), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_HIDE, }, { .label = "printable", @@ -794,7 +844,17 @@ static struct parm_struct parm_table[] = { .p_class = P_LOCAL, .offset = LOCAL_VAR(bPrint_ok), .special = NULL, - .enum_list = NULL + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT, + }, + { + .label = "print notify backchannel", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bPrintNotifyBackchannel), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, }, { .label = "print ok", @@ -802,7 +862,198 @@ static struct parm_struct parm_table[] = { .p_class = P_LOCAL, .offset = LOCAL_VAR(bPrint_ok), .special = NULL, - .enum_list = NULL + .enum_list = NULL, + .flags = FLAG_HIDE, + }, + { + .label = "printing", + .type = P_ENUM, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(iPrinting), + .special = handle_printing, + .enum_list = enum_printing, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + .label = "cups options", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szCupsOptions), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + .label = "cups server", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szCupsServer), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + .label = "cups encrypt", + .type = P_ENUM, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(CupsEncrypt), + .special = NULL, + .enum_list = enum_bool_auto, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + + .label = "cups connection timeout", + .type = P_INTEGER, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(cups_connection_timeout), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "iprint server", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szIPrintServer), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + .label = "print command", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szPrintcommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + .label = "disable spoolss", + .type = P_BOOL, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(bDisableSpoolss), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + .label = "enable spoolss", + .type = P_BOOLREV, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(bDisableSpoolss), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_HIDE, + }, + { + .label = "lpq command", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szLpqcommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + .label = "lprm command", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szLprmcommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + .label = "lppause command", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szLppausecommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + .label = "lpresume command", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szLpresumecommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + .label = "queuepause command", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szQueuepausecommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + .label = "queueresume command", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szQueueresumecommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT | FLAG_GLOBAL, + }, + { + .label = "addport command", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szAddPortCommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "enumports command", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szEnumPortsCommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "addprinter command", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szAddPrinterCommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "deleteprinter command", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szDeletePrinterCommand), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "show add printer wizard", + .type = P_BOOL, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(bMsAddPrinterWizard), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, + { + .label = "os2 driver map", + .type = P_STRING, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(szOs2DriverMap), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, }, { @@ -823,6 +1074,42 @@ static struct parm_struct parm_table[] = { .enum_list = NULL, .flags = FLAG_HIDE, }, + { + .label = "use client driver", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bUseClientDriver), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT, + }, + { + .label = "default devmode", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bDefaultDevmode), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT, + }, + { + .label = "force printername", + .type = P_BOOL, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(bForcePrintername), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT, + }, + { + .label = "printjob username", + .type = P_STRING, + .p_class = P_LOCAL, + .offset = LOCAL_VAR(szPrintjobUsername), + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED | FLAG_PRINT, + }, {N_("Filename Handling"), P_SEP, P_SEPARATOR}, -- cgit