Avoid including libds/common/roles.h in public loadparm.h header.

Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-By: Andrew Bartlett <abartlet@samba.org>
Reviewed-By: Stefan Metzmacher <metze@samba.org>

26 files changed, 27 insertions, 5 deletions

diff --git a/auth/ntlmssp/gensec_ntlmssp_server.c b/auth/ntlmssp/gensec_ntlmssp_server.c
index 69c56fbbfbb..03d539b9bb1 100644
--- a/auth/ntlmssp/gensec_ntlmssp_server.c
+++ b/auth/ntlmssp/gensec_ntlmssp_server.c
@@ -34,6 +34,7 @@
 #include "auth/gensec/gensec_internal.h"
 #include "auth/common_auth.h"
 #include "param/param.h"
+#include "libds/common/roles.h"
 
 
 /**
diff --git a/dfs_server/dfs_server_ad.c b/dfs_server/dfs_server_ad.c
index 3a25dff9d14..04aa7e00ae3 100644
--- a/dfs_server/dfs_server_ad.c
+++ b/dfs_server/dfs_server_ad.c
@@ -27,6 +27,7 @@
 #include "lib/tsocket/tsocket.h"
 #include "dfs_server/dfs_server_ad.h"
 #include "lib/util/util_net.h"
+#include "libds/common/roles.h"
 
 #define MAX_DFS_RESPONSE 56*1024 /* 56 Kb */
 
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 6a27dcb4b58..e5e3a30b9a8 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -68,6 +68,7 @@
 #include "libcli/smb/smb_constants.h"
 #include "tdb.h"
 #include "librpc/gen_ndr/nbt.h"
+#include "libds/common/roles.h"
 
 #ifdef HAVE_HTTPCONNECTENCRYPT
 #include <cups/http.h>
diff --git a/lib/param/param.h b/lib/param/param.h
index 25be9dd0e5b..500f52d56a7 100644
--- a/lib/param/param.h
+++ b/lib/param/param.h
@@ -39,8 +39,6 @@ struct smbsrv_connection;
 
 #define Auto (2)
 
-#include "libds/common/roles.h"
-
 struct loadparm_context;
 struct loadparm_service;
 struct smbcli_options;
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 92a7619814e..1ebb2f89121 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -32,6 +32,7 @@
 #include "lib/param/loadparm.h"
 #include "lib/param/param_global.h"
 #include "libcli/smb/smb_constants.h"
+#include "libds/common/roles.h"
 
 #ifndef N_
 #define N_(x) x
diff --git a/lib/param/util.c b/lib/param/util.c
index 7e4232d3628..bf9e0b8c309 100644
--- a/lib/param/util.c
+++ b/lib/param/util.c
@@ -28,6 +28,7 @@
 #include "system/filesys.h"
 #include "system/dir.h"
 #include "param/param.h"
+#include "libds/common/roles.h"
 
 /**
  * @file
diff --git a/libcli/auth/netlogon_creds_cli.c b/libcli/auth/netlogon_creds_cli.c
index 1ea2f754762..7c867cff08b 100644
--- a/libcli/auth/netlogon_creds_cli.c
+++ b/libcli/auth/netlogon_creds_cli.c
@@ -35,6 +35,7 @@
 #include "netlogon_creds_cli.h"
 #include "source3/include/messages.h"
 #include "source3/include/g_lock.h"
+#include "libds/common/roles.h"
 
 struct netlogon_creds_cli_locked_state;
 
diff --git a/libds/common/wscript_build b/libds/common/wscript_build
index d7f8acb73d0..3da3be27285 100644
--- a/libds/common/wscript_build
+++ b/libds/common/wscript_build
@@ -2,6 +2,6 @@
 bld.SAMBA_LIBRARY('flag_mapping',
                   public_deps='talloc replace',
                   source='flag_mapping.c',
-		  private_library=True,
-                  public_headers='roles.h',
-		  deps='samba-util')
+                  private_library=True,
+                  private_headers='roles.h',
+                  deps='samba-util')
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 1d1bc5eb856..4627c3d03ff 100644
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -32,6 +32,7 @@
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
 #include "auth/kerberos/kerberos_util.h"
+#include "libds/common/roles.h"
 
 static NTSTATUS auth_generate_session_info_wrapper(struct auth4_context *auth_context,
 						   TALLOC_CTX *mem_ctx,
diff --git a/source4/auth/ntlm/auth_sam.c b/source4/auth/ntlm/auth_sam.c
index 43c7a3d0047..096359c9bf0 100644
--- a/source4/auth/ntlm/auth_sam.c
+++ b/source4/auth/ntlm/auth_sam.c
@@ -34,6 +34,7 @@
 #include "librpc/gen_ndr/ndr_irpc_c.h"
 #include "lib/messaging/irpc.h"
 #include "libcli/auth/libcli_auth.h"
+#include "libds/common/roles.h"
 
 NTSTATUS auth_sam_init(void);
 
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index 682d59180c9..ced2a2088f2 100644
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -34,6 +34,7 @@
 #include "auth/auth.h"
 #include "param/param.h"
 #include "../lib/tsocket/tsocket.h"
+#include "libds/common/roles.h"
 
 NTSTATUS server_service_cldapd_init(void);
 
diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c
index 45d28a77e6b..a2dc15195bf 100644
--- a/source4/dns_server/dns_server.c
+++ b/source4/dns_server/dns_server.c
@@ -47,6 +47,7 @@
 #include "auth/credentials/credentials.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "lib/messaging/irpc.h"
+#include "libds/common/roles.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_DNS
diff --git a/source4/dsdb/dns/dns_update.c b/source4/dsdb/dns/dns_update.c
index 972459a28ee..292a8250923 100644
--- a/source4/dsdb/dns/dns_update.c
+++ b/source4/dsdb/dns/dns_update.c
@@ -39,6 +39,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/security/dom_sid.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
+#include "libds/common/roles.h"
 
 NTSTATUS server_service_dnsupdate_init(void);
 
diff --git a/source4/dsdb/kcc/kcc_service.c b/source4/dsdb/kcc/kcc_service.c
index 2c1a92261aa..985692f4fb9 100644
--- a/source4/dsdb/kcc/kcc_service.c
+++ b/source4/dsdb/kcc/kcc_service.c
@@ -34,6 +34,7 @@
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "param/param.h"
+#include "libds/common/roles.h"
 
 /*
   establish system creds
diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index bd333779fa7..2176da2d53d 100644
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -33,6 +33,7 @@
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "param/param.h"
+#include "libds/common/roles.h"
 
 /**
  * Call-back data for _drepl_replica_sync_done_cb()
diff --git a/source4/echo_server/echo_server.c b/source4/echo_server/echo_server.c
index eb049c5f58a..a3e69741b77 100644
--- a/source4/echo_server/echo_server.c
+++ b/source4/echo_server/echo_server.c
@@ -31,6 +31,7 @@
 #include "libcli/util/ntstatus.h"
 /* tsocket-related functions */
 #include "lib/tsocket/tsocket.h"
