summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-11-01 13:32:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:37 -0500
commit4e052d1fe472d8a60c76988c17d291c958ceb46d (patch)
treef9ec194668d16ae40d8c7a850f1b73f5ce947a5c /source4
parentd0375cfd43abf3d809ef85c198dd147eb1ffb09a (diff)
downloadsamba-4e052d1fe472d8a60c76988c17d291c958ceb46d.tar.gz
samba-4e052d1fe472d8a60c76988c17d291c958ceb46d.tar.bz2
samba-4e052d1fe472d8a60c76988c17d291c958ceb46d.zip
r11439: Make presedence on strcmp comparison clear, and fill in
logon_parameters for the auth subsystem. Andrew Bartlett (This used to be commit 767c5ca7bec3737d1261e209cd895d1300354f25)
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/ejs/smbcalls_auth.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 672694bbc5..ba20332aaa 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -72,6 +72,8 @@ static int ejs_doauth(TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *user
user_info->flags = USER_INFO_CASE_INSENSITIVE_USERNAME |
USER_INFO_DONT_CHECK_UNIX_ACCOUNT;
+ user_info->logon_parameters = 0;
+
nt_status = auth_check_password(auth_context, tmp_ctx, user_info, &server_info);
if (!NT_STATUS_IS_OK(nt_status)) {
mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
@@ -135,7 +137,7 @@ static int ejs_userAuth(MprVarHandle eid, int argc, struct MprVar **argv)
auth = mprObject("auth");
- if (domain && strcmp("System User", domain) == 0) {
+ if (domain && (strcmp("System User", domain) == 0)) {
ejs_doauth(tmp_ctx, &auth, username, password, domain, remote_host, "unix");
} else {
ejs_doauth(tmp_ctx, &auth, username, password, domain, remote_host, "sam");