r13624: as abartlet requested, move the saslauthd parsing stuff to a seperate file

metze

diff --git a/source/librpc/config.mk b/source/librpc/config.mk
index f616cdfebfbf7b62c7beb4e473acf989cdf71004..131531dad50038b50008f504e75ec94f16078667 100644 (file)
--- a/source/librpc/config.mk
+++ b/source/librpc/config.mk
@@ -112,6 +112,11 @@ OBJ_FILES = gen_ndr/ndr_drsblobs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
+[SUBSYSTEM::NDR_SASL_HELPERS]
+OBJ_FILES = gen_ndr/ndr_sasl_helpers.o
+NOPROTO = YES
+REQUIRED_SUBSYSTEMS = LIBNDR
+
 [SUBSYSTEM::NDR_POLICYAGENT]
 OBJ_FILES = gen_ndr/ndr_policyagent.o
 NOPROTO = YES
@@ -314,7 +319,8 @@ REQUIRED_SUBSYSTEMS = NDR_IFACE_TABLE NDR_AUDIOSRV NDR_ECHO NDR_DCERPC NDR_EXCHA
        NDR_REMACT NDR_WZCSVC NDR_BROWSER NDR_W32TIME NDR_SCERPC NDR_NTSVCS \
        NDR_NETLOGON NDR_TRKWKS NDR_KEYSVC NDR_KRB5PAC NDR_XATTR NDR_SCHANNEL \
        NDR_ROT NDR_DRSBLOBS NDR_SVCCTL NDR_NBT NDR_WINSREPL NDR_SECURITY \
-       NDR_INITSHUTDOWN NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_DCOM
+       NDR_INITSHUTDOWN NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_DCOM \
+       NDR_SASL_HELPERS
 
 [SUBSYSTEM::RPC_NDR_ROT]
 OBJ_FILES = gen_ndr/ndr_rot_c.o

diff --git a/source/librpc/idl/drsblobs.idl b/source/librpc/idl/drsblobs.idl
index a60287fee55a5851e11d88a896499bf01fa6aedc..d394b5920168090edc91e80b734f72ec9107df6f 100644 (file)
--- a/source/librpc/idl/drsblobs.idl
+++ b/source/librpc/idl/drsblobs.idl
@@ -1,7 +1,7 @@
 #include "idl_types.h"
 
 [
-  uuid("38578646-4566-4564-2244-275796345667"),
+  uuid("1-2-3-4-5"),
   version(0.0),
   pointer_default(unique),
   helpstring("Active Directory Replication LDAP Blobs"),
@@ -162,19 +162,4 @@ interface drsblobs {
        void decode_DsCompressed(
                [in] DsCompressedBlob blob
                );
-
-       typedef [public,flag(NDR_NOALIGN|NDR_BIG_ENDIAN|NDR_PAHEX)] struct {
-               [value(strlen_m(authid))] uint16 authid_length;
-               [charset(UTF8)] uint8 authid[authid_length];
-               uint16 passwd_length;
-               uint8 passwd[passwd_length];
-               [value(strlen_m(service))] uint16 service_length;
-               [charset(UTF8)] uint8 service[service_length];
-               [value(strlen_m(realm))] uint16 realm_length;
-               [charset(UTF8)] uint8 realm[realm_length];
-       } saslauthdRequest;
-
-       void decode_saslauthd(
-               [in] saslauthdRequest req
-               );
 }

diff --git a/source/librpc/idl/sasl_helpers.idl b/source/librpc/idl/sasl_helpers.idl
new file mode 100644 (file)
index 0000000..c57cee0
--- /dev/null
+++ b/source/librpc/idl/sasl_helpers.idl
@@ -0,0 +1,24 @@
+#include "idl_types.h"
+
+[
+  uuid("1-2-3-4-5"),
+  version(0.0),
+  pointer_default(unique),
+  helpstring("SASL helpers")
+]
+interface sasl_helpers {
+       typedef [public,flag(NDR_NOALIGN|NDR_BIG_ENDIAN|NDR_PAHEX)] struct {
+               [value(strlen_m(authid))] uint16 authid_length;
+               [charset(UTF8)] uint8 authid[authid_length];
+               uint16 passwd_length;
+               uint8 passwd[passwd_length];
+               [value(strlen_m(service))] uint16 service_length;
+               [charset(UTF8)] uint8 service[service_length];
+               [value(strlen_m(realm))] uint16 realm_length;
+               [charset(UTF8)] uint8 realm[realm_length];
+       } saslauthdRequest;
+
+       void decode_saslauthd(
+               [in] saslauthdRequest req
+               );
+}