From 1f96a59ddac772689fda863d1d4a62cd916c3488 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 10 Nov 2011 15:22:37 +1100 Subject: [PATCH] param: move server role helpers into loadparm.h Pair-Programmed-With: Amitay Isaacs --- lib/param/loadparm.c | 1 - lib/param/loadparm.h | 4 ++++ lib/param/loadparm_server_role.c | 2 +- lib/param/loadparm_server_role.h | 31 ------------------------------- source3/param/loadparm.c | 1 - 5 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 lib/param/loadparm_server_role.h diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index aaff5bc5bc7..9de009f0924 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 1fa06b65874..ecf8f9c6a83 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 1abe9b9ddc3..d80ee7e8766 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 . */ #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 2c82527573b..00000000000 --- 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 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 . -*/ - -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 25b5eb84dca..3cbc70f997a 100644 --- 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" -- 2.34.1