[obnox@samba.org: [SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2588-gffaed19]

[Michael Adam]

Hi Karolin,

please pick this for 3-2-stable.

Cheers - Michael

----- Forwarded message from Michael Adam <obnox at samba.org> -----

To: samba-cvs at samba.org
Date: Wed, 18 Jun 2008 08:30:24 -0500 (CDT)
From: Michael Adam <obnox at samba.org>
Subject: [SCM] Samba Shared Repository - branch v3-2-test updated -
	release-3-2-0pre2-2588-gffaed19

The branch, v3-2-test has been updated
       via  ffaed197d8cb261e2765b2de6cad17cac7d49672 (commit)
      from  679d8dfa390601f777bfb43c02cd921eae5edcf4 (commit)

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


- Log -----------------------------------------------------------------
commit ffaed197d8cb261e2765b2de6cad17cac7d49672
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jun 18 14:50:53 2008 +0200

    Fix Bug #5548 (segfauls in handle_include with %m macro expansion).
    
    In alloc_sub_basic, when expanding '%m', substitute "" instead of
    NULL for remote_machine when this is NULL. Else a NULL string
    is returned.
    
    Michael
    (cherry picked from commit c65b456c6a145d15b7fd27a2a3440a0709fc3277)

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

Summary of changes:
 source/lib/substitute.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/substitute.c b/source/lib/substitute.c
index 62dfdb5..6c74f54 100644
--- a/source/lib/substitute.c
+++ b/source/lib/substitute.c
@@ -648,7 +648,10 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name,
 			a_string = realloc_string_sub(a_string, "%h", myhostname());
 			break;
 		case 'm' :
-			a_string = realloc_string_sub(a_string, "%m", remote_machine);
+			a_string = realloc_string_sub(a_string, "%m",
+						      remote_machine
+						      ? remote_machine
+						      : "");
 			break;
 		case 'v' :
 			a_string = realloc_string_sub(a_string, "%v", SAMBA_VERSION_STRING);


-- 
Samba Shared Repository

----- End forwarded message -----

-- 
Michael Adam <ma at sernet.de>  <obnox at samba.org>
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.SerNet.DE, mailto: Info @ SerNet.DE
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 206 bytes
Desc: not available
Url : http://lists.samba.org/archive/samba-technical/attachments/20080618/edc2d54a/attachment.bin