svn commit: samba r22296 - in branches/SAMBA_4_0/source/heimdal_build: .

[metze at samba.org]

Author: metze
Date: 2007-04-17 07:45:54 +0000 (Tue, 17 Apr 2007)
New Revision: 22296

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22296

Log:
heimdal/lib/roken/roken.h.in includes <socket_wrapper.h>
which doesn't work on some hosts in the farm

so include socket_wrapper via "system/network.h" as the rest of samba4

metze
Modified:
   branches/SAMBA_4_0/source/heimdal_build/roken.h


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/roken.h
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/roken.h	2007-04-17 03:52:08 UTC (rev 22295)
+++ branches/SAMBA_4_0/source/heimdal_build/roken.h	2007-04-17 07:45:54 UTC (rev 22296)
@@ -73,9 +73,12 @@
 #define HAVE_INNETGR
 #endif
 
-#ifdef SOCKET_WRAPPER
-#define SOCKET_WRAPPER_REPLACE SOCKET_WRAPPER
-#endif
+/*
+ * 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"
+#include "system/network.h"
 
-#include "heimdal/lib/roken/roken.h.in"
 #endif