Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test

(This used to be commit 3a61e663e51fe620225691bc8673bf8800a36f47)

2 files changed, 4 insertions, 169 deletions

diff --git a/source3/include/reg_objects.h b/source3/include/reg_objects.h
index f6cf9cccb7..23a14e6757 100644
--- a/source3/include/reg_objects.h
+++ b/source3/include/reg_objects.h
@@ -61,6 +61,7 @@ struct registry_value {
 typedef struct {
 	uint32          num_values;
 	REGISTRY_VALUE	**values;
+	int seqnum;
 } REGVAL_CTR;
 
 /* container for registry subkey names */
@@ -68,6 +69,7 @@ typedef struct {
 typedef struct {
 	uint32          num_subkeys;
 	char            **subkeys;
+	int seqnum;
 } REGSUBKEY_CTR;
 
 /*
@@ -128,6 +130,8 @@ typedef struct {
 			      struct security_descriptor **psecdesc);
 	WERROR (*set_secdesc)(const char *key,
 			      struct security_descriptor *sec_desc);
+	bool	(*subkeys_need_update)(REGSUBKEY_CTR *subkeys);
+	bool	(*values_need_update)(REGVAL_CTR *values);
 } REGISTRY_OPS;
 
 typedef struct {
diff --git a/source3/include/rpc_lsa.h b/source3/include/rpc_lsa.h
index 9f90b53ffa..ef6ff6db28 100644
--- a/source3/include/rpc_lsa.h
+++ b/source3/include/rpc_lsa.h
@@ -334,22 +334,6 @@ typedef struct lsa_info_ctr
 
 typedef LSA_INFO_CTR LSA_INFO_CTR2;
 
-/* LSA_Q_SET_INFO - LSA set info policy */
-typedef struct lsa_set_info
-{
-	POLICY_HND pol; /* policy handle */
-	uint16 info_class; /* info class */
-	LSA_INFO_CTR ctr;
-
-} LSA_Q_SET_INFO;
-
-/* LSA_R_SET_INFO - response to LSA set info policy */
-typedef struct lsa_r_set_info
-{
-	NTSTATUS status; /* return code */
-
-} LSA_R_SET_INFO;
-
 /* LSA_R_QUERY_INFO - response to LSA query info policy */
 typedef struct lsa_r_query_info
 {
@@ -988,25 +972,6 @@ typedef struct {
 
 /*******************************************************/
 
-/* LSA_Q_OPEN_TRUSTED_DOMAIN_BY_NAME - LSA Query Open Trusted Domain by Name*/
-typedef struct lsa_q_open_trusted_domain_by_name
-{
-	POLICY_HND 	pol; 	/* policy handle */
-	LSA_STRING 	name;	/* domain name */
-	uint32 	access_mask;	/* access mask */
-	
-} LSA_Q_OPEN_TRUSTED_DOMAIN_BY_NAME;
-
-/* LSA_R_OPEN_TRUSTED_DOMAIN_BY_NAME - response to LSA Query Open Trusted Domain by Name */
-typedef struct {
-	POLICY_HND	handle;	/* trustdom policy handle */
-	NTSTATUS	status; /* return code */
-} LSA_R_OPEN_TRUSTED_DOMAIN_BY_NAME;
-
-
-/*******************************************************/
-
-
 typedef struct {
 	POLICY_HND	handle;	
 	UNISTR4		secretname;
@@ -1078,140 +1043,6 @@ typedef struct {
 	NTSTATUS	status;
 } LSA_R_SET_SECRET;
 
-/* LSA_Q_QUERY_TRUSTED_DOMAIN_INFO - LSA query trusted domain info */
-typedef struct lsa_query_trusted_domain_info
-{
-	POLICY_HND	pol; 		/* policy handle */
-	uint16		info_class; 	/* info class */
-
-} LSA_Q_QUERY_TRUSTED_DOMAIN_INFO;
-
-/* LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_SID - LSA query trusted domain info */
-typedef struct lsa_query_trusted_domain_info_by_sid
-{
-	POLICY_HND 	pol; 		/* policy handle */
-	DOM_SID2 	dom_sid;	/* domain sid */
-	uint16		info_class; 	/* info class */
-	
-} LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_SID;
-
-/* LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_NAME - LSA query trusted domain info */
-typedef struct lsa_query_trusted_domain_info_by_name
-{
-	POLICY_HND 	pol; 		/* policy handle */
-	LSA_STRING 	domain_name;	/* domain name */
-	uint16 		info_class; 	/* info class */
-	
-} LSA_Q_QUERY_TRUSTED_DOMAIN_INFO_BY_NAME;
-
-typedef struct trusted_domain_info_name {
-	LSA_STRING 	netbios_name; 
-} TRUSTED_DOMAIN_INFO_NAME;
-
-typedef struct trusted_domain_info_posix_offset {
-	uint32 		posix_offset;
-} TRUSTED_DOMAIN_INFO_POSIX_OFFSET;
-
-typedef struct lsa_data_buf {
-	uint32 size;
-	uint32 offset;
-	uint32 length;
-	uint8 *data;
-} LSA_DATA_BUF;
-
-typedef struct lsa_data_buf_hdr {
-	uint32 length;
-	uint32 size;
-	uint32 data_ptr;
-} LSA_DATA_BUF_HDR;
-
-
-typedef struct lsa_data_buf2 {
-	uint32 size;
-	uint8 *data;
-} LSA_DATA_BUF2;
-
-typedef struct trusted_domain_info_password {
-	uint32 ptr_password;
-	uint32 ptr_old_password;
-	LSA_DATA_BUF_HDR password_hdr;
-	LSA_DATA_BUF_HDR old_password_hdr;
-	LSA_DATA_BUF password;
-	LSA_DATA_BUF old_password;
-} TRUSTED_DOMAIN_INFO_PASSWORD;
-
-typedef struct trusted_domain_info_basic {
-	LSA_STRING 	netbios_name;
-	DOM_SID2 	sid;
-} TRUSTED_DOMAIN_INFO_BASIC;
-
-typedef struct trusted_domain_info_ex {
-	LSA_STRING 	domain_name;
-	LSA_STRING 	netbios_name;
-	DOM_SID2 	sid;
-	uint32 		trust_direction;
-	uint32 		trust_type;
-	uint32 		trust_attributes;
-} TRUSTED_DOMAIN_INFO_EX;
-
-typedef struct trust_domain_info_buffer {
-	NTTIME 		last_update_time;
-	uint32 		secret_type;
-	LSA_DATA_BUF2 	data;
-} LSA_TRUSTED_DOMAIN_INFO_BUFFER;
-
-typedef struct trusted_domain_info_auth_info {
-	uint32 incoming_count;
-	LSA_TRUSTED_DOMAIN_INFO_BUFFER incoming_current_auth_info;
-	LSA_TRUSTED_DOMAIN_INFO_BUFFER incoming_previous_auth_info;
-	uint32 outgoing_count;
-	LSA_TRUSTED_DOMAIN_INFO_BUFFER outgoing_current_auth_info;
-	LSA_TRUSTED_DOMAIN_INFO_BUFFER outgoing_previous_auth_info;
-} TRUSTED_DOMAIN_INFO_AUTH_INFO;
-
-typedef struct trusted_domain_info_full_info {
-	TRUSTED_DOMAIN_INFO_EX 		info_ex;
-	TRUSTED_DOMAIN_INFO_POSIX_OFFSET posix_offset;
-	TRUSTED_DOMAIN_INFO_AUTH_INFO 	auth_info;
-} TRUSTED_DOMAIN_INFO_FULL_INFO;
-
-typedef struct trusted_domain_info_11 {
-	TRUSTED_DOMAIN_INFO_EX 		info_ex;
-	LSA_DATA_BUF2 			data1;
-} TRUSTED_DOMAIN_INFO_11;
-
-typedef struct trusted_domain_info_all {
-	TRUSTED_DOMAIN_INFO_EX 		info_ex;
-	LSA_DATA_BUF2 			data1;
-	TRUSTED_DOMAIN_INFO_POSIX_OFFSET posix_offset;
-	TRUSTED_DOMAIN_INFO_AUTH_INFO 	auth_info;
-} TRUSTED_DOMAIN_INFO_ALL;
-
-/* LSA_TRUSTED_DOMAIN_INFO */
-typedef union lsa_trusted_domain_info
-{
-	uint16 					info_class;
-	TRUSTED_DOMAIN_INFO_NAME		name;
-	/* deprecated - gd
-	TRUSTED_DOMAIN_INFO_CONTROLLERS_INFO	controllers; */
-	TRUSTED_DOMAIN_INFO_POSIX_OFFSET	posix_offset;
-	TRUSTED_DOMAIN_INFO_PASSWORD		password;
-	TRUSTED_DOMAIN_INFO_BASIC		basic;
-	TRUSTED_DOMAIN_INFO_EX			info_ex;
-	TRUSTED_DOMAIN_INFO_AUTH_INFO		auth_info;
-	TRUSTED_DOMAIN_INFO_FULL_INFO		full_info;
-	TRUSTED_DOMAIN_INFO_11			info11;
-	TRUSTED_DOMAIN_INFO_ALL			info_all;
-
-} LSA_TRUSTED_DOMAIN_INFO;
-
-/* LSA_R_QUERY_TRUSTED_DOMAIN_INFO - LSA query trusted domain info */
-typedef struct r_lsa_query_trusted_domain_info
-{
-	LSA_TRUSTED_DOMAIN_INFO *info;
-	NTSTATUS status;
-} LSA_R_QUERY_TRUSTED_DOMAIN_INFO;
-
 typedef struct dom_info_kerberos {
 	uint32 enforce_restrictions;
 	NTTIME service_tkt_lifetime;