diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-07-12 04:56:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:59:24 -0500 |
| commit | a21ea3351af893618c0356c49b5033bf7509044d (patch) | |
| tree | 83d2ff6ef15a15c6a3baddf6848e3ce46b47fae1 | |
| parent | 57484f56c0bf4a380de33fd12cd5a2ee57aeeb66 (diff) | |
| download | samba-a21ea3351af893618c0356c49b5033bf7509044d.tar.gz samba-a21ea3351af893618c0356c49b5033bf7509044d.tar.bz2 samba-a21ea3351af893618c0356c49b5033bf7509044d.zip | |
r23848: Thanks to derrell for pointing out that I had not finished my patch to
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)
| -rw-r--r-- | source4/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source4/scripting/ejs/smbcalls_auth.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index fc123509bd..85044e3a04 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -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) diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c index dfca4ffac0..94a74e8e2a 100644 --- a/source4/scripting/ejs/smbcalls_auth.c +++ b/source4/scripting/ejs/smbcalls_auth.c @@ -55,7 +55,11 @@ static int ejs_doauth(MprVarHandle eid, msg = messaging_client_init(tmp_ctx, ev); } - nt_status = auth_context_create_methods(tmp_ctx, auth_types, ev, msg, &auth_context); + 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); |