--- cygnus/src/acconfig.h	Tue Jul  1 14:04:36 1997
+++ kerbnet-1.2/acconfig.h	Tue May 27 21:54:50 1997
@@ -16,6 +16,7 @@
 #undef KRB5_PROVIDE_PROTOTYPES
 #undef KRB5_NO_NESTED_PROTOTYPES
 #undef NO_STDLIB_H
+#undef KRB5_GETTIMEOFDAY_TWOARGS
 
 #undef NO_YYLINENO
 #undef POSIX_FILE_LOCKS
@@ -28,7 +29,6 @@
 #undef krb5_sigtype
 #undef HAS_UNISTD_H
 #undef KRB5_USE_INET
-#undef ODBM
 
 #undef HAVE_STDARG_H
 #undef HAVE_VARARGS_H
@@ -38,3 +38,75 @@
 
 /* Define if Kerberos V4 backwards compatibility should be supported */
 #undef KRB5_KRB4_COMPAT
+
+/*
+ * The stuff following here is taken from util/db2/acconfig.h
+ */
+
+#undef ssize_t
+
+/* BSD4.3, non-posix types */
+
+#undef u_char
+#undef u_short
+#undef u_int
+#undef u_long
+
+/* sized types used by db internals */
+
+#undef int8_t
+#undef u_int8_t
+#undef int16_t
+#undef u_int16_t
+#undef int32_t
+#undef u_int32_t
+
+/* CYGNUS LOCAL rest of file */
+
+/* only some of our programs both check this and use CONFIG_HEADER */
+#undef NEED_SYS_ERRLIST
+
+#undef NO_UT_PID
+#undef NO_UT_TYPE
+#undef NO_UT_HOST
+#undef NO_UT_EXIT
+#undef HAVE_STRUCT_UTMP_UT_EXIT
+#undef HAVE_STRUCT_UTMP_UT_HOST
+#undef HAVE_STRUCT_UTMP_UT_PID
+#undef HAVE_STRUCT_UTMP_UT_TYPE
+
+/* for xdm */
+#undef BINDIR
+#undef XRDB_PROGRAM
+#undef DEF_SESSION
+#undef DEF_USER_PATH
+#undef DEF_SYSTEM_PATH
+#undef DEF_SYSTEM_SHELL
+#undef DEF_FAILSAFE_CLIENT
+#undef XDMDIR
+
+#undef DEF_XDM_CONFIG
+#undef DEF_CHOOSER
+#undef DEF_AUTH_NAME
+#undef DEF_USER_AUTH_DIR
+#undef DEF_KEY_FILE
+#undef DEF_ACCESS_FILE
+#undef DEF_RANDOM_FILE
+#undef DEF_GREETER_LIB
+
+#undef LLOG_FILE
+#undef UTMP_FILE
+#undef WTMP_FILE
+#undef TTYS_FILE
+#undef TARGET_VENDOR
+#undef DEF_AUTH_DIR
+#undef DEF_SERVER
+#undef SignalReturnsInt
+#undef USESHADOW
+
+#undef SYS_ERRLIST_DECLARED
+#undef HAVE_SYS_ERRLIST
+
+#undef SIZEOF_SHORT
+#undef SIZEOF_INT
+#undef SIZEOF_LONG