param: rename lp function and variable from "encrypted_passwords" to "encrypt_passwords"

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index b307e0cca14e789d9e6de91db0fac63a37a9a3f3..db237c8c0bf62bbb07b592972aafb54d55dd9e93 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -178,7 +178,7 @@ FN_GLOBAL_BOOL(_domain_logons, _domain_logons)
 FN_GLOBAL_BOOL(enable_asu_support, enable_asu_support)
 FN_GLOBAL_BOOL(enable_core_files, enable_core_files)
 FN_GLOBAL_BOOL(enable_privileges, enable_privileges)
-FN_GLOBAL_BOOL(encrypted_passwords, encrypted_passwords)
+FN_GLOBAL_BOOL(encrypt_passwords, encrypt_passwords)
 FN_GLOBAL_BOOL(enhanced_browsing, enhanced_browsing)
 FN_GLOBAL_BOOL(getwd_cache, getwd_cache)
 FN_GLOBAL_BOOL(host_msdfs, host_msdfs)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 1ae0a2c754c76b3ee863f67de18b773d49ae7c20..a14ab4b30cfc1b6f27c92c1f0d506617c1ddc04f 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -439,7 +439,7 @@ static struct parm_struct parm_table[] = {
                .label          = "encrypt passwords",
                .type           = P_BOOL,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(encrypted_passwords),
+               .offset         = GLOBAL_VAR(encrypt_passwords),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index c3797cf6045cb7dc88c15000f8a0e5ad2f9d66ca..0fc8b63b599cbd3c1538aaf938e0f15f1e827e53 100644 (file)
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -462,7 +462,7 @@ NTSTATUS make_auth_context_subsystem(TALLOC_CTX *mem_ctx,
                        break;
                case ROLE_STANDALONE:
                        DEBUG(5,("Making default auth method list for server role = 'standalone server', encrypt passwords = yes\n"));
-                       if (lp_encrypted_passwords()) {
+                       if (lp_encrypt_passwords()) {
                                auth_method_list = str_list_make_v3(
                                                talloc_tos(), "guest sam",
                                                NULL);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index aaddd4867f30fa1aadd195e625f85240c19f3ee6..8e3a9b562f5de9bdeacd8478aa947cf7f8b2adf1 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -824,7 +824,7 @@ static void init_globals(bool reinit_globals)
        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;

diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index ac828a94decf17fe6c6c4fd179b17d1034a246b7..1ba363dedac146c000a50c51d62085cbd296e4fd 100644 (file)
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -67,7 +67,7 @@ static void reply_lanman1(struct smb_request *req, uint16 choice)
        time_t t = time(NULL);
        struct smbd_server_connection *sconn = req->sconn;
 
-       sconn->smb1.negprot.encrypted_passwords = lp_encrypted_passwords();
+       sconn->smb1.negprot.encrypted_passwords = lp_encrypt_passwords();
 
        secword |= NEGOTIATE_SECURITY_USER_LEVEL;
        if (sconn->smb1.negprot.encrypted_passwords) {
@@ -112,7 +112,7 @@ static void reply_lanman2(struct smb_request *req, uint16 choice)
        time_t t = time(NULL);
        struct smbd_server_connection *sconn = req->sconn;
 
-       sconn->smb1.negprot.encrypted_passwords = lp_encrypted_passwords();
+       sconn->smb1.negprot.encrypted_passwords = lp_encrypt_passwords();
 
        secword |= NEGOTIATE_SECURITY_USER_LEVEL;
        if (sconn->smb1.negprot.encrypted_passwords) {
@@ -243,7 +243,7 @@ static void reply_nt1(struct smb_request *req, uint16 choice)
        bool signing_enabled = false;
        bool signing_required = false;
 
-       sconn->smb1.negprot.encrypted_passwords = lp_encrypted_passwords();
+       sconn->smb1.negprot.encrypted_passwords = lp_encrypt_passwords();
 
        /* Check the flags field to see if this is Vista.
           WinXP sets it and Vista does not. But we have to 

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index afca8f83c46ce260641bf17d3bebddcb943fcfed..57f619e456c095cd2750b0d3cf5c1ec4ed4fe5b6 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -68,7 +68,7 @@ static int do_global_checks(void)
        SMB_STRUCT_STAT st;
        const char *socket_options;
 
-       if (lp_security() >= SEC_DOMAIN && !lp_encrypted_passwords()) {
+       if (lp_security() >= SEC_DOMAIN && !lp_encrypt_passwords()) {
                fprintf(stderr, "ERROR: in 'security=domain' mode the "
                                "'encrypt passwords' parameter must always be "
                                "set to 'true'.\n\n");
@@ -272,7 +272,7 @@ static int do_global_checks(void)
                 * been written to expect the old password.
                 */
 
-               if(lp_encrypted_passwords()) {
+               if(lp_encrypt_passwords()) {
                        if(strstr_m( lp_passwd_chat(talloc_tos()), "%o")!=NULL) {
                                fprintf(stderr,
                                        "ERROR: the 'passwd chat' script [%s] "

diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c
index 37933cd760dbd6502d5c04e48819394f94282a44..a2d04446e40ce50d8dad76d70d6f5ed9e1d64d45 100644 (file)
--- a/source4/smb_server/smb/negprot.c
+++ b/source4/smb_server/smb/negprot.c
@@ -123,7 +123,7 @@ static void reply_lanman1(struct smbsrv_request *req, uint16_t choice)
        int secword=0;
        time_t t = req->request_time.tv_sec;
 
-       req->smb_conn->negotiate.encrypted_passwords = lpcfg_encrypted_passwords(req->smb_conn->lp_ctx);
+       req->smb_conn->negotiate.encrypted_passwords = lpcfg_encrypt_passwords(req->smb_conn->lp_ctx);
 
        if (req->smb_conn->negotiate.encrypted_passwords)
                secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE;
@@ -178,7 +178,7 @@ static void reply_lanman2(struct smbsrv_request *req, uint16_t choice)
        int secword=0;
        time_t t = req->request_time.tv_sec;
 
-       req->smb_conn->negotiate.encrypted_passwords = lpcfg_encrypted_passwords(req->smb_conn->lp_ctx);
+       req->smb_conn->negotiate.encrypted_passwords = lpcfg_encrypt_passwords(req->smb_conn->lp_ctx);
   
        if (req->smb_conn->negotiate.encrypted_passwords)
                secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE;
@@ -251,7 +251,7 @@ static void reply_nt1(struct smbsrv_request *req, uint16_t choice)
                CAP_NT_FIND | CAP_LOCK_AND_READ | 
                CAP_LEVEL_II_OPLOCKS | CAP_NT_SMBS | CAP_RPC_REMOTE_APIS;
 
-       req->smb_conn->negotiate.encrypted_passwords = lpcfg_encrypted_passwords(req->smb_conn->lp_ctx);
+       req->smb_conn->negotiate.encrypted_passwords = lpcfg_encrypt_passwords(req->smb_conn->lp_ctx);
 
        /* do spnego in user level security if the client
           supports it and we can do encrypted passwords */