summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-11-11 16:39:44 +1100
committerDarren Tucker <dtucker@zip.com.au>2008-11-11 16:39:44 +1100
commit49c31c42250e99af9170623094585d8851838a62 (patch)
tree3e01c375b24f136e5ac0ba86512ba24430522484
parent63917bd0dae6189147dc4cafaeaf6f1d91b14cfe (diff)
- stevesk@cvs.openbsd.org 2008/11/11 02:58:09
[servconf.c] USE_AFS not referenced so remove #ifdef. fixes sshd -T not printing kerberosgetafstoken. ok dtucker@ (Id sync only, we still want the ifdef in portable)
-rw-r--r--ChangeLog7
-rw-r--r--servconf.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a167dfea1..91eb0ef70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,11 @@
17 [session.c ssh.1] 17 [session.c ssh.1]
18 typo fixed (overriden -> overridden) 18 typo fixed (overriden -> overridden)
19 ok espie, jmc 19 ok espie, jmc
20 - stevesk@cvs.openbsd.org 2008/11/11 02:58:09
21 [servconf.c]
22 USE_AFS not referenced so remove #ifdef. fixes sshd -T not printing
23 kerberosgetafstoken. ok dtucker@
24 (Id sync only, we still want the ifdef in portable)
20 25
2120081105 2620081105
22 - OpenBSD CVS Sync 27 - OpenBSD CVS Sync
@@ -4909,4 +4914,4 @@
4909 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4914 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4910 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4915 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4911 4916
4912$Id: ChangeLog,v 1.5137 2008/11/11 05:33:48 dtucker Exp $ 4917$Id: ChangeLog,v 1.5138 2008/11/11 05:39:44 dtucker Exp $
diff --git a/servconf.c b/servconf.c
index 053e20a78..659a1eb21 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.191 2008/11/05 11:22:54 jmc Exp $ */ 1/* $OpenBSD: servconf.c,v 1.192 2008/11/11 02:58:09 stevesk 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