svn commit: samba r14923 - branches/SAMBA_3_0/source/param trunk/source/param

[lmuelle at samba.org]

Author: lmuelle
Date: 2006-04-05 07:44:14 +0000 (Wed, 05 Apr 2006)
New Revision: 14923

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

Log:
Return False in the case a parametrical option is not configured in
the config file.

For a "somesettings: foo = " we still return an empty line.

Modified:
   branches/SAMBA_3_0/source/param/loadparm.c
   trunk/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0/source/param/loadparm.c	2006-04-05 07:29:22 UTC (rev 14922)
+++ branches/SAMBA_3_0/source/param/loadparm.c	2006-04-05 07:44:14 UTC (rev 14923)
@@ -3883,6 +3883,7 @@
 	unsigned flag = 0;
 	fstring local_parm_name;
 	char *parm_opt;
+	const char *parm_opt_value;
 
 	/* check for parametrical option */
 	fstrcpy( local_parm_name, parm_name);
@@ -3892,9 +3893,12 @@
 		*parm_opt = '\0';
 		parm_opt++;
 		if (strlen(parm_opt)) {
-			printf( "%s\n", lp_parm_const_string( snum,
-				local_parm_name, parm_opt, ""));
-			result = True;
+			parm_opt_value = lp_parm_const_string( snum,
+				local_parm_name, parm_opt, NULL);
+			if (parm_opt_value) {
+				printf( "%s\n", parm_opt_value);
+				result = True;
+			}
 		}
 		return result;
 	}

Modified: trunk/source/param/loadparm.c
===================================================================
--- trunk/source/param/loadparm.c	2006-04-05 07:29:22 UTC (rev 14922)
+++ trunk/source/param/loadparm.c	2006-04-05 07:44:14 UTC (rev 14923)
@@ -3883,6 +3883,7 @@
 	unsigned flag = 0;
 	fstring local_parm_name;
 	char *parm_opt;
+	const char *parm_opt_value;
 
 	/* check for parametrical option */
 	fstrcpy( local_parm_name, parm_name);
@@ -3892,9 +3893,12 @@
 		*parm_opt = '\0';
 		parm_opt++;
 		if (strlen(parm_opt)) {
-			printf( "%s\n", lp_parm_const_string( snum,
-				local_parm_name, parm_opt, ""));
-			result = True;
+			parm_opt_value = lp_parm_const_string( snum,
+				local_parm_name, parm_opt, NULL);
+			if (parm_opt_value) {
+				printf( "%s\n", parm_opt_value);
+				result = True;
+			}
 		}
 		return result;
 	}