Changeset 745 for trunk/server/source4/heimdal_build/roken.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/heimdal_build/roken.h (modified) (4 diffs)

trunk/server/source4/heimdal_build/roken.h

@@ -5 +5 @@
 #define _ROKEN_H_
 
+#include "config.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"
 
-/* HDB module dir - set to Samba LIBDIR/hdb ? */
-#define HDBDIR "/usr/heimdal/lib"
-#define LIBDIR "/usr/heimdal/lib"
+#define rk_PATH_DELIM '/'
+
 #define HEIMDAL_LOCALEDIR "/usr/heimdal/locale"
 
@@ -20 +24 @@
 #define PKINIT 1
 
-#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.8pre"}
-
-#define VERSION "Samba"
-
 #define ROKEN_LIB_FUNCTION
-
+#define ROKEN_LIB_CALL
+#define ROKEN_LIB_VARIABLE
 #define GETHOSTBYADDR_PROTO_COMPATIBLE
 #define GETSERVBYNAME_PROTO_COMPATIBLE
@@ -103 +104 @@
 #endif
 
+#ifndef HAVE_INET_NTOP
+#define HAVE_INET_NTOP
+#endif
+
+#ifndef HAVE_INET_PTON
+#define HAVE_INET_PTON
+#endif
+
+#ifndef HAVE_GETTIMEOFDAY
+#define HAVE_GETTIMEOFDAY
+#endif
+
+#ifndef HAVE_SETEGID
+#define HAVE_SETEGID
+#endif
+
+#ifndef HAVE_SETEUID
+#define HAVE_SETEUID
+#endif
+
+/* force the use of the libreplace strerror_r */
+#ifndef HAVE_STRERROR_R
+#define HAVE_STRERROR_R
+#endif
+#ifndef STRERROR_R_PROTO_COMPATIBLE
+#define STRERROR_R_PROTO_COMPATIBLE
+#endif
+
+#ifndef HAVE_DIRFD
+#ifdef HAVE_DIR_DD_FD
+#define dirfd(x) ((x)->dd_fd)
+#else
+#define dirfd(d) (-1)
+#endif
+#define HAVE_DIRFD 1
+#endif
+
+
 /* we lie about having pidfile() so that NetBSD5 can compile. Nothing
    in the parts of heimdal we use actually uses pidfile(), and we
@@ -128 +167 @@
 extern const char *heimdal_long_version;
 
+/* we do not want any __APPLE__ magic */
+#ifdef __APPLE__
+#undef __APPLE__
 #endif
+
+#endif