oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Don't confuse target name and source name, make regressiont tests pass again.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22382 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-12-30 12:13:17 +00:00
parent 6a3f4c58a5
commit bad0701a5d
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/gssapi/ntlm/init_sec_context.c
View File

@@ -36,7 +36,7 @@
RCSID("$Id$"); RCSID("$Id$");
static int static int
from_file(const char *fn, const char *user, const char *domain, from_file(const char *fn, const char *target_domain,
char **username, struct ntlm_buf *key) char **username, struct ntlm_buf *key)
{ {
char *str, buf[1024]; char *str, buf[1024];
@@ -53,14 +53,12 @@ from_file(const char *fn, const char *user, const char *domain,
continue; continue;
str = NULL; str = NULL;
d = strtok_r(buf, ":", &str); d = strtok_r(buf, ":", &str);
if (d && strcasecmp(domain, d) != 0) if (d && strcasecmp(target_domain, d) != 0)
continue; continue;
u = strtok_r(NULL, ":", &str); u = strtok_r(NULL, ":", &str);
p = strtok_r(NULL, ":", &str); p = strtok_r(NULL, ":", &str);
if (u == NULL || p == NULL) if (u == NULL || p == NULL)
continue; continue;
if (user && strcasecmp(user, u) != 0)
continue;
*username = strdup(u); *username = strdup(u);
@@ -76,7 +74,8 @@ from_file(const char *fn, const char *user, const char *domain,
} }
static int static int
get_user_file(const ntlm_name name, char **username, struct ntlm_buf *key) get_user_file(const ntlm_name target_name,
char **username, struct ntlm_buf *key)
{ {
const char *fn; const char *fn;
@@ -84,9 +83,9 @@ get_user_file(const ntlm_name name, char **username, struct ntlm_buf *key)
return ENOENT; return ENOENT;
fn = getenv("NTLM_USER_FILE"); fn = getenv("NTLM_USER_FILE");
if (fn != NULL) if (fn == NULL)
return ENOENT; return ENOENT;
if (from_file(fn, name->domain, name->user, username, key) == 0) if (from_file(fn, target_name->domain, username, key) == 0)
return 0; return 0;
return ENOENT; return ENOENT;
@@ -173,7 +172,7 @@ out:
} }
int int
_gss_ntlm_get_user_cred(const ntlm_name name, _gss_ntlm_get_user_cred(const ntlm_name target_name,
ntlm_cred *rcred) ntlm_cred *rcred)
{ {
ntlm_cred cred; ntlm_cred cred;
@@ -183,15 +182,15 @@ _gss_ntlm_get_user_cred(const ntlm_name name,
if (cred == NULL) if (cred == NULL)
return ENOMEM; return ENOMEM;
ret = get_user_file(name, &cred->username, &cred->key); ret = get_user_file(target_name, &cred->username, &cred->key);
if (ret) if (ret)
ret = get_user_ccache(name, &cred->username, &cred->key); ret = get_user_ccache(target_name, &cred->username, &cred->key);
if (ret) { if (ret) {
free(cred); free(cred);
return ret; return ret;
} }
cred->domain = strdup(name->domain); cred->domain = strdup(target_name->domain);
*rcred = cred; *rcred = cred;
return ret; return ret;