diff options
Diffstat (limited to 'source4')
| -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); |