diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:10 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:15 -0800 |
| commit | 63598ff628b874e3d4778939ac6f2b70292c9360 (patch) | |
| tree | a772550675fc421b187314716f1c2f0188ae876f /source3 | |
| parent | fc111c7875e35c846dbe52f7d3dbce75cfc74336 (diff) | |
| download | samba-63598ff628b874e3d4778939ac6f2b70292c9360.tar.gz samba-63598ff628b874e3d4778939ac6f2b70292c9360.tar.xz samba-63598ff628b874e3d4778939ac6f2b70292c9360.zip | |
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>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/auth/auth.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/smbd/negprot.c | 6 | ||||
| -rw-r--r-- | source3/utils/testparm.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source3/auth/auth.c b/source3/auth/auth.c index c3797cf604..0fc8b63b59 100644 --- 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 aaddd4867f..8e3a9b562f 100644 --- 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 ac828a94de..1ba363deda 100644 --- 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 afca8f83c4..57f619e456 100644 --- 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] " |