param: move server role helpers into loadparm.h

Pair-Programmed-With: Amitay Isaacs <amitay@samba.org>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index aaff5bc5bc70211d5128fda97ab5b75c7e68d730..9de009f092457c71a656d7c479e8dcc732769dff 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -65,7 +65,6 @@
 #include "s3_param.h"
 #include "lib/util/bitmap.h"
 #include "libcli/smb/smb_constants.h"
-#include "lib/param/loadparm_server_role.h"
 
 #define standard_sub_basic talloc_strdup
 

diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index 1fa06b65874ca48f39ebf07b1b1bfa860eb95ee6..ecf8f9c6a8391a12dd9de3ccd81a4625e6f79641 100644 (file)
--- a/lib/param/loadparm.h
+++ b/lib/param/loadparm.h
@@ -132,3 +132,7 @@ struct parm_struct {
        char dummy[3];          /* for alignment */
 
 #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_security(int server_role, int security);

diff --git a/lib/param/loadparm_server_role.c b/lib/param/loadparm_server_role.c
index 1abe9b9ddc3c3d8395395db4b18a0500eae75de7..d80ee7e87665265514edb97de0391d45905d15f1 100644 (file)
--- a/lib/param/loadparm_server_role.c
+++ b/lib/param/loadparm_server_role.c
@@ -26,7 +26,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "includes.h"
-#include "lib/param/loadparm_server_role.h"
+#include "lib/param/loadparm.h"
 #include "libds/common/roles.h"
 
 /*******************************************************************

diff --git a/lib/param/loadparm_server_role.h b/lib/param/loadparm_server_role.h
deleted file mode 100644 (file)
index 2c82527..0000000
--- a/lib/param/loadparm_server_role.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   Parameter loading functions
-   Copyright (C) Karl Auer 1993-1998
-
-   Largely re-written by Andrew Tridgell, September 1994
-
-   Copyright (C) Simo Sorce 2001
-   Copyright (C) Alexander Bokovoy 2002
-   Copyright (C) Stefan (metze) Metzmacher 2002
-   Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2003
-   Copyright (C) Michael Adam 2008
-   Copyright (C) Andrew Bartlett 2010
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-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_security(int server_role, int security);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 25b5eb84dca1cfc761a3388cbc36dfd1a498cc50..3cbc70f997af19520b48f7191ad0f41b5ba55d73 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -60,7 +60,6 @@
 #include "lib/smbconf/smbconf.h"
 #include "lib/smbconf/smbconf_init.h"
 #include "lib/param/loadparm.h"
-#include "lib/param/loadparm_server_role.h"
 
 #include "ads.h"
 #include "../librpc/gen_ndr/svcctl.h"