+#include "libds/common/roles.h"
 
 NTSTATUS server_service_echo_init(void);
 
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index bb476e1e657..4a9341fcb35 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -35,6 +35,7 @@
 #include "kdc/pac-glue.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/session.h"
+#include "libds/common/roles.h"
 
 NTSTATUS server_service_kdc_init(void);
 
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index d849ed30bcc..3afbcdbf201 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -46,6 +46,7 @@
 #include "../lib/tsocket/tsocket.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "../libcli/util/tstream.h"
+#include "libds/common/roles.h"
 
 static void ldapsrv_terminate_connection_done(struct tevent_req *subreq);
 
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index 0e5294cb94c..c88ffb51f2c 100644
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -31,6 +31,7 @@
 #include "dsdb/samdb/ldb_modules/util.h"
 #include "libcli/security/security.h"
 #include "nbt_server/dgram/proto.h"
+#include "libds/common/roles.h"
 
 /*
   reply to a GETDC request
diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c
index f5517b249a5..07f4e20e725 100644
--- a/source4/nbt_server/register.c
+++ b/source4/nbt_server/register.c
@@ -30,6 +30,7 @@
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "dsdb/samdb/samdb.h"
 #include "param/param.h"
+#include "libds/common/roles.h"
 
 static void nbtd_start_refresh_timer(struct nbtd_iface_name *iname);
 
diff --git a/source4/param/tests/loadparm.c b/source4/param/tests/loadparm.c
index 87edc06beb5..6a6e33e7d08 100644
--- a/source4/param/tests/loadparm.c
+++ b/source4/param/tests/loadparm.c
@@ -22,6 +22,7 @@
 #include "param/param.h"
 #include "torture/torture.h"
 #include "torture/local/proto.h"
+#include "libds/common/roles.h"
 
 static bool test_create(struct torture_context *tctx)
 {
diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c b/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c
index 7e733b0b563..90cc4fb021d 100644
--- a/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey_heimdal.c
@@ -41,6 +41,7 @@
 #include "../libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "lib/crypto/arcfour.h"
+#include "libds/common/roles.h"
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #if defined(HAVE_GCRYPT_H) && !defined(HAVE_GNUTLS3)
diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index afbbb23e362..e23b108e9d9 100644
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -27,6 +27,7 @@
 #include "param/param.h"
 #include "rpc_server/common/common.h"
 #include "rpc_server/common/share.h"
+#include "libds/common/roles.h"
 
 /* 
     Here are common server info functions used by some dcerpc server interfaces
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index c40322f50c5..c55f679bfd9 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -33,6 +33,7 @@
 #include "libcli/security/session.h"
 #include "libcli/lsarpc/util_lsarpc.h"
 #include "lib/messaging/irpc.h"
+#include "libds/common/roles.h"
 
 /*
   this type allows us to distinguish handle types
diff --git a/source4/rpc_server/samr/dcesrv_samr.h b/source4/rpc_server/samr/dcesrv_samr.h
index 8193ee6d5b3..261bd052efe 100644
--- a/source4/rpc_server/samr/dcesrv_samr.h
+++ b/source4/rpc_server/samr/dcesrv_samr.h
@@ -20,6 +20,7 @@
 */
 
 #include "param/param.h"
+#include "libds/common/roles.h"
 
 /*
   this type allows us to distinguish handle types
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index fa6bff150e7..bd70ac658ad 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -44,6 +44,7 @@
 #include "dynconfig/dynconfig.h"
 #include "lib/util/samba_modules.h"
 #include "nsswitch/winbind_client.h"
+#include "libds/common/roles.h"
 
 /*
   recursively delete a directory tree