r16046: Hmmm. I don't fully understand popt, but this is necessary for smbclient to

show a prompt again :-)

James, could you check that this is ok? I think this was part of your Revision
15848.

Thanks,

Volker
(This used to be commit 91534146b4718206f0e2a7f456154a0497277dfd)

diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index f842ae80111282d6c6519d71272dff6306e308c2..d29e171be0827e4a6dbcf2ba9533b8618d485080 100644 (file)
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -56,7 +56,6 @@ static void set_logfile(poptContext con, const char * arg)
 
        pstr_sprintf(logfile, "%s/log.%s", arg, pname);
        lp_set_logfile(logfile);
-       override_logfile = True;
 }
 
 static void popt_common_callback(poptContext con,
@@ -104,6 +103,7 @@ static void popt_common_callback(poptContext con,
        case 'l':
                if (arg) {
                        set_logfile(con, arg);
+                       override_logfile = True;
                        pstr_sprintf(dyn_LOGFILEBASE, "%s", arg);
                }
                break;