Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

(This used to be commit 33a9859cbdb0dac035af36aa561b6acb24196c86)

2 files changed, 0 insertions, 69 deletions

diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index 902d1e20b2..5cdcd21251 100644
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -689,19 +689,6 @@ typedef struct lsa_r_unk_get_connuser
 } LSA_R_UNK_GET_CONNUSER;
 
 
-typedef struct lsa_q_openaccount
-{
-	POLICY_HND pol; /* policy handle */
-	DOM_SID2 sid;
-	uint32 access; /* desired access */
-} LSA_Q_OPENACCOUNT;
-
-typedef struct lsa_r_openaccount
-{
-	POLICY_HND pol; /* policy handle */
-	NTSTATUS status;
-} LSA_R_OPENACCOUNT;
-
 typedef struct lsa_q_enumprivsaccount
 {
 	POLICY_HND pol; /* policy handle */
@@ -715,29 +702,6 @@ typedef struct lsa_r_enumprivsaccount
 	NTSTATUS status;
 } LSA_R_ENUMPRIVSACCOUNT;
 
-typedef struct lsa_q_getsystemaccount
-{
-	POLICY_HND pol; /* policy handle */
-} LSA_Q_GETSYSTEMACCOUNT;
-
-typedef struct lsa_r_getsystemaccount
-{
-	uint32 access;
-	NTSTATUS status;
-} LSA_R_GETSYSTEMACCOUNT;
-
-
-typedef struct lsa_q_setsystemaccount
-{
-	POLICY_HND pol; /* policy handle */
-	uint32 access;
-} LSA_Q_SETSYSTEMACCOUNT;
-
-typedef struct lsa_r_setsystemaccount
-{
-	NTSTATUS status;
-} LSA_R_SETSYSTEMACCOUNT;
-
 typedef struct {
 	UNIHDR hdr;
 	UNISTR2 unistring;
diff --git a/source3/include/rpc_netlogon.h b/source3/include/rpc_netlogon.h
index 21dd42d77e..bab2caaf61 100644
--- a/source3/include/rpc_netlogon.h
+++ b/source3/include/rpc_netlogon.h
@@ -1029,37 +1029,4 @@ struct DS_DOMAIN_CONTROLLER_INFO {
 	const char *client_site_name;
 };
 
-/* NET_Q_DSR_GETDCNAME */
-typedef struct net_q_dsr_getdcname {
-	uint32 ptr_server_unc;
-	UNISTR2 uni_server_unc;
-	uint32 ptr_domain_name;
-	UNISTR2 uni_domain_name;
-	uint32 ptr_domain_guid;
-	struct GUID *domain_guid;
-	uint32 ptr_site_guid;
-	struct GUID *site_guid;
-	uint32 flags;
-} NET_Q_DSR_GETDCNAME;
-
-/* NET_R_DSR_GETDCNAME */
-typedef struct net_r_dsr_getdcname {
-	uint32 ptr_dc_unc;
-	UNISTR2 uni_dc_unc;
-	uint32 ptr_dc_address;
-	UNISTR2 uni_dc_address;
-	int32 dc_address_type;
-	struct GUID domain_guid;
-	uint32 ptr_domain_name;
-	UNISTR2 uni_domain_name;
-	uint32 ptr_forest_name;
-	UNISTR2 uni_forest_name;
-	uint32 dc_flags;
-	uint32 ptr_dc_site_name;
-	UNISTR2 uni_dc_site_name;
-	uint32 ptr_client_site_name;
-	UNISTR2 uni_client_site_name;
-	WERROR result;
-} NET_R_DSR_GETDCNAME;
-
 #endif /* _RPC_NETLOGON_H */