From a49d36e7b9727edf472750a249dd7655ae1594fd Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 2 Oct 2003 16:20:54 +1000 Subject: [PATCH] - markus@cvs.openbsd.org 2003/09/29 20:19:57 [servconf.c sshd_config] GSSAPICleanupCreds -> GSSAPICleanupCredentials --- ChangeLog | 5 ++++- servconf.c | 6 +++--- sshd_config | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d25f7c05b..b8cd03252 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,9 @@ - some other cleanup requested by deraadt@; ok deraadt@ markus@ + - markus@cvs.openbsd.org 2003/09/29 20:19:57 + [servconf.c sshd_config] + GSSAPICleanupCreds -> GSSAPICleanupCredentials 20030930 - (bal) Fix issues in openbsd-compat/realpath.c @@ -1260,4 +1263,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3049 2003/10/02 06:19:47 dtucker Exp $ +$Id: ChangeLog,v 1.3050 2003/10/02 06:20:54 dtucker Exp $ diff --git a/servconf.c b/servconf.c index 58f49a2f4..0df62ad63 100644 --- a/servconf.c +++ b/servconf.c @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: servconf.c,v 1.127 2003/09/01 18:15:50 markus Exp $"); +RCSID("$OpenBSD: servconf.c,v 1.128 2003/09/29 20:19:57 markus Exp $"); #include "ssh.h" #include "log.h" @@ -310,10 +310,10 @@ static struct { { "afstokenpassing", sUnsupported }, #ifdef GSSAPI { "gssapiauthentication", sGssAuthentication }, - { "gssapicleanupcreds", sGssCleanupCreds }, + { "gssapicleanupcredentials", sGssCleanupCreds }, #else { "gssapiauthentication", sUnsupported }, - { "gssapicleanupcreds", sUnsupported }, + { "gssapicleanupcredentials", sUnsupported }, #endif { "passwordauthentication", sPasswordAuthentication }, { "kbdinteractiveauthentication", sKbdInteractiveAuthentication }, diff --git a/sshd_config b/sshd_config index af0dec09f..5e026a609 100644 --- a/sshd_config +++ b/sshd_config @@ -1,4 +1,4 @@ -# $OpenBSD: sshd_config,v 1.65 2003/08/28 12:54:34 markus Exp $ +# $OpenBSD: sshd_config,v 1.66 2003/09/29 20:19:57 markus Exp $ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. @@ -64,7 +64,7 @@ # GSSAPI options #GSSAPIAuthentication no -#GSSAPICleanupCreds yes +#GSSAPICleanupCredentials yes # Set this to 'yes' to enable PAM authentication (via challenge-response) # and session processing. Depending on your PAM configuration, this may