summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--servconf.c8
2 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d08a80d3..85af46f84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
120080721 120080721
2 - (djm) OpenBSD CVS Sync 2 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2008/07/23 07:36:55
4 [servconf.c]
5 do not try to print options that have been compile-time disabled
6 in config test mode (sshd -T); report from nix-corp AT esperi.org.uk
7 ok dtucker@
8
920080721
10 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2008/07/18 22:51:01 11 - jmc@cvs.openbsd.org 2008/07/18 22:51:01
4 [sftp-server.8] 12 [sftp-server.8]
5 no need for .Pp before or after .Sh; 13 no need for .Pp before or after .Sh;
@@ -4710,4 +4718,4 @@
4710 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4718 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4711 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4719 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4712 4720
4713$Id: ChangeLog,v 1.5095 2008/07/21 08:22:25 djm Exp $ 4721$Id: ChangeLog,v 1.5096 2008/07/23 07:40:04 djm Exp $
diff --git a/servconf.c b/servconf.c
index 66e22979f..72746d34e 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.186 2008/07/04 03:44:59 djm Exp $ */ 1/* $OpenBSD: servconf.c,v 1.187 2008/07/23 07:36:55 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -1562,12 +1562,18 @@ dump_config(ServerOptions *o)
1562 o->hostbased_uses_name_from_packet_only); 1562 o->hostbased_uses_name_from_packet_only);
1563 dump_cfg_fmtint(sRSAAuthentication, o->rsa_authentication); 1563 dump_cfg_fmtint(sRSAAuthentication, o->rsa_authentication);
1564 dump_cfg_fmtint(sPubkeyAuthentication, o->pubkey_authentication); 1564 dump_cfg_fmtint(sPubkeyAuthentication, o->pubkey_authentication);
1565#ifdef KRB5
1565 dump_cfg_fmtint(sKerberosAuthentication, o->kerberos_authentication); 1566 dump_cfg_fmtint(sKerberosAuthentication, o->kerberos_authentication);
1566 dump_cfg_fmtint(sKerberosOrLocalPasswd, o->kerberos_or_local_passwd); 1567 dump_cfg_fmtint(sKerberosOrLocalPasswd, o->kerberos_or_local_passwd);
1567 dump_cfg_fmtint(sKerberosTicketCleanup, o->kerberos_ticket_cleanup); 1568 dump_cfg_fmtint(sKerberosTicketCleanup, o->kerberos_ticket_cleanup);
1569# ifdef USE_AFS
1568 dump_cfg_fmtint(sKerberosGetAFSToken, o->kerberos_get_afs_token); 1570 dump_cfg_fmtint(sKerberosGetAFSToken, o->kerberos_get_afs_token);
1571# endif
1572#endif
1573#ifdef GSSAPI
1569 dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); 1574 dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
1570 dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); 1575 dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
1576#endif
1571 dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication); 1577 dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
1572 dump_cfg_fmtint(sKbdInteractiveAuthentication, 1578 dump_cfg_fmtint(sKbdInteractiveAuthentication,
1573 o->kbd_interactive_authentication); 1579 o->kbd_interactive_authentication);