projects
/
mod_auth_kerb.cvs
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c8f3b2f
)
moved check for nonempty password to a proper place
author
kouril
<kouril>
Thu, 5 Feb 2004 15:12:08 +0000
(15:12 +0000)
committer
kouril
<kouril>
Thu, 5 Feb 2004 15:12:08 +0000
(15:12 +0000)
src/mod_auth_kerb.c
patch
|
blob
|
history
diff --git
a/src/mod_auth_kerb.c
b/src/mod_auth_kerb.c
index
edd5ab0
..
c64e16d
100644
(file)
--- a/
src/mod_auth_kerb.c
+++ b/
src/mod_auth_kerb.c
@@
-651,13
+651,6
@@
int authenticate_user_krb5pwd(request_rec *r,
}
sent_pw = ap_pbase64decode(r->pool, auth_line);
}
sent_pw = ap_pbase64decode(r->pool, auth_line);
- if (sent_pw == NULL || *sent_pw == '\0') {
- log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "empty passwords are not accepted");
- ret = HTTP_UNAUTHORIZED;
- goto end;
- }
-
sent_name = ap_getword (r->pool, &sent_pw, ':');
/* do not allow user to override realm setting of server */
if (strchr(sent_name, '@')) {
sent_name = ap_getword (r->pool, &sent_pw, ':');
/* do not allow user to override realm setting of server */
if (strchr(sent_name, '@')) {
@@
-667,6
+660,13
@@
int authenticate_user_krb5pwd(request_rec *r,
goto end;
}
goto end;
}
+ if (sent_pw == NULL || *sent_pw == '\0') {
+ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ "empty passwords are not accepted");
+ ret = HTTP_UNAUTHORIZED;
+ goto end;
+ }
+
/* XXX Heimdal allows to use the MEMORY: type with empty argument ? */
ccname = ap_psprintf(r->pool, "MEMORY:%s/krb5cc_apache_XXXXXX", P_tmpdir);
fd = mkstemp(ccname + strlen("MEMORY:"));
/* XXX Heimdal allows to use the MEMORY: type with empty argument ? */
ccname = ap_psprintf(r->pool, "MEMORY:%s/krb5cc_apache_XXXXXX", P_tmpdir);
fd = mkstemp(ccname + strlen("MEMORY:"));