svn commit: samba r16046 - branches/SAMBA_3_0/source/lib trunk/source/lib

[vlendec at samba.org]

Author: vlendec
Date: 2006-06-05 13:00:24 +0000 (Mon, 05 Jun 2006)
New Revision: 16046

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16046

Log:
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

Modified:
   branches/SAMBA_3_0/source/lib/popt_common.c
   trunk/source/lib/popt_common.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/popt_common.c
===================================================================
--- branches/SAMBA_3_0/source/lib/popt_common.c	2006-06-05 12:00:28 UTC (rev 16045)
+++ branches/SAMBA_3_0/source/lib/popt_common.c	2006-06-05 13:00:24 UTC (rev 16046)
@@ -56,7 +56,6 @@
 
 	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 @@
 	case 'l':
 		if (arg) {
 			set_logfile(con, arg);
+			override_logfile = True;
 			pstr_sprintf(dyn_LOGFILEBASE, "%s", arg);
 		}
 		break;

Modified: trunk/source/lib/popt_common.c
===================================================================
--- trunk/source/lib/popt_common.c	2006-06-05 12:00:28 UTC (rev 16045)
+++ trunk/source/lib/popt_common.c	2006-06-05 13:00:24 UTC (rev 16046)
@@ -56,7 +56,6 @@
 
 	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 @@
 	case 'l':
 		if (arg) {
 			set_logfile(con, arg);
+			override_logfile = True;
 			pstr_sprintf(dyn_LOGFILEBASE, "%s", arg);
 		}
 		break;