summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-11-10 15:22:37 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-11-17 00:34:08 +0100
commit1f96a59ddac772689fda863d1d4a62cd916c3488 (patch)
tree01d88f58dd2094ad26ae60293bcdfb4e5cde77a4 /lib
parentb8c119f3ba0872e4416caecb8fb508cd70781c56 (diff)
downloadsamba-1f96a59ddac772689fda863d1d4a62cd916c3488.tar.gz
samba-1f96a59ddac772689fda863d1d4a62cd916c3488.tar.bz2
samba-1f96a59ddac772689fda863d1d4a62cd916c3488.zip
param: move server role helpers into loadparm.h
Pair-Programmed-With: Amitay Isaacs <amitay@samba.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/param/loadparm.c1
-rw-r--r--lib/param/loadparm.h4
-rw-r--r--lib/param/loadparm_server_role.c2
-rw-r--r--lib/param/loadparm_server_role.h31
4 files changed, 5 insertions, 33 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index aaff5bc5bc..9de009f092 100644
--- 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 1fa06b6587..ecf8f9c6a8 100644
--- 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 1abe9b9ddc..d80ee7e876 100644
--- 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
index 2c82527573..0000000000
--- 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);