[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  195bda5... s4:loadparm.c - the logfile parameter value needs to be duplicated
       via  3598409... s4:popt_common.c - fix intendation
      from  415c615... s4:util.c - Corrected the location of the "Directory Service" object

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


- Log -----------------------------------------------------------------
commit 195bda569e541a49ab3406deca8c8b864ec327d4
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Sat Feb 13 19:41:43 2010 +0100

    s4:loadparm.c - the logfile parameter value needs to be duplicated
    
    Otherwise the "logfile" pointer tracks all changes of "pszParmValue" which
    content is only temporal. This was the cause of bug #6212.

commit 3598409951c223958765a52359423cd8237919b6
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Sat Feb 13 19:19:02 2010 +0100

    s4:popt_common.c - fix intendation

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

Summary of changes:
 source4/lib/cmdline/popt_common.c |    2 +-
 source4/param/loadparm.c          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index 0273c4f..7721829 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -67,7 +67,7 @@ static void popt_samba_callback(poptContext con,
 
 	if (reason == POPT_CALLBACK_REASON_POST) {
 		if (lp_configfile(cmdline_lp_ctx) == NULL) {
-            lp_load_default(cmdline_lp_ctx);
+			lp_load_default(cmdline_lp_ctx);
 		}
 		/* Hook any 'every Samba program must do this, after
 		 * the smb.conf is setup' functions here */
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index cb23cea..0841f7d 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -1542,7 +1542,7 @@ static bool handle_debuglevel(struct loadparm_context *lp_ctx,
 static bool handle_logfile(struct loadparm_context *lp_ctx,
 			const char *pszParmValue, char **ptr)
 {
-	logfile = pszParmValue;
+	logfile = strdup(pszParmValue);
 	return true;
 }
 


-- 
Samba Shared Repository