[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2951-gb20019c

[Michael Adam]

The branch, v3-3-test has been updated
       via  b20019ceaaf4a8964792f6ba37f50f91b6847e7f (commit)
       via  59beb7acd777a4c224dce90fbbff7a137d2b89c1 (commit)
      from  f4933b1fac811f9a2f2a35f195d83b8ec6199590 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit b20019ceaaf4a8964792f6ba37f50f91b6847e7f
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 23 11:11:08 2008 +0200

    libsmbconf: add "includes" to the forbidden_valnames[].
    
    This removes the warning messages 'Unknown parameter encountered: "includes"'.
    
    Michael

commit 59beb7acd777a4c224dce90fbbff7a137d2b89c1
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 23 11:09:38 2008 +0200

    libsmbconf: fastpaths first in smbconf_reg_valname_valid().
    
    Before dropping into lp_parameter_is_valid().
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/lib/smbconf/smbconf_reg.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/smbconf/smbconf_reg.c b/source/lib/smbconf/smbconf_reg.c
index dfce750..033f800 100644
--- a/source/lib/smbconf/smbconf_reg.c
+++ b/source/lib/smbconf/smbconf_reg.c
@@ -52,6 +52,7 @@ static bool smbconf_reg_valname_forbidden(const char *valname)
 		"lock dir",
 		"config backend",
 		"include",
+		"includes", /* this has a special meaning internally */
 		NULL
 	};
 	const char **forbidden = NULL;
@@ -66,8 +67,8 @@ static bool smbconf_reg_valname_forbidden(const char *valname)
 
 static bool smbconf_reg_valname_valid(const char *valname)
 {
-	return (lp_parameter_is_valid(valname) &&
-		!smbconf_reg_valname_forbidden(valname));
+	return (!smbconf_reg_valname_forbidden(valname) &&
+		lp_parameter_is_valid(valname));
 }
 
 /**


-- 
Samba Shared Repository