diff options
| author | des <des@FreeBSD.org> | 2003-04-23 17:13:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-04-23 17:13:13 +0000 |
| commit | 58b9db3b6f971290d3f183595398923fba625338 (patch) | |
| tree | fbb17bcf9ee0d969274a32106e1f15ae9a690fa3 /crypto/openssh/auth-krb5.c | |
| parent | 6d34992e86f885f08b7df6e18a0b6af25ec2d664 (diff) | |
| download | FreeBSD-src-58b9db3b6f971290d3f183595398923fba625338.zip FreeBSD-src-58b9db3b6f971290d3f183595398923fba625338.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/auth-krb5.c')
| -rw-r--r-- | crypto/openssh/auth-krb5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/auth-krb5.c b/crypto/openssh/auth-krb5.c index 06eb9b7..dbd4163 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.9 2002/09/09 06:48:06 itojun Exp $"); +RCSID("$OpenBSD: auth-krb5.c,v 1.10 2002/11/21 23:03:51 deraadt Exp $"); RCSID("$FreeBSD$"); #include "ssh.h" @@ -108,7 +108,7 @@ auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client, krb5_data *reply) if (problem) goto err; - problem = krb5_sname_to_principal(authctxt->krb5_ctx, NULL, NULL , + problem = krb5_sname_to_principal(authctxt->krb5_ctx, NULL, NULL, KRB5_NT_SRV_HST, &server); if (problem) goto err; |
