svn commit: samba r20903 - in branches: SAMBA_3_0/source/utils SAMBA_3_0_24/source/utils

jerry at samba.org jerry at samba.org
Fri Jan 19 14:29:42 GMT 2007


Author: jerry
Date: 2007-01-19 14:29:42 +0000 (Fri, 19 Jan 2007)
New Revision: 20903

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

Log:
Replace the hardcoded "smb.conf" string with the dyn_CONFIGFILE


Modified:
   branches/SAMBA_3_0/source/utils/net_ads.c
   branches/SAMBA_3_0_24/source/utils/net_ads.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_ads.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_ads.c	2007-01-19 13:36:15 UTC (rev 20902)
+++ branches/SAMBA_3_0/source/utils/net_ads.c	2007-01-19 14:29:42 UTC (rev 20903)
@@ -936,8 +936,8 @@
 	}
 
 	if ( lp_security() == SEC_ADS && !*lp_realm()) {
-		d_fprintf(stderr, "realm must be set in in smb.conf for ADS "
-			"join to succeed.\n");
+		d_fprintf(stderr, "realm must be set in in %s for ADS "
+			"join to succeed.\n", dyn_CONFIGFILE);
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
@@ -1405,9 +1405,9 @@
 	}
 
 	if (strcmp(ads->config.realm, lp_realm()) != 0) {
-		d_fprintf(stderr, "realm of remote server (%s) and realm in smb.conf "
+		d_fprintf(stderr, "realm of remote server (%s) and realm in %s "
 			"(%s) DO NOT match.  Aborting join\n", ads->config.realm, 
-			lp_realm());
+			dyn_CONFIGFILE, lp_realm());
 		nt_status = NT_STATUS_INVALID_PARAMETER;
 		goto fail;
 	}
@@ -1470,10 +1470,11 @@
 	/* Check the short name of the domain */
 	
 	if ( !strequal(lp_workgroup(), short_domain_name) ) {
-		d_printf("The workgroup in smb.conf does not match the short\n");
+		d_printf("The workgroup in %s does not match the short\n", dyn_CONFIGFILE);
 		d_printf("domain name obtained from the server.\n");
 		d_printf("Using the name [%s] from the server.\n", short_domain_name);
-		d_printf("You should set \"workgroup = %s\" in smb.conf.\n", short_domain_name);
+		d_printf("You should set \"workgroup = %s\" in %s.\n", 
+			 short_domain_name, dyn_CONFIGFILE);
 	}
 	
 	d_printf("Using short domain name -- %s\n", short_domain_name);

Modified: branches/SAMBA_3_0_24/source/utils/net_ads.c
===================================================================
--- branches/SAMBA_3_0_24/source/utils/net_ads.c	2007-01-19 13:36:15 UTC (rev 20902)
+++ branches/SAMBA_3_0_24/source/utils/net_ads.c	2007-01-19 14:29:42 UTC (rev 20903)
@@ -936,8 +936,8 @@
 	}
 
 	if ( lp_security() == SEC_ADS && !*lp_realm()) {
-		d_fprintf(stderr, "realm must be set in in smb.conf for ADS "
-			"join to succeed.\n");
+		d_fprintf(stderr, "realm must be set in in %s for ADS "
+			"join to succeed.\n", dyn_CONFIGFILE);
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
@@ -1352,9 +1352,9 @@
 	}
 
 	if (strcmp(ads->config.realm, lp_realm()) != 0) {
-		d_fprintf(stderr, "realm of remote server (%s) and realm in smb.conf "
+		d_fprintf(stderr, "realm of remote server (%s) and realm in %s "
 			"(%s) DO NOT match.  Aborting join\n", ads->config.realm, 
-			lp_realm());
+			dyn_CONFIGFILE, lp_realm());
 		nt_status = NT_STATUS_INVALID_PARAMETER;
 		goto fail;
 	}
@@ -1417,10 +1417,11 @@
 	/* Check the short name of the domain */
 	
 	if ( !strequal(lp_workgroup(), short_domain_name) ) {
-		d_printf("The workgroup in smb.conf does not match the short\n");
+		d_printf("The workgroup in %s does not match the short\n", dyn_CONFIGFILE);
 		d_printf("domain name obtained from the server.\n");
 		d_printf("Using the name [%s] from the server.\n", short_domain_name);
-		d_printf("You should set \"workgroup = %s\" in smb.conf.\n", short_domain_name);
+		d_printf("You should set \"workgroup = %s\" in %s.\n", 
+			 short_domain_name, dyn_CONFIGFILE);
 	}
 	
 	d_printf("Using short domain name -- %s\n", short_domain_name);



More information about the samba-cvs mailing list