summaryrefslogtreecommitdiff
path: root/lib/param
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2011-12-22 16:40:10 +1100
committerAmitay Isaacs <amitay@samba.org>2011-12-22 10:37:42 +0100
commit8303d163cf34d0b61bfbbc62e497f7b444a17e10 (patch)
treea70e603648c0d639ab70a7174101663bee20cf7c /lib/param
parent8115c99a9755dad0befb1b5184a29068ffb5be57 (diff)
downloadsamba-8303d163cf34d0b61bfbbc62e497f7b444a17e10.tar.gz
samba-8303d163cf34d0b61bfbbc62e497f7b444a17e10.tar.bz2
samba-8303d163cf34d0b61bfbbc62e497f7b444a17e10.zip
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
Diffstat (limited to 'lib/param')
-rw-r--r--lib/param/loadparm.c2
-rw-r--r--lib/param/loadparm.h2
-rw-r--r--lib/param/loadparm_server_role.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 2c59a3ed69..006fa8a6c1 100644
--- 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 f0e747b00c..34881dd97b 100644
--- 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 06c4421723..36551593a8 100644
--- 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;