[SCM] Samba Shared Repository - branch master updated - 07b3a1e988deae2e2d8d619fb2792dd0a719504f

Günther Deschner gd at samba.org
Wed Nov 19 21:01:50 GMT 2008


The branch, master has been updated
       via  07b3a1e988deae2e2d8d619fb2792dd0a719504f (commit)
      from  2865be8a1c1d928ad86453e6dbf1c2a3508ad127 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 07b3a1e988deae2e2d8d619fb2792dd0a719504f
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 19 22:00:43 2008 +0100

    s3-build: re-run make samba3-idl after pidl change.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/librpc/gen_ndr/srv_lsa.c      |   28 ++++++++++++++--------------
 source3/librpc/gen_ndr/srv_netlogon.c |   10 +++++-----
 source3/librpc/gen_ndr/srv_ntsvcs.c   |    6 +++---
 source3/librpc/gen_ndr/srv_srvsvc.c   |   20 ++++++++++----------
 source3/librpc/gen_ndr/srv_svcctl.c   |   16 ++++++++--------
 source3/librpc/gen_ndr/srv_winreg.c   |    2 +-
 source3/librpc/gen_ndr/srv_wkssvc.c   |    6 +++---
 7 files changed, 44 insertions(+), 44 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/librpc/gen_ndr/srv_lsa.c b/source3/librpc/gen_ndr/srv_lsa.c
