The branch, master has been updated
       via  52d66d8 s3-winbind: Fix a segfault passing NULL to a fstring 
argument.
      from  dc3c4c0 docs: Add man vfs_syncops.8 to waf build.

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


- Log -----------------------------------------------------------------
commit 52d66d81f1a873b8106973d1cdece032b7080805
Author: Andreas Schneider <a...@samba.org>
Date:   Mon Aug 12 20:22:04 2013 +0200

    s3-winbind: Fix a segfault passing NULL to a fstring argument.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10082
    
    Signed-off-by: Andreas Schneider <a...@samba.org>
    Reviewed-by: Volker Lendecke <v...@samba.org>
    
    Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
    Autobuild-Date(master): Tue Aug 13 13:58:26 CEST 2013 on sn-devel-104

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

Summary of changes:
 source3/winbindd/winbindd_cm.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 6c3f6ea..08c763c 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1127,6 +1127,7 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx,
        uint32_t nt_version = NETLOGON_NT_VERSION_1;
        NTSTATUS status;
        const char *dc_name;
+       fstring nbtname;
 
        ip_list.ss = *pss;
        ip_list.port = 0;
@@ -1210,9 +1211,17 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx,
 
        /* try node status request */
 
-       if (name_status_find(domain->name, 0x1c, 0x20, pss, *name) ) {
+       if (name_status_find(domain->name, 0x1c, 0x20, pss, nbtname) ) {
                namecache_store(*name, 0x20, 1, &ip_list);
-               return True;
+
+               if (name != NULL) {
+                       *name = talloc_strdup(mem_ctx, nbtname);
+                       if (*name == NULL) {
+                               return false;
+                       }
+               }
+
+               return true;
        }
        return False;
 }


-- 
Samba Shared Repository

Reply via email to