s4:heimdal New files and supporting logic for heimdal update

[kai/samba-autobuild/.git] / source4 / heimdal_build / roken.h

diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index ff58927ace05194823b17961058b09a7b5f010d7..c95e6dfaeff67aca27fe8fa481c10857fdfe7631 100644 (file)
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -4,22 +4,32 @@
 #ifndef _ROKEN_H_
 #define _ROKEN_H_
 
+/* Support 'weak' keys for now, it can't be worse than NTLM and we don't want to hard-code the behaviour at this point */
+#define HEIM_WEAK_CRYPTO 1
+
 /* path to sysconf - should we force this to samba LIBDIR ? */
 #define SYSCONFDIR "/etc"
 
+#define rk_PATH_DELIM '/'
+
 /* HDB module dir - set to Samba LIBDIR/hdb ? */
 #define HDBDIR "/usr/heimdal/lib"
+#define LIBDIR "/usr/heimdal/lib"
+#define HEIMDAL_LOCALEDIR "/usr/heimdal/locale"
 
 /* Maximum values on all known systems */
 #define MaxHostNameLen (64+4)
 #define MaxPathLen (1024+4)
 
+/* We want PKINIT */
+#define PKINIT 1
+
 #define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.8pre"}
 
 #define VERSION "Samba"
 
 #define ROKEN_LIB_FUNCTION
-
+#define ROKEN_LIB_CALL
 #define GETHOSTBYADDR_PROTO_COMPATIBLE
 #define GETSERVBYNAME_PROTO_COMPATIBLE
 #define OPENLOG_PROTO_COMPATIBLE
@@ -33,27 +43,97 @@
 #define HAVE_SETEUID 1
 #endif
 
+#ifndef HAVE_STRNLEN
+#define HAVE_STRNLEN
+#endif
+
 #ifndef HAVE_STRNDUP
 #define HAVE_STRNDUP
 #endif
 
-#ifndef HAVE_VSYSLOG
-#define HAVE_VSYSLOG
+#ifndef HAVE_STRLCPY
+#define HAVE_STRLCPY
+#endif
+
+#ifndef HAVE_STRLCAT
+#define HAVE_STRLCAT
+#endif
+
+#ifndef HAVE_STRCASECMP
+#define HAVE_STRCASECMP
+#endif
+
+#ifndef HAVE_ASPRINTF
+#define HAVE_ASPRINTF
 #endif
 
-#ifndef HAVE_SOCKLEN_T
-#define HAVE_SOCKLEN_T
+#ifndef HAVE_VASPRINTF
+#define HAVE_VASPRINTF
+#endif
+
+#ifndef HAVE_MKSTEMP
+#define HAVE_MKSTEMP
+#endif
+
+#ifndef HAVE_SETENV
+#define HAVE_SETENV
+#endif
+
+#ifndef HAVE_UNSETENV
+#define HAVE_UNSETENV
+#endif
+
+#ifndef HAVE_VSYSLOG
+#define HAVE_VSYSLOG
 #endif
 
 #ifndef HAVE_SSIZE_T
 #define HAVE_SSIZE_T
 #endif
 
+#ifndef HAVE_STRPTIME
+#define HAVE_STRPTIME
+#endif
+
 #ifndef HAVE_TIMEGM
 #define HAVE_TIMEGM
 #endif
 
-#undef SOCKET_WRAPPER_REPLACE
+#ifndef HAVE_INNETGR
+#define HAVE_INNETGR
+#endif
 
+#ifndef HAVE_INET_ATON
+#define HAVE_INET_ATON
+#endif
+
+#ifndef HAVE_GETTIMEOFDAY
+#define HAVE_GETTIMEOFDAY
+#endif
+
+/* we lie about having pidfile() so that NetBSD5 can compile. Nothing
+   in the parts of heimdal we use actually uses pidfile(), and we
+   don't use it in Samba, so this works, although its ugly */
+#ifndef HAVE_PIDFILE
+#define HAVE_PIDFILE
+#endif
+
+#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
+#ifndef HAVE___ATTRIBUTE__
+#define HAVE___ATTRIBUTE__
+#endif
+#endif
+
+#include "system/network.h"
+
+/*
+ * we don't want that roken.h.in includes socket_wrapper
+ * we include socket_wrapper via "system/network.h"
+ */
+#undef SOCKET_WRAPPER_REPLACE
 #include "heimdal/lib/roken/roken.h.in"
+
+extern const char *heimdal_version;
+extern const char *heimdal_long_version;
+
 #endif