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

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  0872d99 winbind: Fix bug 9854 -- NULL pointer dereference
      from  6287391 BUG 9817: Fix 'map untrusted to domain' with NTLMv2.

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


- Log -----------------------------------------------------------------
commit 0872d998cd2bcfa274283bd7dd1d70010ca33166
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 7 12:39:16 2013 +0200

    winbind: Fix bug 9854 -- NULL pointer dereference
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Tue May  7 14:49:07 CEST 2013 on sn-devel-104
    (cherry picked from commit 8c1283a89f746a108e8014b6fbc9a58a371950cf)

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

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


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 033ea77..0a65953 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -946,7 +946,7 @@ static void wcache_save_name_to_sid(struct winbindd_domain *domain,
 	if (!centry)
 		return;
 
-	if (domain_name[0] == '\0') {
+	if ((domain_name == NULL) || (domain_name[0] == '\0')) {
 		struct winbindd_domain *mydomain =
 			find_domain_from_sid_noinit(sid);
 		if (mydomain != NULL) {
@@ -974,7 +974,7 @@ static void wcache_save_sid_to_name(struct winbindd_domain *domain, NTSTATUS sta
 	if (!centry)
 		return;
 
-	if (domain_name[0] == '\0') {
+	if ((domain_name == NULL) || (domain_name[0] == '\0')) {
 		struct winbindd_domain *mydomain =
 			find_domain_from_sid_noinit(sid);
 		if (mydomain != NULL) {
@@ -1798,7 +1798,7 @@ NTSTATUS wcache_name_to_sid(struct winbindd_domain *domain,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	if (domain_name[0] == '\0') {
+	if ((domain_name == NULL) || (domain_name[0] == '\0')) {
 		domain_name = domain->name;
 	}
 


-- 
Samba Shared Repository