[SCM] Samba Shared Repository - branch master updated

Michael Adam obnox at samba.org
Mon Jun 21 04:39:09 MDT 2010


The branch, master has been updated
       via  3f99ff1... s3:idmap_ldap: remove unreached code (and explicit error return code)
      from  276a1a7... s3/s4 - remove "talloc_tos()" from common code since s4 doesn't support it

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


- Log -----------------------------------------------------------------
commit 3f99ff104a210bd307818746da922408f151cd18
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 17 20:50:36 2010 +0200

    s3:idmap_ldap: remove unreached code (and explicit error return code)

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

Summary of changes:
 source3/winbindd/idmap_ldap.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index fd714a0..e7928bf 100644
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -445,11 +445,7 @@ static NTSTATUS idmap_ldap_allocate_id(struct unixid *xid)
 	if ( ! (id_str = smbldap_talloc_single_attribute(idmap_alloc_ldap->smbldap_state->ldap_struct,
 				entry, type, ctx))) {
 		DEBUG(0,("%s attribute not found\n", type));
-		goto done;
-	}
-	if ( ! id_str) {
-		DEBUG(0,("Out of memory\n"));
-		ret = NT_STATUS_NO_MEMORY;
+		ret = NT_STATUS_UNSUCCESSFUL;
 		goto done;
 	}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list