summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-03-21 00:04:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:58:59 -0500
commitb556df32a849eefa2f2f34868eee02f05451878d (patch)
treef8ece6f9ca5caa5cc4986c827c50cb4fc9a4f702 /source4/lib
parent508f2f5506a14814888718bf00f52b7788d0e9ea (diff)
downloadsamba-b556df32a849eefa2f2f34868eee02f05451878d.tar.gz
samba-b556df32a849eefa2f2f34868eee02f05451878d.tar.bz2
samba-b556df32a849eefa2f2f34868eee02f05451878d.zip
r14598: 'logfile' may be a poor choice for a global variable name, but for now
don't shadow it. Andrew Bartlett (This used to be commit ace171f94c57da7b13c147c6e286e9e183df0745)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/cmdline/popt_common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index 33959874b7..fb6ba722de 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -99,9 +99,9 @@ static void popt_common_callback(poptContext con,
case 'l':
if (arg) {
- char *logfile = talloc_asprintf(NULL, "%s/log.%s", arg, pname);
- lp_set_cmdline("log file", logfile);
- talloc_free(logfile);
+ char *new_logfile = talloc_asprintf(NULL, "%s/log.%s", arg, pname);
+ lp_set_cmdline("log file", new_logfile);
+ talloc_free(new_logfile);
}
break;