[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  8303d16 param: domain_logons and domain_master are of type enum_bool_auto
      from  8115c99 s3-rpc_server: Add my copyright for my previous work here

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8303d163cf34d0b61bfbbc62e497f7b444a17e10
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Thu Dec 22 16:40:10 2011 +1100

    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 at samba.org>
    Autobuild-Date: Thu Dec 22 10:37:42 CET 2011 on sn-devel-104

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

Summary of changes:
 lib/param/loadparm.c             |    2 +-
 lib/param/loadparm.h             |    2 +-
 lib/param/loadparm_server_role.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 2c59a3e..006fa8a 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 f0e747b..34881dd 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 06c4421..3655159 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;
 


-- 
Samba Shared Repository