git.samba.org / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
param: rename lp function and variable from "readlist" to "read_list"
[samba.git] / source3 / param / loadparm.c
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2c66770d806666aac7c5aa98f93a0a7c5bea64d0..9df05b68791a930aed3ddd895d7017cf5bcbbf46 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -158,13 +158,13 @@ static struct loadparm_service sDefault =
        .root_preexec = NULL,
        .root_postexec = NULL,
        .cups_options = NULL,
-       .printcommand = NULL,
+       .print_command = NULL,
        .lpq_command = NULL,
        .lprm_command = NULL,
        .lppause_command = NULL,
        .lpresume_command = NULL,
-       .queuepausecommand = NULL,
-       .queueresumecommand = NULL,
+       .queuepause_command = NULL,
+       .queueresume_command = NULL,
        ._printername = NULL,
        .printjob_username = NULL,
        .dont_descend = NULL,
@@ -178,7 +178,7 @@ static struct loadparm_service sDefault =
        .comment = NULL,
        .force_user = NULL,
        .force_group = NULL,
-       .readlist = NULL,
+       .read_list = NULL,
        .writelist = NULL,
        .volume = NULL,
        .fstype = NULL,
@@ -188,7 +188,7 @@ static struct loadparm_service sDefault =
        .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,
@@ -230,7 +230,7 @@ static struct loadparm_service sDefault =
        .oplocks = true,
        .kernel_oplocks = false,
        .level2_oplocks = true,
-       .onlyuser = false,
+       .only_user = false,
        .mangled_names = true,
        .bWidelinks = false,
        .follow_symlinks = true,
@@ -247,7 +247,7 @@ static struct loadparm_service sDefault =
        .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,
@@ -383,16 +383,16 @@ static void init_printer_values(struct loadparm_service *pService)
                case PRINT_LPROS2:
                        string_set(&pService->lpq_command, "lpq -P'%p'");
                        string_set(&pService->lprm_command, "lprm -P'%p' %j");
-                       string_set(&pService->printcommand, "lpr -r -P'%p' %s");
+                       string_set(&pService->print_command, "lpr -r -P'%p' %s");
                        break;
 
                case PRINT_LPRNG:
                case PRINT_PLP:
                        string_set(&pService->lpq_command, "lpq -P'%p'");
                        string_set(&pService->lprm_command, "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->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;
@@ -403,20 +403,20 @@ static void init_printer_values(struct loadparm_service *pService)
                           name only.  This is used by cups_queue_get() */
                        string_set(&pService->lpq_command, "%p");
                        string_set(&pService->lprm_command, "");
-                       string_set(&pService->printcommand, "");
+                       string_set(&pService->print_command, "");
                        string_set(&pService->lppause_command, "");
                        string_set(&pService->lpresume_command, "");
-                       string_set(&pService->queuepausecommand, "");
-                       string_set(&pService->queueresumecommand, "");
+                       string_set(&pService->queuepause_command, "");
+                       string_set(&pService->queueresume_command, "");
                        break;
 
                case PRINT_SYSV:
                case PRINT_HPUX:
                        string_set(&pService->lpq_command, "lpstat -o%p");
                        string_set(&pService->lprm_command, "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->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->lppause_command, "lp -i %p-%j -H hold");
                        string_set(&pService->lpresume_command, "lp -i %p-%j -H resume");
@@ -426,7 +426,7 @@ static void init_printer_values(struct loadparm_service *pService)
                case PRINT_QNX:
                        string_set(&pService->lpq_command, "lpq -P%p");
                        string_set(&pService->lprm_command, "lprm -P%p %j");
-                       string_set(&pService->printcommand, "lp -r -P%p %s");
+                       string_set(&pService->print_command, "lp -r -P%p %s");
                        break;
 
 #if defined(DEVELOPER) || defined(ENABLE_SELFTEST)
@@ -447,7 +447,7 @@ static void init_printer_values(struct loadparm_service *pService)
 
                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",
@@ -472,12 +472,12 @@ static void init_printer_values(struct loadparm_service *pService)
 
                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);
 
@@ -809,7 +809,7 @@ static void init_globals(bool reinit_globals)
        /* 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.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 */
@@ -819,12 +819,12 @@ static void init_globals(bool reinit_globals)
        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;
@@ -935,7 +935,7 @@ static void init_globals(bool reinit_globals)
 
 */
 
-       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 */
Samba Shared Repository