diff options
| author | des <des@FreeBSD.org> | 2006-03-22 19:46:12 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-03-22 19:46:12 +0000 |
| commit | 448503722a8c8934d8520302b7551e95de730b06 (patch) | |
| tree | 42b3633dec62ddc0b702c6e83df5d64683b1c6c3 /crypto/openssh/auth-krb5.c | |
| parent | 755a16fa864cacbbd9fbefc822011b6741351d8d (diff) | |
| download | FreeBSD-src-448503722a8c8934d8520302b7551e95de730b06.zip FreeBSD-src-448503722a8c8934d8520302b7551e95de730b06.tar.gz | |
Vendor import of OpenSSH 4.3p1.
Diffstat (limited to 'crypto/openssh/auth-krb5.c')
| -rw-r--r-- | crypto/openssh/auth-krb5.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crypto/openssh/auth-krb5.c b/crypto/openssh/auth-krb5.c index ac1333c..11dbd68 100644 --- a/crypto/openssh/auth-krb5.c +++ b/crypto/openssh/auth-krb5.c @@ -28,7 +28,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-krb5.c,v 1.15 2003/11/21 11:57:02 djm Exp $"); +RCSID("$OpenBSD: auth-krb5.c,v 1.16 2005/11/21 09:42:10 dtucker Exp $"); #include "ssh.h" #include "ssh1.h" @@ -69,9 +69,6 @@ auth_krb5_password(Authctxt *authctxt, const char *password) krb5_ccache ccache = NULL; int len; - if (!authctxt->valid) - return (0); - temporarily_use_uid(authctxt->pw); problem = krb5_init(authctxt); @@ -188,7 +185,7 @@ auth_krb5_password(Authctxt *authctxt, const char *password) else return (0); } - return (1); + return (authctxt->valid ? 1 : 0); } void @@ -218,7 +215,7 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { ret = snprintf(ccname, sizeof(ccname), "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); - if (ret == -1 || ret >= sizeof(ccname)) + if (ret < 0 || (size_t)ret >= sizeof(ccname)) return ENOMEM; old_umask = umask(0177); |
