svn commit: samba r22169 - in branches/SAMBA_3_0_25/source/utils: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-04-11 11:43:07 +0000 (Wed, 11 Apr 2007)
New Revision: 22169

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

Log:
Merge from 3.0

Print the correct variable (configfile), when complainig that it
cannot be loaded.  This makes it much more clear when the command line
option is misused (like -c is create for the apache htpasswd utility).

Andrew Bartlett

Modified:
   branches/SAMBA_3_0_25/source/utils/smbpasswd.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/utils/smbpasswd.c
===================================================================
--- branches/SAMBA_3_0_25/source/utils/smbpasswd.c	2007-04-11 11:17:09 UTC (rev 22168)
+++ branches/SAMBA_3_0_25/source/utils/smbpasswd.c	2007-04-11 11:43:07 UTC (rev 22169)
@@ -190,7 +190,7 @@
 
 	if (!lp_load(configfile,True,False,False,True)) {
 		fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
-			dyn_CONFIGFILE);
+			configfile);
 		exit(1);
 	}