[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  5cd6d93 s3: Fix Coverity ID 2472, UNINIT
       via  d2d1d17 s3: Fix Coverity ID 2473, UNINIT
      from  0958695 s3: Fix timeout calculation in event_add_to_poll_args

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


- Log -----------------------------------------------------------------
commit 5cd6d93fa1f24b64b449455da40d5c83a18a8cff
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Apr 8 11:07:11 2011 +0200

    s3: Fix Coverity ID 2472, UNINIT
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Apr 11 17:14:35 CEST 2011 on sn-devel-104

commit d2d1d173237906f77b68b3d04add007e92fe2d34
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Apr 8 11:07:11 2011 +0200

    s3: Fix Coverity ID 2473, UNINIT
    
    Signed-off-by: Günther Deschner <gd at samba.org>

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

Summary of changes:
 source3/passdb/pdb_ipa.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ipa.c b/source3/passdb/pdb_ipa.c
index f118e6e..da8e9f0 100644
--- a/source3/passdb/pdb_ipa.c
+++ b/source3/passdb/pdb_ipa.c
@@ -973,7 +973,6 @@ static NTSTATUS ipasam_add_posix_account_objectclass(struct ldapsam_privates *ld
 {
 	int ret;
 	LDAPMod **mods = NULL;
-	NTSTATUS status;
 
 	smbldap_set_mod(&mods, LDAP_MOD_ADD,
 			"objectclass", "posixAccount");
@@ -995,7 +994,7 @@ static NTSTATUS ipasam_add_posix_account_objectclass(struct ldapsam_privates *ld
 	if (ret != LDAP_SUCCESS) {
 		DEBUG(1, ("failed to modify/add user with uid = %s (dn = %s)\n",
 			  username, dn));
-		return status;
+		return NT_STATUS_LDAP(ret);
 	}
 
 	return NT_STATUS_OK;
@@ -1064,7 +1063,6 @@ static NTSTATUS ipasam_add_ipa_objectclasses(struct ldapsam_privates *ldap_state
 					     uint32_t has_objectclass)
 {
 	LDAPMod **mods = NULL;
-	NTSTATUS status;
 	int ret;
 	char *princ;
 
@@ -1128,7 +1126,7 @@ static NTSTATUS ipasam_add_ipa_objectclasses(struct ldapsam_privates *ldap_state
 		if (ret != LDAP_SUCCESS) {
 			DEBUG(1, ("failed to modify/add user with uid = %s (dn = %s)\n",
 				  name, dn));
-			return status;
+			return NT_STATUS_LDAP(ret);
 		}
 	}
 


-- 
Samba Shared Repository