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)

diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index 33959874b74b305600cb8c387a082761369c0156..fb6ba722dee15263d709d2c59bb22f5c7ee8f0f1 100644 (file)
--- 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;