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>

diff --git a/auth/ntlmssp/gensec_ntlmssp_server.c b/auth/ntlmssp/gensec_ntlmssp_server.c
index 69c56fbbfbb04295a9069dc95bc3438a0c0b931c..03d539b9bb1879d2fb3e43992a8c021b032b082c 100644 (file)
--- 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 3a25dff9d14c40fae5021ead14ba5089aa56f7c9..04aa7e00ae3e94866028cba22b625b40e047d411 100644 (file)
--- 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 6a27dcb4b58b5d9fae7b2ef296c06c9b9333dcb5..e5e3a30b9a83a4e579a8cb713c1903e593c9a20d 100644 (file)
--- 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 25be9dd0e5bf84465facaa9c7719dc3939d3f35b..500f52d56a7546f8a001716ada4604295d11a0e1 100644 (file)
--- 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 92a7619814e7527fcc82ba52df85e69259112e64..1ebb2f89121e0fb7ffbbd719bdf3adcae543ba20 100644 (file)
--- 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 7e4232d3628743fa53a4fb67d1882e5b05eddb92..bf9e0b8c309dfe39525e66be38130bca42fc574a 100644 (file)
--- 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 1ea2f754762142ee549be5b758407f6e18e4f14a..7c867cff08b5912364a11bf0b488700b9813d554 100644 (file)
--- 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 d7f8acb73d0954c3d9ed811dce4e3b5846e327b4..3da3be27285d7be83fce9269d56ed672dd53509a 100644 (file)
--- 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 1d1bc5eb8565bcc8bd86b2a8c65370a4bf33fb15..4627c3d03ff9b93164e736ccbc559c1ef160b350 100644 (file)
--- 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 43c7a3d0047eb57c9673e94596235ecc52c9f007..096359c9bf06c441fd2133e1120a03f39338bc79 100644 (file)
--- 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 682d59180c92b1a6e07c3fbd091024be501edea7..ced2a2088f255ba3a8500c67eb5d06e46ce15341 100644 (file)
--- 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 45d28a77e6bfe510cc190ad08d9c1133dba74cd3..a2dc15195bf7e8ddd6d6703b7bd34900e789289b 100644 (file)
--- 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 972459a28ee1d54687d91dd7da7552e490f88d07..292a825092349e433e42dfa486c755900a8720f4 100644 (file)
--- 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 2c1a92261aacf26488d96410f30c197ec69f55b2..985692f4fb9bbebd686776d3c1043e9447efd695 100644 (file)
--- 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 bd333779fa72f26768875cf3ec552bfe0c287eea..2176da2d53d988295479181497644adae12371c9 100644 (file)
--- 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 eb049c5f58ae19c3720570ec417eb3a950586529..a3e69741b77b0289d27131a4cde7d0077ae10769 100644 (file)
--- 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 bb476e1e6578c31440607a421dc183fbde3f21f3..4a9341fcb35fb0eee36bae6a1789d7e1d4715f13 100644 (file)
--- 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 d849ed30bccfdc20b4ccf410aed6a7c77f1dbb8a..3afbcdbf2012bfe5e7f88a404eb67a16534437f5 100644 (file)
--- 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 0e5294cb94c42c13ef38d70885303998c75a7a39..c88ffb51f2caa9255182cd7e6552061a5007dc65 100644 (file)
--- 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 f5517b249a543daee1b8a2babb64afd4529f1b88..07f4e20e725fdba5c4642eabba9d624c61033e49 100644 (file)
--- 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 87edc06beb5c4811dffc8d7cc77b83de2b607657..6a6e33e7d08674d7618167df8db44b0add5e7d15 100644 (file)
--- 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 7e733b0b563dc199947201d104fde90ee31f98a2..90cc4fb021d6401d76faae5a4e687c5fb0045601 100644 (file)
--- 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 afbbb23e3627479e8bd8aa1e687c05921a0f8311..e23b108e9d941e148984a7ecd235a9504783ea59 100644 (file)
--- 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 c40322f50c5b332636efac307d49fdda7c8592f6..c55f679bfd9deb861fbf0ba895b72f1d60216122 100644 (file)
--- 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 8193ee6d5b34fa44f1c33dfab798bc1db5943329..261bd052efe6a67375da0344734c373965ce1f60 100644 (file)
--- 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 fa6bff150e720bb90be89af8975cbafaecb73d5a..bd70ac658ad480896ed8df8f9f0f1dabf2a44e1d 100644 (file)
--- 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