.szInclude = NULL,
.preexec = NULL,
.postexec = NULL,
- .rootpreexec = NULL,
- .rootpostexec = NULL,
+ .root_preexec = NULL,
+ .root_postexec = NULL,
.cups_options = NULL,
- .printcommand = NULL,
- .lpqcommand = NULL,
- .lprmcommand = NULL,
- .lppausecommand = NULL,
- .lpresumecommand = NULL,
- .queuepausecommand = NULL,
- .queueresumecommand = NULL,
+ .print_command = NULL,
+ .lpq_command = NULL,
+ .lprm_command = NULL,
+ .lppause_command = NULL,
+ .lpresume_command = NULL,
+ .queuepause_command = NULL,
+ .queueresume_command = NULL,
._printername = NULL,
.printjob_username = NULL,
.dont_descend = NULL,
.hosts_allow = NULL,
.hosts_deny = NULL,
- .magicscript = NULL,
- .magicoutput = NULL,
+ .magic_script = NULL,
+ .magic_output = NULL,
.veto_files = NULL,
.hide_files = NULL,
.veto_oplock_files = NULL,
.comment = NULL,
.force_user = NULL,
.force_group = NULL,
- .readlist = NULL,
+ .read_list = NULL,
.writelist = NULL,
.volume = NULL,
.fstype = NULL,
.dfree_command = NULL,
.minprintspace = 0,
.iMaxPrintJobs = 1000,
- .max_reported_jobs = 0,
+ .max_reported_print_jobs = 0,
.write_cache_size = 0,
.create_mask = 0744,
.force_create_mode = 0,
.block_size = 1024,
.dfree_cache_time = 0,
.preexec_close = false,
- .rootpreexec_close = false,
+ .root_preexec_close = false,
.case_sensitive = Auto,
.preserve_case = true,
.short_preserve_case = true,
.oplocks = true,
.kernel_oplocks = false,
.level2_oplocks = true,
- .onlyuser = false,
+ .only_user = false,
.mangled_names = true,
.bWidelinks = false,
- .symlinks = true,
+ .follow_symlinks = true,
.syncalways = false,
.strict_allocate = false,
.strict_sync = false,
.dos_filetime_resolution = false,
.fake_directory_create_times = false,
.blocking_locks = true,
- .inherit_perms = false,
+ .inherit_permissions = false,
.inherit_acls = false,
.inherit_owner = false,
.msdfs_root = false,
case PRINT_AIX:
case PRINT_LPRNT:
case PRINT_LPROS2:
- string_set(&pService->lpqcommand, "lpq -P'%p'");
- string_set(&pService->lprmcommand, "lprm -P'%p' %j");
- string_set(&pService->printcommand, "lpr -r -P'%p' %s");
+ string_set(&pService->lpq_command, "lpq -P'%p'");
+ string_set(&pService->lprm_command, "lprm -P'%p' %j");
+ string_set(&pService->print_command, "lpr -r -P'%p' %s");
break;
case PRINT_LPRNG:
case PRINT_PLP:
- string_set(&pService->lpqcommand, "lpq -P'%p'");
- string_set(&pService->lprmcommand, "lprm -P'%p' %j");
- string_set(&pService->printcommand, "lpr -r -P'%p' %s");
- string_set(&pService->queuepausecommand, "lpc stop '%p'");
- string_set(&pService->queueresumecommand, "lpc start '%p'");
- string_set(&pService->lppausecommand, "lpc hold '%p' %j");
- string_set(&pService->lpresumecommand, "lpc release '%p' %j");
+ string_set(&pService->lpq_command, "lpq -P'%p'");
+ string_set(&pService->lprm_command, "lprm -P'%p' %j");
+ string_set(&pService->print_command, "lpr -r -P'%p' %s");
+ string_set(&pService->queuepause_command, "lpc stop '%p'");
+ string_set(&pService->queueresume_command, "lpc start '%p'");
+ string_set(&pService->lppause_command, "lpc hold '%p' %j");
+ string_set(&pService->lpresume_command, "lpc release '%p' %j");
break;
case PRINT_CUPS:
case PRINT_IPRINT:
/* set the lpq command to contain the destination printer
name only. This is used by cups_queue_get() */
- string_set(&pService->lpqcommand, "%p");
- string_set(&pService->lprmcommand, "");
- string_set(&pService->printcommand, "");
- string_set(&pService->lppausecommand, "");
- string_set(&pService->lpresumecommand, "");
- string_set(&pService->queuepausecommand, "");
- string_set(&pService->queueresumecommand, "");
+ string_set(&pService->lpq_command, "%p");
+ string_set(&pService->lprm_command, "");
+ string_set(&pService->print_command, "");
+ string_set(&pService->lppause_command, "");
+ string_set(&pService->lpresume_command, "");
+ string_set(&pService->queuepause_command, "");
+ string_set(&pService->queueresume_command, "");
break;
case PRINT_SYSV:
case PRINT_HPUX:
- string_set(&pService->lpqcommand, "lpstat -o%p");
- string_set(&pService->lprmcommand, "cancel %p-%j");
- string_set(&pService->printcommand, "lp -c -d%p %s; rm %s");
- string_set(&pService->queuepausecommand, "disable %p");
- string_set(&pService->queueresumecommand, "enable %p");
+ string_set(&pService->lpq_command, "lpstat -o%p");
+ string_set(&pService->lprm_command, "cancel %p-%j");
+ string_set(&pService->print_command, "lp -c -d%p %s; rm %s");
+ string_set(&pService->queuepause_command, "disable %p");
+ string_set(&pService->queueresume_command, "enable %p");
#ifndef HPUX
- string_set(&pService->lppausecommand, "lp -i %p-%j -H hold");
- string_set(&pService->lpresumecommand, "lp -i %p-%j -H resume");
+ string_set(&pService->lppause_command, "lp -i %p-%j -H hold");
+ string_set(&pService->lpresume_command, "lp -i %p-%j -H resume");
#endif /* HPUX */
break;
case PRINT_QNX:
- string_set(&pService->lpqcommand, "lpq -P%p");
- string_set(&pService->lprmcommand, "lprm -P%p %j");
- string_set(&pService->printcommand, "lp -r -P%p %s");
+ string_set(&pService->lpq_command, "lpq -P%p");
+ string_set(&pService->lprm_command, "lprm -P%p %j");
+ string_set(&pService->print_command, "lp -r -P%p %s");
break;
#if defined(DEVELOPER) || defined(ENABLE_SELFTEST)
tmp = talloc_asprintf(tmp_ctx, "vlp %s print %%p %%s",
tdbfile);
- string_set(&pService->printcommand,
+ string_set(&pService->print_command,
tmp ? tmp : "vlp print %p %s");
tmp = talloc_asprintf(tmp_ctx, "vlp %s lpq %%p",
tdbfile);
- string_set(&pService->lpqcommand,
+ string_set(&pService->lpq_command,
tmp ? tmp : "vlp lpq %p");
tmp = talloc_asprintf(tmp_ctx, "vlp %s lprm %%p %%j",
tdbfile);
- string_set(&pService->lprmcommand,
+ string_set(&pService->lprm_command,
tmp ? tmp : "vlp lprm %p %j");
tmp = talloc_asprintf(tmp_ctx, "vlp %s lppause %%p %%j",
tdbfile);
- string_set(&pService->lppausecommand,
+ string_set(&pService->lppause_command,
tmp ? tmp : "vlp lppause %p %j");
tmp = talloc_asprintf(tmp_ctx, "vlp %s lpresume %%p %%j",
tdbfile);
- string_set(&pService->lpresumecommand,
+ string_set(&pService->lpresume_command,
tmp ? tmp : "vlp lpresume %p %j");
tmp = talloc_asprintf(tmp_ctx, "vlp %s queuepause %%p",
tdbfile);
- string_set(&pService->queuepausecommand,
+ string_set(&pService->queuepause_command,
tmp ? tmp : "vlp queuepause %p");
tmp = talloc_asprintf(tmp_ctx, "vlp %s queueresume %%p",
tdbfile);
- string_set(&pService->queueresumecommand,
+ string_set(&pService->queueresume_command,
tmp ? tmp : "vlp queueresume %p");
TALLOC_FREE(tmp_ctx);
/* Was 65535 (0xFFFF). 0x4101 matches W2K and causes major speed improvements... */
/* Discovered by 2 days of pain by Don McCall @ HP :-). */
Globals.max_xmit = 0x4104;
- Globals.maxmux = 50; /* This is *needed* for profile support. */
- Globals.lpqcachetime = 30; /* changed to handle large print servers better -- jerry */
+ Globals.max_mux = 50; /* This is *needed* for profile support. */
+ Globals.lpq_cache_time = 30; /* changed to handle large print servers better -- jerry */
Globals._disable_spoolss = false;
Globals.max_smbd_processes = 0;/* no limit specified */
Globals.usernamelevel = 0;
Globals.large_readwrite = true;
Globals.max_log_size = 5000;
Globals.max_open_files = max_open_files();
- Globals.srv_maxprotocol = PROTOCOL_SMB3_00;
- Globals.srv_minprotocol = PROTOCOL_LANMAN1;
- Globals.cli_maxprotocol = PROTOCOL_NT1;
- Globals.cli_minprotocol = PROTOCOL_CORE;
+ Globals.server_max_protocol = PROTOCOL_SMB3_00;
+ Globals.server_min_protocol = PROTOCOL_LANMAN1;
+ Globals.client_max_protocol = PROTOCOL_NT1;
+ Globals.client_min_protocol = PROTOCOL_CORE;
Globals._security = SEC_AUTO;
- Globals.encrypted_passwords = true;
+ Globals.encrypt_passwords = true;
Globals.client_schannel = Auto;
Globals.winbind_sealed_pipes = true;
Globals.require_strong_key = true;
#if (defined(HAVE_NETGROUP) && defined(WITH_AUTOMOUNT))
Globals.nis_home_map = false;
#ifdef WITH_NISPLUS_HOME
- string_set(&Globals.nis_home_map_name, "auto_home.org_dir");
+ string_set(&Globals.homedir_map, "auto_home.org_dir");
#else
- string_set(&Globals.nis_home_map_name, "auto.home");
+ string_set(&Globals.homedir_map, "auto.home");
#endif
#endif
Globals.time_server = false;
*/
- Globals.ms_add_printer_wizard = true;
+ Globals.show_add_printer_wizard = true;
Globals.os_level = 20;
Globals.local_master = true;
Globals._domain_master = Auto; /* depending on _domain_logons */
git.samba.org / samba.git / blobdiff