[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  8c1283a winbind: Fix bug 9854 -- NULL pointer dereference
      from  8ca4b75 Fix up the man pages to explain that "store dos attributes" 
overrides them.

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


- Log -----------------------------------------------------------------
commit 8c1283a89f746a108e8014b6fbc9a58a371950cf
Author: Volker Lendecke <v...@samba.org>
Date:   Tue May 7 12:39:16 2013 +0200

    winbind: Fix bug 9854 -- NULL pointer dereference
    
    Signed-off-by: Volker Lendecke <v...@samba.org>
    Reviewed-by: Michael Adam <ob...@samba.org>
    
    Autobuild-User(master): Michael Adam <ob...@samba.org>
    Autobuild-Date(master): Tue May  7 14:49:07 CEST 2013 on sn-devel-104

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

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 86f15c2..7252927 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -944,7 +944,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) {
@@ -972,7 +972,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) {
@@ -1810,7 +1810,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