index b089362..c30f276 100644
--- a/source3/librpc/gen_ndr/srv_lsa.c
+++ b/source3/librpc/gen_ndr/srv_lsa.c
@@ -1128,14 +1128,14 @@ static bool api_lsa_LookupNames(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.sids = r->in.sids;
+	r->out.count = r->in.count;
 	r->out.domains = talloc_zero(r, struct lsa_RefDomainList *);
 	if (r->out.domains == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.sids = r->in.sids;
-	r->out.count = r->in.count;
 	r->out.result = _lsa_LookupNames(p, r);
 
 	if (p->rng_fault_state) {
@@ -1210,14 +1210,14 @@ static bool api_lsa_LookupSids(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.names = r->in.names;
+	r->out.count = r->in.count;
 	r->out.domains = talloc_zero(r, struct lsa_RefDomainList *);
 	if (r->out.domains == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.names = r->in.names;
-	r->out.count = r->in.count;
 	r->out.result = _lsa_LookupSids(p, r);
 
 	if (p->rng_fault_state) {
@@ -4444,14 +4444,14 @@ static bool api_lsa_LookupSids2(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.names = r->in.names;
+	r->out.count = r->in.count;
 	r->out.domains = talloc_zero(r, struct lsa_RefDomainList *);
 	if (r->out.domains == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.names = r->in.names;
-	r->out.count = r->in.count;
 	r->out.result = _lsa_LookupSids2(p, r);
 
 	if (p->rng_fault_state) {
@@ -4526,14 +4526,14 @@ static bool api_lsa_LookupNames2(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.sids = r->in.sids;
+	r->out.count = r->in.count;
 	r->out.domains = talloc_zero(r, struct lsa_RefDomainList *);
 	if (r->out.domains == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.sids = r->in.sids;
-	r->out.count = r->in.count;
 	r->out.result = _lsa_LookupNames2(p, r);
 
 	if (p->rng_fault_state) {
@@ -5272,14 +5272,14 @@ static bool api_lsa_LookupNames3(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.sids = r->in.sids;
+	r->out.count = r->in.count;
 	r->out.domains = talloc_zero(r, struct lsa_RefDomainList *);
 	if (r->out.domains == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.sids = r->in.sids;
-	r->out.count = r->in.count;
 	r->out.result = _lsa_LookupNames3(p, r);
 
 	if (p->rng_fault_state) {
@@ -5872,14 +5872,14 @@ static bool api_lsa_LookupSids3(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.names = r->in.names;
+	r->out.count = r->in.count;
 	r->out.domains = talloc_zero(r, struct lsa_RefDomainList *);
 	if (r->out.domains == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.names = r->in.names;
-	r->out.count = r->in.count;
 	r->out.result = _lsa_LookupSids3(p, r);
 
 	if (p->rng_fault_state) {
@@ -5954,14 +5954,14 @@ static bool api_lsa_LookupNames4(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.sids = r->in.sids;
+	r->out.count = r->in.count;
 	r->out.domains = talloc_zero(r, struct lsa_RefDomainList *);
 	if (r->out.domains == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.sids = r->in.sids;
-	r->out.count = r->in.count;
 	r->out.result = _lsa_LookupNames4(p, r);
 
 	if (p->rng_fault_state) {
diff --git a/source3/librpc/gen_ndr/srv_netlogon.c b/source3/librpc/gen_ndr/srv_netlogon.c
index 9546b25..2cb2978 100644
--- a/source3/librpc/gen_ndr/srv_netlogon.c
+++ b/source3/librpc/gen_ndr/srv_netlogon.c
@@ -871,6 +871,7 @@ static bool api_netr_AccountSync(pipes_struct *p)
 
 	ZERO_STRUCT(r->out);
 	r->out.return_authenticator = r->in.return_authenticator;
+	r->out.recordid = r->in.recordid;
 	r->out.buffer = talloc_zero(r, struct netr_AccountBuffer);
 	if (r->out.buffer == NULL) {
 		talloc_free(r);
@@ -895,7 +896,6 @@ static bool api_netr_AccountSync(pipes_struct *p)
 		return false;
 	}
 
-	r->out.recordid = r->in.recordid;
 	r->out.result = _netr_AccountSync(p, r);
 
 	if (p->rng_fault_state) {
@@ -1290,13 +1290,13 @@ static bool api_netr_ServerAuthenticate2(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.negotiate_flags = r->in.negotiate_flags;
 	r->out.return_credentials = talloc_zero(r, struct netr_Credential);
 	if (r->out.return_credentials == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.negotiate_flags = r->in.negotiate_flags;
 	r->out.result = _netr_ServerAuthenticate2(p, r);
 
 	if (p->rng_fault_state) {
@@ -2146,13 +2146,13 @@ static bool api_netr_ServerAuthenticate3(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.negotiate_flags = r->in.negotiate_flags;
 	r->out.return_credentials = talloc_zero(r, struct netr_Credential);
 	if (r->out.return_credentials == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.negotiate_flags = r->in.negotiate_flags;
 	r->out.rid = talloc_zero(r, uint32_t);
 	if (r->out.rid == NULL) {
 		talloc_free(r);
@@ -3186,6 +3186,7 @@ static bool api_netr_LogonSamLogonEx(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.flags = r->in.flags;
 	r->out.validation = talloc_zero(r, union netr_Validation);
 	if (r->out.validation == NULL) {
 		talloc_free(r);
@@ -3198,7 +3199,6 @@ static bool api_netr_LogonSamLogonEx(pipes_struct *p)
 		return false;
 	}
 
-	r->out.flags = r->in.flags;
 	r->out.result = _netr_LogonSamLogonEx(p, r);
 
 	if (p->rng_fault_state) {
@@ -3685,6 +3685,7 @@ static bool api_netr_LogonSamLogonWithFlags(pipes_struct *p)
 
 	ZERO_STRUCT(r->out);
 	r->out.return_authenticator = r->in.return_authenticator;
+	r->out.flags = r->in.flags;
 	r->out.validation = talloc_zero(r, union netr_Validation);
 	if (r->out.validation == NULL) {
 		talloc_free(r);
@@ -3697,7 +3698,6 @@ static bool api_netr_LogonSamLogonWithFlags(pipes_struct *p)
 		return false;
 	}
 
-	r->out.flags = r->in.flags;
 	r->out.result = _netr_LogonSamLogonWithFlags(p, r);
 
 	if (p->rng_fault_state) {
diff --git a/source3/librpc/gen_ndr/srv_ntsvcs.c b/source3/librpc/gen_ndr/srv_ntsvcs.c
index ae28b99..288f3ed 100644
--- a/source3/librpc/gen_ndr/srv_ntsvcs.c
+++ b/source3/librpc/gen_ndr/srv_ntsvcs.c
@@ -782,13 +782,13 @@ static bool api_PNP_GetDeviceList(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.length = r->in.length;
 	r->out.buffer = talloc_zero_array(r, uint16_t, *r->out.length);
 	if (r->out.buffer == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.length = r->in.length;
 	r->out.result = _PNP_GetDeviceList(p, r);
 
 	if (p->rng_fault_state) {
@@ -1017,14 +1017,14 @@ static bool api_PNP_GetDeviceRegProp(pipes_struct *p)
 
 	ZERO_STRUCT(r->out);
 	r->out.reg_data_type = r->in.reg_data_type;
+	r->out.buffer_size = r->in.buffer_size;
+	r->out.needed = r->in.needed;
 	r->out.buffer = talloc_zero_array(r, uint8_t, *r->out.buffer_size);
 	if (r->out.buffer == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.buffer_size = r->in.buffer_size;
-	r->out.needed = r->in.needed;
 	r->out.result = _PNP_GetDeviceRegProp(p, r);
 
 	if (p->rng_fault_state) {
diff --git a/source3/librpc/gen_ndr/srv_srvsvc.c b/source3/librpc/gen_ndr/srv_srvsvc.c
index f995930..59f51ba 100644
--- a/source3/librpc/gen_ndr/srv_srvsvc.c
+++ b/source3/librpc/gen_ndr/srv_srvsvc.c
@@ -46,13 +46,13 @@ static bool api_srvsvc_NetCharDevEnum(pipes_struct *p)
 
 	ZERO_STRUCT(r->out);
 	r->out.info_ctr = r->in.info_ctr;
+	r->out.resume_handle = r->in.resume_handle;
 	r->out.totalentries = talloc_zero(r, uint32_t);
 	if (r->out.totalentries == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.resume_handle = r->in.resume_handle;
 	r->out.result = _srvsvc_NetCharDevEnum(p, r);
 
 	if (p->rng_fault_state) {
@@ -281,13 +281,13 @@ static bool api_srvsvc_NetCharDevQEnum(pipes_struct *p)
 
 	ZERO_STRUCT(r->out);
 	r->out.info_ctr = r->in.info_ctr;
+	r->out.resume_handle = r->in.resume_handle;
 	r->out.totalentries = talloc_zero(r, uint32_t);
 	if (r->out.totalentries == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.resume_handle = r->in.resume_handle;
 	r->out.result = _srvsvc_NetCharDevQEnum(p, r);
 
 	if (p->rng_fault_state) {
@@ -664,13 +664,13 @@ static bool api_srvsvc_NetConnEnum(pipes_struct *p)
 
 	ZERO_STRUCT(r->out);
 	r->out.info_ctr = r->in.info_ctr;
+	r->out.resume_handle = r->in.resume_handle;
 	r->out.totalentries = talloc_zero(r, uint32_t);
 	if (r->out.totalentries == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.resume_handle = r->in.resume_handle;
 	r->out.result = _srvsvc_NetConnEnum(p, r);
 
 	if (p->rng_fault_state) {
@@ -746,13 +746,13 @@ static bool api_srvsvc_NetFileEnum(pipes_struct *p)
 
 	ZERO_STRUCT(r->out);
 	r->out.info_ctr = r->in.info_ctr;
+	r->out.resume_handle = r->in.resume_handle;
 	r->out.totalentries = talloc_zero(r, uint32_t);
 	if (r->out.totalentries == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.resume_handle = r->in.resume_handle;
 	r->out.result = _srvsvc_NetFileEnum(p, r);
 
 	if (p->rng_fault_state) {
@@ -981,13 +981,13 @@ static bool api_srvsvc_NetSessEnum(pipes_struct *p)
 
 	ZERO_STRUCT(r->out);
 	r->out.info_ctr = r->in.info_ctr;
+	r->out.resume_handle = r->in.resume_handle;
 	r->out.totalentries = talloc_zero(r, uint32_t);
 	if (r->out.totalentries == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.resume_handle = r->in.resume_handle;
 	r->out.result = _srvsvc_NetSessEnum(p, r);
 
 	if (p->rng_fault_state) {
@@ -1211,13 +1211,13 @@ static bool api_srvsvc_NetShareEnumAll(pipes_struct *p)
 
 	ZERO_STRUCT(r->out);
 	r->out.info_ctr = r->in.info_ctr;
+	r->out.resume_handle = r->in.resume_handle;
 	r->out.totalentries = talloc_zero(r, uint32_t);
 	if (r->out.totalentries == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.resume_handle = r->in.resume_handle;
 	r->out.result = _srvsvc_NetShareEnumAll(p, r);
 
 	if (p->rng_fault_state) {
@@ -1829,13 +1829,13 @@ static bool api_srvsvc_NetDiskEnum(pipes_struct *p)
 
 	ZERO_STRUCT(r->out);
 	r->out.info = r->in.info;
+	r->out.resume_handle = r->in.resume_handle;
 	r->out.totalentries = talloc_zero(r, uint32_t);
 	if (r->out.totalentries == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.resume_handle = r->in.resume_handle;
 	r->out.result = _srvsvc_NetDiskEnum(p, r);
 
 	if (p->rng_fault_state) {
@@ -2064,13 +2064,13 @@ static bool api_srvsvc_NetTransportEnum(pipes_struct *p)
 
 	ZERO_STRUCT(r->out);
 	r->out.transports = r->in.transports;
+	r->out.resume_handle = r->in.resume_handle;
 	r->out.totalentries = talloc_zero(r, uint32_t);
 	if (r->out.totalentries == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.resume_handle = r->in.resume_handle;
 	r->out.result = _srvsvc_NetTransportEnum(p, r);
 
 	if (p->rng_fault_state) {
@@ -2451,13 +2451,13 @@ static bool api_srvsvc_NetPathCanonicalize(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.pathtype = r->in.pathtype;
 	r->out.can_path = talloc_zero_array(r, uint8_t, r->in.maxbuf);
 	if (r->out.can_path == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.pathtype = r->in.pathtype;
 	r->out.result = _srvsvc_NetPathCanonicalize(p, r);
 
 	if (p->rng_fault_state) {
@@ -2825,13 +2825,13 @@ static bool api_srvsvc_NetShareEnum(pipes_struct *p)
 
 	ZERO_STRUCT(r->out);
 	r->out.info_ctr = r->in.info_ctr;
+	r->out.resume_handle = r->in.resume_handle;
 	r->out.totalentries = talloc_zero(r, uint32_t);
 	if (r->out.totalentries == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.resume_handle = r->in.resume_handle;
 	r->out.result = _srvsvc_NetShareEnum(p, r);
 
 	if (p->rng_fault_state) {
diff --git a/source3/librpc/gen_ndr/srv_svcctl.c b/source3/librpc/gen_ndr/srv_svcctl.c
index f371111..5b30bf0 100644
--- a/source3/librpc/gen_ndr/srv_svcctl.c
+++ b/source3/librpc/gen_ndr/srv_svcctl.c
@@ -1139,6 +1139,7 @@ static bool api_svcctl_EnumServicesStatusW(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.resume_handle = r->in.resume_handle;
 	r->out.service = talloc_zero_array(r, uint8_t, r->in.buf_size);
 	if (r->out.service == NULL) {
 		talloc_free(r);
@@ -1157,7 +1158,6 @@ static bool api_svcctl_EnumServicesStatusW(pipes_struct *p)
 		return false;
 	}
 
-	r->out.resume_handle = r->in.resume_handle;
 	r->out.result = _svcctl_EnumServicesStatusW(p, r);
 
 	if (p->rng_fault_state) {
@@ -1637,13 +1637,13 @@ static bool api_svcctl_GetServiceDisplayNameW(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.display_name_length = r->in.display_name_length;
 	r->out.display_name = talloc_zero(r, const char *);
 	if (r->out.display_name == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.display_name_length = r->in.display_name_length;
 	r->out.result = _svcctl_GetServiceDisplayNameW(p, r);
 
 	if (p->rng_fault_state) {
@@ -1718,13 +1718,13 @@ static bool api_svcctl_GetServiceKeyNameW(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.display_name_length = r->in.display_name_length;
 	r->out.key_name = talloc_zero(r, const char *);
 	if (r->out.key_name == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.display_name_length = r->in.display_name_length;
 	r->out.result = _svcctl_GetServiceKeyNameW(p, r);
 
 	if (p->rng_fault_state) {
@@ -2124,6 +2124,7 @@ static bool api_svcctl_EnumServicesStatusA(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.resume_handle = r->in.resume_handle;
 	r->out.service = talloc_zero_array(r, uint8_t, r->in.buf_size);
 	if (r->out.service == NULL) {
 		talloc_free(r);
@@ -2142,7 +2143,6 @@ static bool api_svcctl_EnumServicesStatusA(pipes_struct *p)
 		return false;
 	}
 
-	r->out.resume_handle = r->in.resume_handle;
 	r->out.result = _svcctl_EnumServicesStatusA(p, r);
 
 	if (p->rng_fault_state) {
@@ -2615,13 +2615,13 @@ static bool api_svcctl_GetServiceDisplayNameA(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.display_name_length = r->in.display_name_length;
 	r->out.display_name = talloc_zero(r, const char *);
 	if (r->out.display_name == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.display_name_length = r->in.display_name_length;
 	r->out.result = _svcctl_GetServiceDisplayNameA(p, r);
 
 	if (p->rng_fault_state) {
@@ -2696,13 +2696,13 @@ static bool api_svcctl_GetServiceKeyNameA(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.display_name_length = r->in.display_name_length;
 	r->out.key_name = talloc_zero(r, const char *);
 	if (r->out.key_name == NULL) {
 		talloc_free(r);
 		return false;
 	}
 
-	r->out.display_name_length = r->in.display_name_length;
 	r->out.result = _svcctl_GetServiceKeyNameA(p, r);
 
 	if (p->rng_fault_state) {
@@ -3327,6 +3327,7 @@ static bool api_EnumServicesStatusExA(pipes_struct *p)
 	}
 
 	ZERO_STRUCT(r->out);
+	r->out.resume_handle = r->in.resume_handle;
 	r->out.services = talloc_zero_array(r, uint8_t, r->in.buf_size);
 	if (r->out.services == NULL) {
 		talloc_free(r);
@@ -3345,7 +3346,6 @@ static bool api_EnumServicesStatusExA(pipes_struct *p)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list