[SCM] Samba Shared Repository - branch master updated

Michael Adam obnox at samba.org
Mon Mar 23 11:41:03 MDT 2015


The branch, master has been updated
       via  8de2164 s4:torture: avoid use of uninitialized variable in error case.
       via  1dc770c s4:torture: avoid free of uninitialized variable in error case.
       via  2bf66d9 s4:torture: avoid free of uninitialized variable in error case.
       via  b92d51f s4:torture: avoid free of uninitialized variables in error-case.
       via  59cce7c lib/crypto: fix header guard for crypto.h
       via  73f951e libnetapi: Fix CID 1272947 Fix logically dead code
       via  b024ea8 dsdb: Fix CID 1034681 Copy-paste error
       via  9b73a47 smbd: Fix a typo
      from  c8918b7 ctdb-tools: Use a broadcast to connected nodes for "reloadnodes"

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


- Log -----------------------------------------------------------------
commit 8de21648351a5d89c8c58dbdf771c1c06a3d7e51
Author: Michael Adam <obnox at samba.org>
Date:   Mon Mar 23 01:55:02 2015 +0100

    s4:torture: avoid use of uninitialized variable in error case.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Mon Mar 23 18:40:18 CET 2015 on sn-devel-104

commit 1dc770ce81c2f7b72137cfbf9f8d4cbd4e6a5879
Author: Michael Adam <obnox at samba.org>
Date:   Mon Mar 23 01:52:32 2015 +0100

    s4:torture: avoid free of uninitialized variable in error case.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit 2bf66d95d8505693c4bbc6a7a155167c534a2121
Author: Michael Adam <obnox at samba.org>
Date:   Mon Mar 23 01:51:16 2015 +0100

    s4:torture: avoid free of uninitialized variable in error case.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit b92d51f98cae2f594f9b5473cfc623c4b68ba1fd
Author: Michael Adam <obnox at samba.org>
Date:   Mon Mar 23 01:48:32 2015 +0100

    s4:torture: avoid free of uninitialized variables in error-case.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit 59cce7cbebee66df1789b9d3c2fc0b8311f9e78b
Author: Michael Adam <obnox at samba.org>
Date:   Mon Mar 23 01:41:57 2015 +0100

    lib/crypto: fix header guard for crypto.h
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit 73f951e98f7ece73a2429da943127e7b362ace9d
Author: Anoop C S <achiraya at redhat.com>
Date:   Mon Mar 23 17:11:31 2015 +0530

    libnetapi: Fix CID 1272947 Fix logically dead code
    
    Signed-off-by: Anoop C S <achiraya at redhat.com>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit b024ea84ff23a658548c0003f122e488ff0e238d
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Mar 17 21:43:50 2015 +0100

    dsdb: Fix CID 1034681 Copy-paste error
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit 9b73a477f633cbcdfe9feb0f66e2d8ab94a0afb6
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Mar 23 14:38:35 2015 +0000

    smbd: Fix a typo
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 lib/crypto/crypto.h                            | 2 +-
 source3/lib/netapi/samr.c                      | 2 +-
 source3/smbd/filename.c                        | 2 +-
 source4/dsdb/samdb/ldb_modules/password_hash.c | 2 +-
 source4/torture/raw/samba3misc.c               | 4 ++--
 source4/torture/smb2/session.c                 | 4 ++--
 source4/torture/unix/whoami.c                  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/crypto/crypto.h b/lib/crypto/crypto.h
index c0ad562..092ae6a 100644
--- a/lib/crypto/crypto.h
+++ b/lib/crypto/crypto.h
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _SAMBA_CRYPTO_H
+#ifndef _SAMBA_CRYPTO_H_
 #define _SAMBA_CRYPTO_H_
 
 #include "../lib/crypto/crc32.h"
diff --git a/source3/lib/netapi/samr.c b/source3/lib/netapi/samr.c
index 7b3d3c5..97c61d1 100644
--- a/source3/lib/netapi/samr.c
+++ b/source3/lib/netapi/samr.c
@@ -45,7 +45,7 @@ WERROR libnetapi_samr_open_domain(struct libnetapi_ctx *mem_ctx,
 	struct samr_SamArray *sam = NULL;
 	const char *domain_name = NULL;
 	struct lsa_String lsa_domain_name;
-	bool domain_found = true;
+	bool domain_found = false;
 	int i;
 	struct dcerpc_binding_handle *b = pipe_cli->binding_handle;
 
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 0fdc09d..6899d2a 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -161,7 +161,7 @@ static NTSTATUS check_parent_exists(TALLOC_CTX *ctx,
 	}
 
 	/* Parent exists - set "start" to be the
-	 * last compnent to shorten the tree walk. */
+	 * last component to shorten the tree walk. */
 
 	/*
 	 * Safe to use discard_const_p
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index e266307..cd23ab7 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -2119,7 +2119,7 @@ static int check_password_restrictions(struct setup_password_fields_io *io)
 
 		/* checks the LM hash password history */
 		for (i = 0; i < io->o.lm_history_len; i++) {
-			ret = memcmp(io->n.nt_hash, io->o.lm_history[i].hash, 16);
+			ret = memcmp(io->n.lm_hash, io->o.lm_history[i].hash, 16);
 			if (ret == 0) {
 				ret = LDB_ERR_CONSTRAINT_VIOLATION;
 				ldb_asprintf_errstring(ldb,
diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c
index 95a8229..f40a4f1 100644
--- a/source4/torture/raw/samba3misc.c
+++ b/source4/torture/raw/samba3misc.c
@@ -428,8 +428,8 @@ static NTSTATUS raw_smbcli_ntcreate(struct smbcli_tree *tree, const char *fname,
 
 bool torture_samba3_badpath(struct torture_context *torture)
 {
-	struct smbcli_state *cli_nt;
-	struct smbcli_state *cli_dos;
+	struct smbcli_state *cli_nt = NULL;
+	struct smbcli_state *cli_dos = NULL;
 	const char *fname = "test.txt";
 	const char *fname1 = "test1.txt";
 	const char *dirname = "testdir";
diff --git a/source4/torture/smb2/session.c b/source4/torture/smb2/session.c
index ee51d55..d60edaf 100644
--- a/source4/torture/smb2/session.c
+++ b/source4/torture/smb2/session.c
@@ -71,7 +71,7 @@ bool test_session_reconnect1(struct torture_context *tctx, struct smb2_tree *tre
 	struct smb2_create io1, io2;
 	uint64_t previous_session_id;
 	bool ret = true;
-	struct smb2_tree *tree2;
+	struct smb2_tree *tree2 = NULL;
 	union smb_fileinfo qfinfo;
 
 	/* Add some random component to the file name. */
@@ -154,7 +154,7 @@ bool test_session_reconnect2(struct torture_context *tctx, struct smb2_tree *tre
 	struct smb2_create io1;
 	uint64_t previous_session_id;
 	bool ret = true;
-	struct smb2_session *session2;
+	struct smb2_session *session2 = NULL;
 	union smb_fileinfo qfinfo;
 
 	/* Add some random component to the file name. */
diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index 71c25dd..00109eb 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -346,7 +346,7 @@ bool torture_unix_whoami(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	struct smb_whoami whoami;
-	bool ret;
+	bool ret = false;
 	struct ldb_context *ldb;
 	const char *addc, *host;
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list