2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c8f56010..b6eb45309 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
    gcc supports it.  ok djm@
  - (dtucker) [scp.c] Update $OpenBSD tag missing from rev 1.175 and remove
    leftover debug code.
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2007/10/29 00:52:45
+     [auth2-gss.c]
+     Allow build without -DGSSAPI; ok deraadt@
+     (Id sync only, Portable already has the ifdefs)
 
 20071030
  - (djm) OpenBSD CVS Sync
@@ -3420,4 +3425,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4796 2007/12/02 11:48:40 dtucker Exp $
+$Id: ChangeLog,v 1.4797 2007/12/02 11:59:45 dtucker Exp $
diff --git a/auth2-gss.c b/auth2-gss.c
index c77c841a3..0e08d889c 100644
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-gss.c,v 1.15 2006/08/03 03:34:41 deraadt Exp $ */
+/* $OpenBSD: auth2-gss.c,v 1.16 2007/10/29 00:52:45 dtucker Exp $ */
 
 /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.