svn commit: samba r7472 - branches/SAMBA_3_0/source/libsmb trunk/source/libsmb

[jerry]

Author: jerry
Date: 2005-06-10 22:03:33 +0000 (Fri, 10 Jun 2005)
New Revision: 7472

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7472

Log:
fix smbpasswd user password change (still worked by bad error messages) due to 
trying to strdup a NULL pointer
Modified:
   branches/SAMBA_3_0/source/libsmb/ntlmssp.c
   trunk/source/libsmb/ntlmssp.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/ntlmssp.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/ntlmssp.c  2005-06-10 19:39:46 UTC (rev 
7471)
+++ branches/SAMBA_3_0/source/libsmb/ntlmssp.c  2005-06-10 22:03:33 UTC (rev 
7472)
@@ -138,7 +138,7 @@
 
 NTSTATUS ntlmssp_set_username(NTLMSSP_STATE *ntlmssp_state, const char *user) 
 {
-       ntlmssp_state->user = talloc_strdup(ntlmssp_state->mem_ctx, user);
+       ntlmssp_state->user = talloc_strdup(ntlmssp_state->mem_ctx, user ? user 
: "" );
        if (!ntlmssp_state->user) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -168,7 +168,7 @@
  */
 NTSTATUS ntlmssp_set_domain(NTLMSSP_STATE *ntlmssp_state, const char *domain) 
 {
-       ntlmssp_state->domain = talloc_strdup(ntlmssp_state->mem_ctx, domain);
+       ntlmssp_state->domain = talloc_strdup(ntlmssp_state->mem_ctx, domain ? 
domain : "" );
        if (!ntlmssp_state->domain) {
                return NT_STATUS_NO_MEMORY;
        }

Modified: trunk/source/libsmb/ntlmssp.c
===================================================================
--- trunk/source/libsmb/ntlmssp.c       2005-06-10 19:39:46 UTC (rev 7471)
+++ trunk/source/libsmb/ntlmssp.c       2005-06-10 22:03:33 UTC (rev 7472)
@@ -138,7 +138,7 @@
 
 NTSTATUS ntlmssp_set_username(NTLMSSP_STATE *ntlmssp_state, const char *user) 
 {
-       ntlmssp_state->user = talloc_strdup(ntlmssp_state->mem_ctx, user);
+       ntlmssp_state->user = talloc_strdup(ntlmssp_state->mem_ctx, user ? user 
: "" );
        if (!ntlmssp_state->user) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -168,7 +168,7 @@
  */
 NTSTATUS ntlmssp_set_domain(NTLMSSP_STATE *ntlmssp_state, const char *domain) 
 {
-       ntlmssp_state->domain = talloc_strdup(ntlmssp_state->mem_ctx, domain);
+       ntlmssp_state->domain = talloc_strdup(ntlmssp_state->mem_ctx, domain ? 
domain : "" );
        if (!ntlmssp_state->domain) {
                return NT_STATUS_NO_MEMORY;
        }