[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1926-g7b15c75

Jeremy Allison jra at samba.org
Wed Feb 6 02:14:15 GMT 2008


The branch, v3-2-test has been updated
       via  7b15c75a6bacf783eb73568ed003e4b16d6ebd68 (commit)
       via  21594cb34c683262ed4f743b68c35e586676ff75 (commit)
      from  a1145770d1c3bfcddb687a08e3e57a566c80fb73 (commit)

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


- Log -----------------------------------------------------------------
commit 7b15c75a6bacf783eb73568ed003e4b16d6ebd68
Merge: 21594cb34c683262ed4f743b68c35e586676ff75 a1145770d1c3bfcddb687a08e3e57a566c80fb73
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 5 18:13:33 2008 -0800

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit 21594cb34c683262ed4f743b68c35e586676ff75
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 5 18:05:59 2008 -0800

    Don't return true on talloc fail.
    Jeremy.

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

Summary of changes:
 source/passdb/lookup_sid.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/passdb/lookup_sid.c b/source/passdb/lookup_sid.c
index 9f66eb9..4341bc0 100644
--- a/source/passdb/lookup_sid.c
+++ b/source/passdb/lookup_sid.c
@@ -548,10 +548,16 @@ static bool lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
 		if (*domain_name == NULL) {
 			*domain_name = talloc_strdup(
 				mem_ctx, unix_users_domain_name());
+			if (*domain_name == NULL) {
+				return false;
+			}
 		}
 		for (i=0; i<num_rids; i++) {
 			(*names)[i] = talloc_strdup(
 				(*names), uidtoname(rids[i]));
+			if ((*names)[i] == NULL) {
+				return false;
+			}
 			(*types)[i] = SID_NAME_USER;
 		}
 		return true;
@@ -561,10 +567,16 @@ static bool lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid,
 		if (*domain_name == NULL) {
 			*domain_name = talloc_strdup(
 				mem_ctx, unix_groups_domain_name());
+			if (*domain_name == NULL) {
+				return false;
+			}
 		}
 		for (i=0; i<num_rids; i++) {
 			(*names)[i] = talloc_strdup(
 				(*names), gidtoname(rids[i]));
+			if ((*names)[i] == NULL) {
+				return false;
+			}
 			(*types)[i] = SID_NAME_DOM_GRP;
 		}
 		return true;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list