svn commit: samba r24510 - in branches: SAMBA_3_2/source/param SAMBA_3_2_0/source/param

[obnox at samba.org]

Author: obnox
Date: 2007-08-17 09:09:04 +0000 (Fri, 17 Aug 2007)
New Revision: 24510

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

Log:
Fix logic. Thanks to Volker for the hint!

Michael


Modified:
   branches/SAMBA_3_2/source/param/loadparm.c
   branches/SAMBA_3_2_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_3_2/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_2/source/param/loadparm.c	2007-08-17 09:01:19 UTC (rev 24509)
+++ branches/SAMBA_3_2/source/param/loadparm.c	2007-08-17 09:09:04 UTC (rev 24510)
@@ -2832,7 +2832,7 @@
 
 	*inverse = False;
 	num = map_parameter(parm_name);
-	if (num < 0 && !(parm_table[num].flags & FLAG_HIDE)) {
+	if ((num < 0) || !(parm_table[num].flags & FLAG_HIDE)) {
 		/* it is already canonical (parametric are canonical anyways) */
 		*canon_parm = parm_name;
 		return True;

Modified: branches/SAMBA_3_2_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_2_0/source/param/loadparm.c	2007-08-17 09:01:19 UTC (rev 24509)
+++ branches/SAMBA_3_2_0/source/param/loadparm.c	2007-08-17 09:09:04 UTC (rev 24510)
@@ -2837,7 +2837,7 @@
 
 	*inverse = False;
 	num = map_parameter(parm_name);
-	if (num < 0 && !(parm_table[num].flags & FLAG_HIDE)) {
+	if ((num < 0) || !(parm_table[num].flags & FLAG_HIDE)) {
 		/* it is already canonical (parametric are canonical anyways) */
 		*canon_parm = parm_name;
 		return True;