wrap new GSSAPI code (from Simon) in #ifdef GSSAPI

[gssapi-openssh.git] / openssh / openbsd-compat / rresvport.c

diff --git a/openssh/openbsd-compat/rresvport.c b/openssh/openbsd-compat/rresvport.c
index 608a3b184d94567b0a6b22703f0049120c54c740..44eac203631251c163afba885f215a4188aec21f 100644 (file)
--- a/openssh/openbsd-compat/rresvport.c
+++ b/openssh/openbsd-compat/rresvport.c
@@ -11,7 +11,12 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ *     This product includes software developed by Theo de Raadt.
+ * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -28,12 +33,12 @@
  * SUCH DAMAGE.
  */
 
-#include "includes.h"
+#include "config.h"
 
 #ifndef HAVE_RRESVPORT_AF
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rresvport.c,v 1.6 2003/06/03 02:11:35 deraadt Exp $";
+static char *rcsid = "$OpenBSD: rresvport.c,v 1.5 2000/01/26 03:43:20 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "includes.h"