sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

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

Browse Source 
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Garming Sam 2014-02-04 15:09:10 +13:00 committed by Jeremy Allison
parent fc111c7875
commit 63598ff628
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/param_functions.c
View File

@ -178,7 +178,7 @@ FN_GLOBAL_BOOL(_domain_logons, _domain_logons)
FN_GLOBAL_BOOL(enable_asu_support, enable_asu_support) FN_GLOBAL_BOOL(enable_asu_support, enable_asu_support)
FN_GLOBAL_BOOL(enable_core_files, enable_core_files) FN_GLOBAL_BOOL(enable_core_files, enable_core_files)
FN_GLOBAL_BOOL(enable_privileges, enable_privileges) 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(enhanced_browsing, enhanced_browsing)
FN_GLOBAL_BOOL(getwd_cache, getwd_cache) FN_GLOBAL_BOOL(getwd_cache, getwd_cache)
FN_GLOBAL_BOOL(host_msdfs, host_msdfs) FN_GLOBAL_BOOL(host_msdfs, host_msdfs)

2
lib/param/param_table.c
View File

@ -439,7 +439,7 @@ static struct parm_struct parm_table[] = {
.label = "encrypt passwords", .label = "encrypt passwords",
.type = P_BOOL, .type = P_BOOL,
.p_class = P_GLOBAL, .p_class = P_GLOBAL,
.offset = GLOBAL_VAR(encrypted_passwords), .offset = GLOBAL_VAR(encrypt_passwords),
.special = NULL, .special = NULL,
.enum_list = NULL, .enum_list = NULL,
.flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD, .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD,

2
source3/auth/auth.c
View File

@ -462,7 +462,7 @@ NTSTATUS make_auth_context_subsystem(TALLOC_CTX *mem_ctx,
break; break;
case ROLE_STANDALONE: case ROLE_STANDALONE:
DEBUG(5,("Making default auth method list for server role = 'standalone server', encrypt passwords = yes\n")); 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( auth_method_list = str_list_make_v3(
talloc_tos(), "guest sam", talloc_tos(), "guest sam",
NULL); NULL);

2
source3/param/loadparm.c
View File

@ -824,7 +824,7 @@ static void init_globals(bool reinit_globals)
Globals.client_max_protocol = PROTOCOL_NT1; Globals.client_max_protocol = PROTOCOL_NT1;
Globals.client_min_protocol = PROTOCOL_CORE; Globals.client_min_protocol = PROTOCOL_CORE;
Globals._security = SEC_AUTO; Globals._security = SEC_AUTO;
Globals.encrypted_passwords = true; Globals.encrypt_passwords = true;
Globals.client_schannel = Auto; Globals.client_schannel = Auto;
Globals.winbind_sealed_pipes = true; Globals.winbind_sealed_pipes = true;
Globals.require_strong_key = true; Globals.require_strong_key = true;

6
source3/smbd/negprot.c
View File

@ -67,7 +67,7 @@ static void reply_lanman1(struct smb_request *req, uint16 choice)
time_t t = time(NULL); time_t t = time(NULL);
struct smbd_server_connection *sconn = req->sconn; 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; secword |= NEGOTIATE_SECURITY_USER_LEVEL;
if (sconn->smb1.negprot.encrypted_passwords) { 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); time_t t = time(NULL);
struct smbd_server_connection *sconn = req->sconn; 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; secword |= NEGOTIATE_SECURITY_USER_LEVEL;
if (sconn->smb1.negprot.encrypted_passwords) { 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_enabled = false;
bool signing_required = 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. /* Check the flags field to see if this is Vista.
WinXP sets it and Vista does not. But we have to WinXP sets it and Vista does not. But we have to

4
source3/utils/testparm.c
View File

@ -68,7 +68,7 @@ static int do_global_checks(void)
SMB_STRUCT_STAT st; SMB_STRUCT_STAT st;
const char *socket_options; 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 " fprintf(stderr, "ERROR: in 'security=domain' mode the "
"'encrypt passwords' parameter must always be " "'encrypt passwords' parameter must always be "
"set to 'true'.\n\n"); "set to 'true'.\n\n");
@ -272,7 +272,7 @@ static int do_global_checks(void)
* been written to expect the old password. * 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) { if(strstr_m( lp_passwd_chat(talloc_tos()), "%o")!=NULL) {
fprintf(stderr, fprintf(stderr,
"ERROR: the 'passwd chat' script [%s] " "ERROR: the 'passwd chat' script [%s] "

6
source4/smb_server/smb/negprot.c
View File

@ -123,7 +123,7 @@ static void reply_lanman1(struct smbsrv_request *req, uint16_t choice)
int secword=0; int secword=0;
time_t t = req->request_time.tv_sec; 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) if (req->smb_conn->negotiate.encrypted_passwords)
secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE; secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE;
@ -178,7 +178,7 @@ static void reply_lanman2(struct smbsrv_request *req, uint16_t choice)
int secword=0; int secword=0;
time_t t = req->request_time.tv_sec; 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) if (req->smb_conn->negotiate.encrypted_passwords)
secword |= NEGOTIATE_SECURITY_CHALLENGE_RESPONSE; 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_NT_FIND | CAP_LOCK_AND_READ |
CAP_LEVEL_II_OPLOCKS | CAP_NT_SMBS | CAP_RPC_REMOTE_APIS; 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 /* do spnego in user level security if the client
supports it and we can do encrypted passwords */ supports it and we can do encrypted passwords */