diff options
author | kris <kris@FreeBSD.org> | 2000-05-15 05:24:25 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2000-05-15 05:24:25 +0000 |
commit | a632b4789caf015f977f45e2d106cc00efa1239f (patch) | |
tree | eb8a772c0dc7204d341277f265caa0c7c543c32c /crypto/openssh/auth-krb4.c | |
parent | 8cf8ce7bb13515db269566309a8e9cd8b309ee56 (diff) | |
download | FreeBSD-src-a632b4789caf015f977f45e2d106cc00efa1239f.zip FreeBSD-src-a632b4789caf015f977f45e2d106cc00efa1239f.tar.gz |
Resolve conflicts and update for FreeBSD.
Diffstat (limited to 'crypto/openssh/auth-krb4.c')
-rw-r--r-- | crypto/openssh/auth-krb4.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/openssh/auth-krb4.c b/crypto/openssh/auth-krb4.c index 0b09eb9..b3fcfafb 100644 --- a/crypto/openssh/auth-krb4.c +++ b/crypto/openssh/auth-krb4.c @@ -21,7 +21,7 @@ extern ServerOptions options; * return 1 on success, 0 on failure, -1 if krb4 is not available */ -int +int auth_krb4_password(struct passwd * pw, const char *password) { AUTH_DAT adata; @@ -137,7 +137,7 @@ krb4_cleanup_proc(void *ignore) } } -int +int krb4_init(uid_t uid) { static int cleanup_registered = 0; @@ -181,7 +181,7 @@ krb4_init(uid_t uid) return 0; } -int +int auth_krb4(const char *server_user, KTEXT auth, char **client) { AUTH_DAT adat = {0}; @@ -254,7 +254,7 @@ auth_krb4(const char *server_user, KTEXT auth, char **client) #endif /* KRB4 */ #ifdef AFS -int +int auth_krb4_tgt(struct passwd *pw, const char *string) { CREDENTIALS creds; @@ -309,7 +309,7 @@ auth_kerberos_tgt_failure: return 0; } -int +int auth_afs_token(struct passwd *pw, const char *token_string) { CREDENTIALS creds; |