param: rename CupsEncrypt -> cups_encrypt

[kai/samba-autobuild/.git] / source3 / param / loadparm.c

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 98eaec590f5ced70e622ac2bfc75b924babf7d27..54a2406738221842e4a3889ee94dce31a0d7861c 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -204,7 +204,7 @@ static struct loadparm_service sDefault =
        .level2_oplocks = true,
        .only_user = false,
        .mangled_names = true,
-       .bWidelinks = false,
+       .wide_links = false,
        .follow_symlinks = true,
        .sync_always = false,
        .strict_allocate = false,
@@ -714,7 +714,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals.reset_on_zero_vc = false;
        Globals.log_writeable_files_on_exit = false;
        Globals.create_krb5_conf = true;
-       Globals.winbindMaxDomainConnections = 1;
+       Globals._winbind_max_domain_connections = 1;
 
        /* hostname lookups can be very expensive and are broken on
           a large number of sites (tridge) */
@@ -858,7 +858,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals.smb2_max_read = DEFAULT_SMB2_MAX_READ;
        Globals.smb2_max_write = DEFAULT_SMB2_MAX_WRITE;
        Globals.smb2_max_trans = DEFAULT_SMB2_MAX_TRANSACT;
-       Globals.ismb2_max_credits = DEFAULT_SMB2_MAX_CREDITS;
+       Globals.smb2_max_credits = DEFAULT_SMB2_MAX_CREDITS;
        Globals.smb2_leases = false;
 
        string_set(Globals.ctx, &Globals.ncalrpc_dir, get_dyn_NCALRPCDIR());
@@ -1019,32 +1019,22 @@ char *lp_ ## fn_name(TALLOC_CTX *ctx,int i) {return(lp_string((ctx), (LP_SNUM_OK
 #define FN_LOCAL_PARM_CHAR(fn_name,val) \
  char lp_ ## fn_name(const struct share_params *p) {return(LP_SNUM_OK(p->service)? ServicePtrs[(p->service)]->val : sDefault.val);}
 
-static FN_GLOBAL_INTEGER(winbind_max_domain_connections_int,
-                 winbindMaxDomainConnections)
-
 int lp_winbind_max_domain_connections(void)
 {
        if (lp_winbind_offline_logon() &&
-           lp_winbind_max_domain_connections_int() > 1) {
+           lp__winbind_max_domain_connections() > 1) {
                DEBUG(1, ("offline logons active, restricting max domain "
                          "connections to 1\n"));
                return 1;
        }
-       return MAX(1, lp_winbind_max_domain_connections_int());
+       return MAX(1, lp__winbind_max_domain_connections());
 }
 
-int lp_smb2_max_credits(void)
-{
-       if (Globals.ismb2_max_credits == 0) {
-               Globals.ismb2_max_credits = DEFAULT_SMB2_MAX_CREDITS;
-       }
-       return Globals.ismb2_max_credits;
-}
 int lp_cups_encrypt(void)
 {
        int result = 0;
 #ifdef HAVE_HTTPCONNECTENCRYPT
-       switch (Globals.CupsEncrypt) {
+       switch (Globals.cups_encrypt) {
                case Auto:
                        result = HTTP_ENCRYPT_REQUIRED;
                        break;
@@ -4303,19 +4293,13 @@ int lp_min_receive_file_size(void)
  even after a configuration file reload.
 ********************************************************************/
 
-static bool lp_widelinks_internal(int snum)
-{
-       return (bool)(LP_SNUM_OK(snum)? ServicePtrs[(snum)]->bWidelinks :
-                       sDefault.bWidelinks);
-}
-
 void widelinks_warning(int snum)
 {
        if (lp_allow_insecure_wide_links()) {
                return;
        }
 
-       if (lp_unix_extensions() && lp_widelinks_internal(snum)) {
+       if (lp_unix_extensions() && lp_wide_links(snum)) {
                DEBUG(0,("Share '%s' has wide links and unix extensions enabled. "
                        "These parameters are incompatible. "
                        "Wide links will be disabled for this share.\n",
@@ -4336,7 +4320,7 @@ bool lp_widelinks(int snum)
                }
        }
 
-       return lp_widelinks_internal(snum);
+       return lp_wide_links(snum);
 }
 
 int lp_server_role(void)