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

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  701d095 Nulling out the op_mid is never the right thing to do. We depend on this value when searching for specific share mode entries.
       via  4d79ede s3: Fix Coverity ID 1013, CHECKED_RETURN
       via  8edf480 s3: Fix Coverity ID 1017, CHECKED_RETURN
       via  ad61744 s3: Fix Coverity ID 1018, CHECKED_RETURN (cherry picked from commit 920b2fddc6b442ad4f1eb72dcb38921876182b8b)
       via  3d387c4 s3: Fix Coverity ID 1034, CHECKED_RETURN
      from  e87a232 s3:Makefile.in: make sure we rebuild bin/smbtorture4 if there where changes

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


- Log -----------------------------------------------------------------
commit 701d095498383abbd66124f23f0a55c0e7157184
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 17 10:35:51 2011 -0700

    Nulling out the op_mid is never the right thing to do. We depend on
    this value when searching for specific share mode entries.
    
    Jeremy.
    (cherry picked from commit 4ebde15741c21f1872a7b312abffc4431d08d51c)

commit 4d79edec249ee4d25e8f2510a8e3b2d73835b788
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 16 18:50:02 2011 +0100

    s3: Fix Coverity ID 1013, CHECKED_RETURN
    
    This is probably more or less taste. Removing the necessity for a comment is a
    good thing though IMO.
    (cherry picked from commit 9c9ed33cb7264db4ec486ead7d2cf1b414e79500)

commit 8edf480cd07d5f55605f704397a7dc3576dd72dd
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 16 18:47:36 2011 +0100

    s3: Fix Coverity ID 1017, CHECKED_RETURN
    
    Günther, please check!
    (cherry picked from commit 3835d77795bb3918a5eeea551afa02c94bb8db5a)

commit ad61744aefbf090cac49e2e6166f0de5df0b4f0f
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 16 18:45:50 2011 +0100

    s3: Fix Coverity ID 1018, CHECKED_RETURN
    (cherry picked from commit 920b2fddc6b442ad4f1eb72dcb38921876182b8b)

commit 3d387c4812eea6d0f96e9068d349b13790558660
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 16 18:42:48 2011 +0100

    s3: Fix Coverity ID 1034, CHECKED_RETURN
    
    In all other places we check the result of secrets_init.
    (cherry picked from commit 4668ac8b16daddacbaa0fe0e7ecdfbe6309abd3a)

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

Summary of changes:
 source3/auth/auth_util.c                    |    8 +++++---
 source3/locking/locking.c                   |    1 -
 source3/passdb/secrets.c                    |    4 +---
 source3/rpc_server/lsa/srv_lsa_nt.c         |   11 +++++------
 source3/rpc_server/spoolss/srv_spoolss_nt.c |    4 +++-
 5 files changed, 14 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 5940628..c75b12e 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -488,9 +488,11 @@ NTSTATUS create_local_token(struct auth_serversupplied_info *server_info)
 				   "ignoring it\n", sid_string_dbg(sid)));
 			continue;
 		}
-		add_gid_to_array_unique(server_info, gid,
-					&server_info->utok.groups,
-					&server_info->utok.ngroups);
+		if (!add_gid_to_array_unique(server_info, gid,
+					     &server_info->utok.groups,
+					     &server_info->utok.ngroups)) {
+			return NT_STATUS_NO_MEMORY;
+		}
 	}
 
 	/*
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 15c53d4..32d1b34 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1374,7 +1374,6 @@ bool remove_share_oplock(struct share_mode_lock *lck, files_struct *fsp)
 		return False;
 	}
 
-	e->op_mid = 0;
 	if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
 		/*
 		 * Going from exclusive or batch,
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 45f8e15..49a0125 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -445,9 +445,7 @@ NTSTATUS secrets_trusted_domains(TALLOC_CTX *mem_ctx, uint32 *num_domains,
 {
 	struct list_trusted_domains_state state;
 
-	secrets_init();
-
-	if (db_ctx == NULL) {
+	if (!secrets_init()) {
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c
index a4fc40a..eeea516 100644
--- a/source3/rpc_server/lsa/srv_lsa_nt.c
+++ b/source3/rpc_server/lsa/srv_lsa_nt.c
@@ -268,7 +268,7 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx,
 		int dom_idx;
 		const char *full_name;
 		const char *domain;
-		enum lsa_SidType type = SID_NAME_UNKNOWN;
+		enum lsa_SidType type;
 
 		ZERO_STRUCT(sid);
 
@@ -281,11 +281,10 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx,
 
 		DEBUG(5, ("init_lsa_sids: looking up name %s\n", full_name));
 
-		/* We can ignore the result of lookup_name, it will not touch
-		   "type" if it's not successful */
-
-		lookup_name(mem_ctx, full_name, flags, &domain, NULL,
-			    &sid, &type);
+		if (!lookup_name(mem_ctx, full_name, flags, &domain, NULL,
+				 &sid, &type)) {
+			type = SID_NAME_UNKNOWN;
+		}
 
 		switch (type) {
 		case SID_NAME_USER:
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index dc036fa..3026a88 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -3647,7 +3647,9 @@ static WERROR printer_notify_info(struct pipes_struct *p,
 	if ( !option )
 		return WERR_BADFID;
 
-	get_printer_snum(p, hnd, &snum, NULL);
+	if (!get_printer_snum(p, hnd, &snum, NULL)) {
+		return WERR_BADFID;
+	}
 
 	/* Maybe we should use the SYSTEM session_info here... */
 	result = winreg_get_printer(mem_ctx,


-- 
Samba Shared Repository