Use generated DSSETUP client & server rpc functions and remove the hand-written ones.

Guenther
(This used to be commit d5ebfccebb1f1b56b45673a506fcdb414103c43b)

3 files changed, 3 insertions, 67 deletions

diff --git a/source3/include/rpc_client.h b/source3/include/rpc_client.h
index 01e2a8421b..c560fd0909 100644
--- a/source3/include/rpc_client.h
+++ b/source3/include/rpc_client.h
@@ -33,6 +33,7 @@
 #include "librpc/gen_ndr/cli_srvsvc.h"
 #include "librpc/gen_ndr/cli_samr.h"
 #include "librpc/gen_ndr/cli_netlogon.h"
+#include "librpc/gen_ndr/cli_dssetup.h"
 
 /* macro to expand cookie-cutter code in cli_xxx() using rpc_api_pipe_req() */
 
diff --git a/source3/include/rpc_ds.h b/source3/include/rpc_ds.h
index 1ba02aede0..0278b61d89 100644
--- a/source3/include/rpc_ds.h
+++ b/source3/include/rpc_ds.h
@@ -20,82 +20,16 @@
 #ifndef _RPC_DS_H /* _RPC_LSA_H */
 #define _RPC_DS_H 
 
-/* Opcodes available on PIPE_LSARPC_DS */
-
-#define DS_GETPRIMDOMINFO      0x00
-#define DS_NOP                 0xFF	/* no op -- placeholder */
-
 /* Opcodes available on PIPE_NETLOGON */
 
 #define DS_ENUM_DOM_TRUSTS      0x28
 
-/* macros for RPC's */
-
-/* DSROLE_PRIMARY_DOMAIN_INFO_BASIC */
-
-/* flags */
-
-#define DSROLE_PRIMARY_DS_RUNNING           0x00000001
-#define DSROLE_PRIMARY_DS_MIXED_MODE        0x00000002
-#define DSROLE_UPGRADE_IN_PROGRESS          0x00000004
-#define DSROLE_PRIMARY_DOMAIN_GUID_PRESENT  0x01000000
-
-/* machine role */
-
-#define DSROLE_DOMAIN_MEMBER_WKS	1
-#define DSROLE_STANDALONE_SRV		2	
-#define DSROLE_DOMAIN_MEMBER_SRV	3
-#define DSROLE_BDC			4
-#define DSROLE_PDC			5
-
 /* Settings for the domainFunctionality attribute in the rootDSE */
 
 #define DS_DOMAIN_FUNCTION_2000		0
 #define DS_DOMAIN_FUCNTION_2003_MIXED	1
 #define DS_DOMAIN_FUNCTION_2003		2
 
-typedef struct
-{
-	uint16		machine_role;
-	uint32		flags;	
-	uint32		netbios_ptr;
-	uint32		dnsname_ptr;
-	uint32		forestname_ptr;
-	
-	struct GUID	domain_guid;	
-	UNISTR2	netbios_domain;
-	UNISTR2	dns_domain;	/* our dns domain */
-	UNISTR2	forest_domain;	/* root domain of the forest to which we belong */
-} DSROLE_PRIMARY_DOMAIN_INFO_BASIC;
-
-typedef struct
-{
-	DSROLE_PRIMARY_DOMAIN_INFO_BASIC	*basic;
-} DS_DOMINFO_CTR;
-
-/* info levels for ds_getprimdominfo() */
-
-#define DsRolePrimaryDomainInfoBasic		1
-
-/* DS_Q_GETPRIMDOMINFO - DsGetPrimaryDomainInformation() request */
-typedef struct 
-{
-	uint16	level;
-} DS_Q_GETPRIMDOMINFO;
-
-/* DS_R_GETPRIMDOMINFO - DsGetPrimaryDomainInformation() response */
-typedef struct 
-{
-	uint32		ptr;
-		
-	uint16		level;
-	uint16		unknown0;	/* 0x455c -- maybe just alignment? */
-
-	DS_DOMINFO_CTR	info;
-	
-	NTSTATUS status;
-} DS_R_GETPRIMDOMINFO;
-
 typedef struct {
 	/* static portion of structure */
 	uint32		netbios_ptr;
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 3160365e17..3e0c997997 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -193,7 +193,7 @@ typedef uint32 codepoint_t;
 #define PIPE_NETLOGON_PLAIN "\\NETLOGON"
 
 #define PI_LSARPC		0
-#define PI_LSARPC_DS		1
+#define PI_DSSETUP		1
 #define PI_SAMR			2
 #define PI_NETLOGON		3
 #define PI_SRVSVC		4
@@ -306,6 +306,7 @@ extern const DATA_BLOB data_blob_null;
 #include "librpc/gen_ndr/svcctl.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "librpc/gen_ndr/samr.h"
+#include "librpc/gen_ndr/dssetup.h"
 #include "librpc/gen_ndr/libnet_join.h"
 
 struct lsa_dom_info {