sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

r23848: Thanks to derrell for pointing out that I had not finished my patch to

Browse Source 
split out the auth methods.

This caused all SWAT logins to fail, except when using local system
authentication.

Andrew Bartlett
(This used to be commit b5a9d507a37cd46bd325ff3118c08b4362f267f2)
This commit is contained in:
Andrew Bartlett 2007-07-12 04:56:33 +00:00 committed by Gerald (Jerry) Carter
parent 57484f56c0
commit a21ea3351a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/param/loadparm.c
View File

@ -147,7 +147,6 @@ typedef struct
int cli_maxprotocol;
int cli_minprotocol;
int security;
char **AuthMethods;
int paranoid_server_security;
int max_wins_ttl;
int min_wins_ttl;
@ -915,7 +914,6 @@ _PUBLIC_ FN_GLOBAL_INTEGER(lp_srv_minprotocol, &Globals.srv_minprotocol)
_PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_maxprotocol, &Globals.cli_maxprotocol)
_PUBLIC_ FN_GLOBAL_INTEGER(lp_cli_minprotocol, &Globals.cli_minprotocol)
_PUBLIC_ FN_GLOBAL_INTEGER(lp_security, &Globals.security)
_PUBLIC_ FN_GLOBAL_LIST(lp_auth_methods, &Globals.AuthMethods)
_PUBLIC_ FN_GLOBAL_BOOL(lp_paranoid_server_security, &Globals.paranoid_server_security)
_PUBLIC_ FN_GLOBAL_INTEGER(lp_announce_as, &Globals.announce_as)
_PUBLIC_ FN_GLOBAL_LIST(lp_js_include, &Globals.jsInclude)

6
source4/scripting/ejs/smbcalls_auth.c
View File

@ -55,7 +55,11 @@ static int ejs_doauth(MprVarHandle eid,
msg = messaging_client_init(tmp_ctx, ev);
}
if (auth_types) {
nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, &auth_context);
} else {
nt_status = auth_context_create(tmp_ctx, ev, msg, &auth_context);
}
if (!NT_STATUS_IS_OK(nt_status)) {
mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
mprSetPropertyValue(auth, "report", mprString("Auth System Failure"));
@ -173,7 +177,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
if (domain && (strcmp("SYSTEM USER", domain) == 0)) {
ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, auth_types_unix);
} else {
ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, lp_auth_methods());
ejs_doauth(eid, tmp_ctx, &auth, username, password, domain, workstation, remote_host, NULL);
}
mpr_Return(eid, auth);