[SCM] Samba Shared Repository - branch v3-6-test updated

[Andreas Schneider]

The branch, v3-6-test has been updated
       via  2b4ddf3 s3-winbindd: Use the correct enums for samr_QueryDomainInfo. (cherry picked from commit d9ad60f0dc40be1e1d533f96ec0032e01035d85b)
       via  b2532c5 s3-net: Do not use uninitialized value
      from  bf65a3a s3: Fix Coverity ID 1137: CONSTANT_EXPRESSION_RESULT

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 2b4ddf387cf2b4a9958643930c4ac12b48dd45ba
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Mar 30 11:08:31 2011 +0200

    s3-winbindd: Use the correct enums for samr_QueryDomainInfo.
    (cherry picked from commit d9ad60f0dc40be1e1d533f96ec0032e01035d85b)

commit b2532c5eb6d23d043590fbf1c51ee7bef699fd11
Author: Sumit Bose <sbose at redhat.com>
Date:   Thu Mar 31 14:09:45 2011 +0200

    s3-net: Do not use uninitialized value
    
    s3-net: Do not use uninitialized value
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date: Thu Mar 31 18:09:57 CEST 2011 on sn-devel-104
    (cherry picked from commit 34ea813553368a7f0805693c9731e9b0abfefa99)

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

Summary of changes:
 source3/utils/net_rpc.c           |    2 ++
 source3/winbindd/winbindd_msrpc.c |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 3fbeb87..c86127e 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -6737,6 +6737,8 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
 		return -1;
 	};
 
+	b = pipe_hnd->binding_handle;
+
 	nt_status = rpccli_lsa_open_policy2(pipe_hnd, mem_ctx, false, KEY_QUERY_VALUE,
 					&connect_hnd);
 	if (NT_STATUS_IS_ERR(nt_status)) {
diff --git a/source3/winbindd/winbindd_msrpc.c b/source3/winbindd/winbindd_msrpc.c
index f01308c..13a5d64 100644
--- a/source3/winbindd/winbindd_msrpc.c
+++ b/source3/winbindd/winbindd_msrpc.c
@@ -987,7 +987,7 @@ static NTSTATUS msrpc_lockout_policy(struct winbindd_domain *domain,
 
 	status = dcerpc_samr_QueryDomainInfo(b, mem_ctx,
 					     &dom_pol,
-					     12,
+					     DomainLockoutInformation,
 					     &info,
 					     &result);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -1037,7 +1037,7 @@ static NTSTATUS msrpc_password_policy(struct winbindd_domain *domain,
 
 	status = dcerpc_samr_QueryDomainInfo(b, mem_ctx,
 					     &dom_pol,
-					     1,
+					     DomainPasswordInformation,
 					     &info,
 					     &result);
 	if (!NT_STATUS_IS_OK(status)) {


-- 
Samba Shared Repository