[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  62862e2 s3-libnetjoin: fix uninitialized variable.
       via  04c101e s3-libnetapi/libnetjoin: fix uninitialized variables after the libsmbconf changes.
       via  18d3b85 libcli/auth/krb5_wrap: correctly use discard_const().
      from  7da530e s3-lib/smbconf: fix uninitialized error code in smbconf_reg_init().

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


- Log -----------------------------------------------------------------
commit 62862e27bbf94aa52623f64f17fbda8a2db38095
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 13 00:19:13 2011 +0200

    s3-libnetjoin: fix uninitialized variable.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri May 13 01:22:18 CEST 2011 on sn-devel-104

commit 04c101e873bd758fae6b7131551f6069ab2fcce3
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 13 00:15:41 2011 +0200

    s3-libnetapi/libnetjoin: fix uninitialized variables after the libsmbconf changes.
    
    Guenther

commit 18d3b85c4061d5c747da8333cf2711452185bb47
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 13 00:09:48 2011 +0200

    libcli/auth/krb5_wrap: correctly use discard_const().
    
    Jeremy, please check.
    
    Guenther

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

Summary of changes:
 libcli/auth/krb5_wrap.c         |    4 ++--
 source3/lib/netapi/serverinfo.c |    2 +-
 source3/libnet/libnet_join.c    |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/auth/krb5_wrap.c b/libcli/auth/krb5_wrap.c
index d3392a3..e7e071d 100644
--- a/libcli/auth/krb5_wrap.c
+++ b/libcli/auth/krb5_wrap.c
@@ -205,8 +205,8 @@ krb5_error_code smb_krb5_unparse_name(TALLOC_CTX *mem_ctx,
 
 	for (i = 0; i < len1; i++) {
 
-		p1 = krb5_princ_component(context, discard_const(krb5_principal, princ1), i);
-		p2 = krb5_princ_component(context, discard_const(krb5_principal, princ2), i);
+		p1 = krb5_princ_component(context, (krb5_principal)discard_const(princ1), i);
+		p2 = krb5_princ_component(context, (krb5_principal)discard_const(princ2), i);
 
 		if (p1->length != p2->length ||	memcmp(p1->data, p2->data, p1->length))
 			return False;
diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index f321648..8f76b4a 100644
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -540,7 +540,7 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
 static WERROR NetServerSetInfo_l_1005(struct libnetapi_ctx *ctx,
 				      struct NetServerSetInfo *r)
 {
-	WERROR werr;
+	WERROR werr = WERR_OK;
 	sbcErr err;
 	struct smbconf_ctx *conf_ctx;
 	struct srvsvc_NetSrvInfo1005 *info1005;
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 2b06be5..6750120 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -1292,7 +1292,7 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
 	struct samr_Ids user_rids;
 	struct samr_Ids name_types;
 	union samr_UserInfo *info = NULL;
-	struct dcerpc_binding_handle *b;
+	struct dcerpc_binding_handle *b = NULL;
 
 	ZERO_STRUCT(sam_pol);
 	ZERO_STRUCT(domain_pol);
@@ -1433,7 +1433,7 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
 	dcerpc_samr_Close(b, mem_ctx, &user_pol, &result);
 
 done:
-	if (pipe_hnd) {
+	if (pipe_hnd && b) {
 		if (is_valid_policy_hnd(&domain_pol)) {
 			dcerpc_samr_Close(b, mem_ctx, &domain_pol, &result);
 		}
@@ -1455,7 +1455,7 @@ done:
 
 static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r)
 {
-	WERROR werr;
+	WERROR werr = WERR_OK;
 	sbcErr err;
 	struct smbconf_ctx *ctx;
 


-- 
Samba Shared Repository