4 files changed, 23 insertions, 2 deletions
diff --git a/source4/include/core.h b/source4/include/core.h
index ab5c1a55a3..28a14562ef 100644
--- a/source4/include/core.h
+++ b/source4/include/core.h
@@ -58,4 +58,20 @@ struct ipv4_addr {
 
 typedef NTSTATUS (*init_module_fn) (void);
 
+/* 
+   use the same structure for dom_sid2 as dom_sid. A dom_sid2 is really
+   just a dom sid, but with the sub_auths represented as a conformant
+   array. As with all in-structure conformant arrays, the array length
+   is placed before the start of the structure. That's what gives rise
+   to the extra num_auths elemenent. We don't want the Samba code to
+   have to bother with such esoteric NDR details, so its easier to just
+   define it as a dom_sid and use pidl magic to make it all work. It
+   just means you need to mark a sid as a "dom_sid2" in the IDL when you
+   know it is of the conformant array variety
+*/
+#define dom_sid2 dom_sid
+
+/* same struct as dom_sid but inside a 28 bytes fixed buffer in NDR */
+#define dom_sid28 dom_sid
+
 #endif /* _SAMBA_CORE_H */
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 89d586b75c..71fa67c251 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -119,8 +119,6 @@ enum brl_type {
 #include "librpc/ndr/ndr_orpc.h"
 #include "librpc/gen_ndr/orpc.h"
 #include "librpc/rpc/dcerpc.h"
-#include "libcli/raw/trans2.h"
-#include "libcli/raw/interfaces.h"
 #include "auth/credentials/credentials.h"
 #include "libcli/nbt/libnbt.h"
 #include "libcli/util/proto.h"
diff --git a/source4/include/smb.h b/source4/include/smb.h
index 78a66dd20a..7b2f1e903c 100644
--- a/source4/include/smb.h
+++ b/source4/include/smb.h
@@ -579,4 +579,7 @@
 #define _smb2_setlen(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0xFF0000)>>16; \
         (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0)
 
+#include "libcli/raw/trans2.h"
+#include "libcli/raw/interfaces.h"
+
 #endif /* _SMB_H */
diff --git a/source4/include/structs.h b/source4/include/structs.h
index 5148f08a9b..124d97f493 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -159,3 +159,7 @@ struct smbcli_session;
 struct smbcli_state;
 
 struct model_ops;
+
+struct smb_wire_string;
+
+union smb_fileinfo;