param: domain_logons and domain_master are of type enum_bool_auto

These parameters should be defined as int and not bool. This fixes
the test failures on big endian machines.

Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Thu Dec 22 10:37:42 CET 2011 on sn-devel-104

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 2c59a3ed692d1000aa7fe3e84d3e2bfa5ff4cefe..006fa8a6c1516b0354dab34135a440901bcecf31 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -85,7 +85,7 @@ static bool defaults_saved = false;
        int server_role;                                                \
        int security;                                                   \
        int domain_master;                                              \
-       bool domain_logons;                                             \
+       int domain_logons;                                              \
        int bPreferredMaster;
 
 #include "param_global.h"

diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index f0e747b00cc8f2f670e317f56bfbf996cc6612b6..34881dd97b46a70e609ec3b67643f2b402874aee 100644 (file)
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -134,6 +134,6 @@ struct parm_struct {
 #include "lib/param/param_local.h"
 
 const char* server_role_str(uint32_t role);
-int lp_find_server_role(int server_role, int security, bool domain_logons, bool domain_master);
+int lp_find_server_role(int server_role, int security, int domain_logons, int domain_master);
 int lp_find_security(int server_role, int security);
 bool lp_is_security_and_server_role_valid(int server_role, int security);

diff --git a/lib/param/loadparm_server_role.c b/lib/param/loadparm_server_role.c
index 06c4421723ce51de5167e107d0195af0716a997b..36551593a81ca5cd911176a18f318c2588348e38 100644 (file)
--- a/lib/param/loadparm_server_role.c
+++ b/lib/param/loadparm_server_role.c
@@ -58,7 +58,7 @@ const char* server_role_str(uint32_t role)
 /**
  * Set the server role based on security, domain logons and domain master
  */
-int lp_find_server_role(int server_role, int security, bool domain_logons, bool domain_master)
+int lp_find_server_role(int server_role, int security, int domain_logons, int domain_master)
 {
        int role;