[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  8194fc3... s3-netlogon: Fix bug #7237: _netr_SamLogon segfaults for 
clients sending NULL domain.
      from  1a10a59... Improve symlink delete test. Make sure we don't delete 
the link target by mistake.

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


- Log -----------------------------------------------------------------
commit 8194fc37571257d4b5df3e78f5e38e914b18dc43
Author: Günther Deschner <g...@samba.org>
Date:   Fri Mar 12 00:30:52 2010 +0100

    s3-netlogon: Fix bug #7237: _netr_SamLogon segfaults for clients sending 
NULL domain.
    
    Thanks to Marc Muehlfeld <muehlf...@medizinische-genetik.de>.
    
    Guenther

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

Summary of changes:
 source3/rpc_server/srv_netlog_nt.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_netlog_nt.c 
b/source3/rpc_server/srv_netlog_nt.c
index b9bfda9..b41b3d1 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -1142,17 +1142,23 @@ static NTSTATUS _netr_LogonSamLogon_base(pipes_struct 
*p,
        case NetlogonServiceInformation:
        case NetlogonInteractiveTransitiveInformation:
        case NetlogonServiceTransitiveInformation:
-               nt_username     = 
logon->password->identity_info.account_name.string;
-               nt_domain       = 
logon->password->identity_info.domain_name.string;
-               nt_workstation  = 
logon->password->identity_info.workstation.string;
+               nt_username     = 
logon->password->identity_info.account_name.string ?
+                                 
logon->password->identity_info.account_name.string : "";
+               nt_domain       = 
logon->password->identity_info.domain_name.string ?
+                                 
logon->password->identity_info.domain_name.string : "";
+               nt_workstation  = 
logon->password->identity_info.workstation.string ?
+                                 
logon->password->identity_info.workstation.string : "";
 
                DEBUG(3,("SAM Logon (Interactive). Domain:[%s].  ", 
lp_workgroup()));
                break;
        case NetlogonNetworkInformation:
        case NetlogonNetworkTransitiveInformation:
-               nt_username     = 
logon->network->identity_info.account_name.string;
-               nt_domain       = 
logon->network->identity_info.domain_name.string;
-               nt_workstation  = 
logon->network->identity_info.workstation.string;
+               nt_username     = 
logon->network->identity_info.account_name.string ?
+                                 
logon->network->identity_info.account_name.string : "";
+               nt_domain       = 
logon->network->identity_info.domain_name.string ?
+                                 
logon->network->identity_info.domain_name.string : "";
+               nt_workstation  = 
logon->network->identity_info.workstation.string ?
+                                 
logon->network->identity_info.workstation.string : "";
 
                DEBUG(3,("SAM Logon (Network). Domain:[%s].  ", 
lp_workgroup()));
                break;


-- 
Samba Shared Repository