[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  f81c840 s4 rpc_server: fix a build error on freebsd
      from  1229935 torture/becomedc: Add test for global schema, use samdb_connect().

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f81c8403807033023512fd83985124904b7f1505
Author: Matthieu Patou <mat at matws.net>
Date:   Wed Oct 13 14:06:46 2010 +0400

    s4 rpc_server: fix a build error on freebsd
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Wed Oct 13 10:48:04 UTC 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/rpc_server/dcerpc_server.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 3064e29..dc3b9bc 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1455,6 +1455,15 @@ static void dcesrv_terminate_connection(struct dcesrv_connection *dce_conn, cons
 
 	stream_terminate_connection(srv_conn, reason);
 }
+/* We need this include to be able to compile on some plateforms
+ * (ie. freebsd 7.2) as it seems that <sys/uio.h> is not included
+ * correctly.
+ * It has to be that deep because otherwise we have a conflict on
+ * const struct dcesrv_interface declaration.
+ * This is mostly due to socket_wrapper defining #define bind swrap_bind
+ * which conflict with the bind used before.
+ */
+#include "system/network.h"
 
 struct dcesrv_sock_reply_state {
 	struct dcesrv_connection *dce_conn;


-- 
Samba Shared Repository