s3-passdb: use passdb headers where needed.

Guenther

41 files changed, 42 insertions, 0 deletions

diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 65b0f205da..c69ae63b18 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -24,6 +24,7 @@
 #include "rpc_client/cli_pipe.h"
 #include "rpc_client/cli_netlogon.h"
 #include "secrets.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 187db5512a..72217af51b 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -29,6 +29,7 @@
 #include "../libcli/security/security.h"
 #include "../lib/util/util_pw.h"
 #include "lib/winbind_util.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 025baa6e84..c2f4571f83 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -31,6 +31,7 @@
 #include "../libcli/security/security.h"
 #include "../lib/util/util_pw.h"
 #include "lib/winbind_util.h"
+#include "passdb.h"
 
 /****************************************************************************
  Check for a SID in an struct security_token
diff --git a/source3/auth/user_krb5.c b/source3/auth/user_krb5.c
index 93ad0c051e..481af6ab73 100644
--- a/source3/auth/user_krb5.c
+++ b/source3/auth/user_krb5.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/krb5pac.h"
 #include "nsswitch/libwbclient/wbclient.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source3/include/secrets.h b/source3/include/secrets.h
index 7120655126..01e635c580 100644
--- a/source3/include/secrets.h
+++ b/source3/include/secrets.h
@@ -115,6 +115,7 @@ char *secrets_fetch_machine_password(const char *domain,
 bool trusted_domain_password_delete(const char *domain);
 bool secrets_store_ldap_pw(const char* dn, char* pw);
 bool fetch_ldap_pw(char **dn, char** pw);
+struct trustdom_info;
 NTSTATUS secrets_trusted_domains(TALLOC_CTX *mem_ctx, uint32 *num_domains,
 				 struct trustdom_info ***domains);
 bool secrets_store_afs_keyfile(const char *cell, const struct afs_keyfile *keyfile);
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
index 7872ce4d4b..5be9a92bf6 100644
--- a/source3/include/smbldap.h
+++ b/source3/include/smbldap.h
@@ -213,6 +213,7 @@ struct ldapsam_privates {
 };
 
 /* Functions shared between pdb_ldap.c and pdb_nds.c. */
+struct pdb_methods;
 NTSTATUS pdb_init_ldapsam_compat( struct pdb_methods **pdb_method, const char *location);
 void private_data_free_fn(void **result);
 int ldapsam_search_suffix_by_name(struct ldapsam_privates *ldap_state,
diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c
index 38264245a5..1d5d19d323 100644
--- a/source3/lib/privileges.c
+++ b/source3/lib/privileges.c
@@ -25,6 +25,7 @@
 #include "dbwrap.h"
 #include "libcli/security/privileges_private.h"
 #include "../libcli/security/security.h"
+#include "passdb.h"
 
 #define PRIVPREFIX              "PRIV_"
 
diff --git a/source3/lib/smbldap_util.c b/source3/lib/smbldap_util.c
index 478a3d24ca..f1f0ff613f 100644
--- a/source3/lib/smbldap_util.c
+++ b/source3/lib/smbldap_util.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "smbldap.h"
+#include "passdb.h"
 
 /**********************************************************************
  Add the account-policies below the sambaDomain object to LDAP, 
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index bb457fdc6a..b7509c85d2 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -24,6 +24,7 @@
 #include "../libcli/security/security.h"
 #include "include/dbwrap.h"
 #include "system/filesys.h"
+#include "passdb/lookup_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_ACLS
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 1d075e794e..5147dcef57 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -33,6 +33,7 @@
 #include "secrets.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "../libcli/security/security.h"
+#include "passdb/machine_sid.h"
 
 /* Map generic permissions to printer object specific permissions */
 
diff --git a/source3/registry/reg_backend_netlogon_params.c b/source3/registry/reg_backend_netlogon_params.c
index b036e75f7e..a98c92e4d6 100644
--- a/source3/registry/reg_backend_netlogon_params.c
+++ b/source3/registry/reg_backend_netlogon_params.c
@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "reg_objects.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
diff --git a/source3/rpc_client/cli_pipe_schannel.c b/source3/rpc_client/cli_pipe_schannel.c
index f9e4a2a2cf..0535e930be 100644
--- a/source3/rpc_client/cli_pipe_schannel.c
+++ b/source3/rpc_client/cli_pipe_schannel.c
@@ -25,6 +25,7 @@
 #include "rpc_client/cli_pipe.h"
 #include "librpc/gen_ndr/ndr_dcerpc.h"
 #include "librpc/rpc/dcerpc.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_CLI
diff --git a/source3/rpc_server/samr/srv_samr_util.h b/source3/rpc_server/samr/srv_samr_util.h
index e898541559..f992e2b908 100644
--- a/source3/rpc_server/samr/srv_samr_util.h
+++ b/source3/rpc_server/samr/srv_samr_util.h
@@ -24,6 +24,8 @@
 
 /* The following definitions come from rpc_server/srv_samr_util.c  */
 
+struct samu;
+
 void copy_id2_to_sam_passwd(struct samu *to,
 			    struct samr_UserInfo2 *from);
 void copy_id4_to_sam_passwd(struct samu *to,
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 4693b1dc16..e80bee748f 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -30,6 +30,7 @@
 #include "rpc_client/cli_netlogon.h"
 #include "../libcli/smbreadline/smbreadline.h"
 #include "../libcli/security/security.h"
+#include "passdb.h"
 
 enum pipe_auth_type_spnego {
 	PIPE_AUTH_TYPE_SPNEGO_NONE = 0,
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 369e0ee38c..99b7d18544 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -41,6 +41,7 @@
 #include "rpc_server/rpc_ncacn_np.h"
 #include "../libcli/security/security.h"
 #include "printing.h"
+#include "passdb/machine_sid.h"
 
 #ifdef CHECK_TYPES
 #undef CHECK_TYPES
diff --git a/source3/smbd/msg_idmap.c b/source3/smbd/msg_idmap.c
index 8d6a998de4..5c6d40023b 100644
--- a/source3/smbd/msg_idmap.c
+++ b/source3/smbd/msg_idmap.c
@@ -32,6 +32,7 @@
 #include "../librpc/gen_ndr/messaging.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "idmap_cache.h"
+#include "passdb/lookup_sid.h"
 
 struct id {
 	union {
diff --git a/source3/smbd/ntquotas.c b/source3/smbd/ntquotas.c
index 38ee297dde..f639b25dfc 100644
--- a/source3/smbd/ntquotas.c
+++ b/source3/smbd/ntquotas.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "../lib/util/util_pw.h"
 #include "system/passwd.h"
+#include "passdb/lookup_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_QUOTA
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index c1256f259f..bff8246ddc 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -24,6 +24,7 @@
 #include "fake_file.h"
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "passdb/lookup_sid.h"
 
 extern const struct generic_mapping file_generic_mapping;
 
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 0e7ab87b6e..38ad86bbd3 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -23,6 +23,7 @@
 #include "system/filesys.h"
 #include "../libcli/security/security.h"
 #include "trans2.h"
+#include "passdb/lookup_sid.h"
 
 extern const struct generic_mapping file_generic_mapping;
 
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 29eb201bed..f92c0cc811 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -28,6 +28,7 @@
 #include "../lib/util/select.h"
 #include "printing/pcap.h"
 #include "system/select.h"
+#include "passdb.h"
 
 extern bool global_machine_password_needs_changing;
 
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 7461eef62f..1fb2b6bc2e 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -37,6 +37,7 @@
 #include "printing/pcap.h"
 #include "printing.h"
 #include "serverid.h"
+#include "passdb.h"
 
 extern void start_epmd(struct tevent_context *ev_ctx,
 		       struct messaging_context *msg_ctx);
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 800b79989f..ea549f6a78 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -23,6 +23,7 @@
 #include "../librpc/gen_ndr/netlogon.h"
 #include "../libcli/security/security.h"
 #include "printing/pcap.h"
+#include "passdb/lookup_sid.h"
 
 extern userdom_struct current_user_info;
 
diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c
index d00616b24e..0c368aae79 100644
--- a/source3/smbd/share_access.c
+++ b/source3/smbd/share_access.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/security/security.h"
+#include "passdb/lookup_sid.h"
 
 /*
  * No prefix means direct username
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index 070c1448ee..53a9c7cc61 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -22,6 +22,7 @@
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "libcli/security/security.h"
+#include "passdb/lookup_sid.h"
 
 /* what user is current? */
 extern struct current_user current_user;
diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 2afa75c609..06aedbd473 100644
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -23,6 +23,7 @@
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "smb_krb5.h"
 #include "../libcli/security/security.h"
+#include "passdb/lookup_sid.h"
 
 int net_lookup_usage(struct net_context *c, int argc, const char **argv)
 {
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 7050b23022..19405e2c08 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -34,6 +34,7 @@
 #include "../libcli/security/display_sec.h"
 #include "../libcli/security/sddl.h"
 #include "../libcli/registry/util_reg.h"
+#include "passdb/machine_sid.h"
 
 /*
  *
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index e0da66671a..4c523455b6 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -41,6 +41,7 @@
 #include "../libcli/security/security.h"
 #include "libsmb/clirap.h"
 #include "nsswitch/libwbclient/wbclient.h"
+#include "passdb.h"
 
 static int net_mode_share;
 static NTSTATUS sync_files(struct copy_clistate *cp_clistate, const char *mask);
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 72fa460b88..861f429559 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -30,6 +30,7 @@
 #include "libnet/libnet_samsync.h"
 #include "libnet/libnet_dssync.h"
 #include "../libcli/security/security.h"
+#include "passdb/machine_sid.h"
 
 static void parse_samsync_partial_replication_objects(TALLOC_CTX *mem_ctx,
 						      int argc,
diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index 33cdc6a657..1d7c6c1294 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "popt_common.h"
 #include "../libcli/security/security.h"
+#include "passdb/machine_sid.h"
 
 static TALLOC_CTX *ctx;
 
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 2f5ae857b4..45b4163c96 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -28,6 +28,7 @@
 #include "rpc_client/cli_lsarpc.h"
 #include "../libcli/security/security.h"
 #include "libsmb/clirap.h"
+#include "passdb/machine_sid.h"
 
 static int test_args;
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 1b73b21dd3..b6e5e2ef17 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -33,6 +33,7 @@
 #include "web/swat_proto.h"
 #include "printing/pcap.h"
 #include "printing/load.h"
+#include "passdb.h"
 
 static int demo_mode = False;
 static int passwd_only = False;
diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c
index 49d7c3aa61..ad21651e5c 100644
--- a/source3/winbindd/idmap.c
+++ b/source3/winbindd/idmap.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "idmap.h"
+#include "passdb/machine_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
diff --git a/source3/winbindd/wb_gettoken.c b/source3/winbindd/wb_gettoken.c
index 2f4cec811c..5c2af4abd6 100644
--- a/source3/winbindd/wb_gettoken.c
+++ b/source3/winbindd/wb_gettoken.c
@@ -21,6 +21,7 @@
 #include "winbindd.h"
 #include "librpc/gen_ndr/ndr_wbint_c.h"
 #include "../libcli/security/security.h"
+#include "passdb/machine_sid.h"
 
 struct wb_gettoken_state {
 	struct tevent_context *ev;
diff --git a/source3/winbindd/wb_next_grent.c b/source3/winbindd/wb_next_grent.c
index 54c4c1c440..c7af6416c4 100644
--- a/source3/winbindd/wb_next_grent.c
+++ b/source3/winbindd/wb_next_grent.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "passdb/machine_sid.h"
 
 struct wb_next_grent_state {
 	struct tevent_context *ev;
diff --git a/source3/winbindd/wb_next_pwent.c b/source3/winbindd/wb_next_pwent.c
index 345803a708..4595fbc653 100644
--- a/source3/winbindd/wb_next_pwent.c
+++ b/source3/winbindd/wb_next_pwent.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "librpc/gen_ndr/ndr_wbint_c.h"
+#include "passdb/machine_sid.h"
 
 struct wb_next_pwent_state {
 	struct tevent_context *ev;
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 1fa4b81543..4e8045731a 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -30,6 +30,7 @@
 #include "../libcli/ldap/ldap_ndr.h"
 #include "../libcli/security/security.h"
 #include "../libds/common/flag_mapping.h"
+#include "passdb.h"
 
 #ifdef HAVE_ADS
 
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 108e0b39b6..57a93a7a2d 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -32,6 +32,7 @@
 #include "ads.h"
 #include "nss_info.h"
 #include "../libcli/security/security.h"
+#include "passdb/machine_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 302df1e22d..bb333b39ee 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -74,6 +74,7 @@
 #include "ads.h"
 #include "secrets.h"
 #include "../libcli/security/security.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 3fe6254793..6f3fee7809 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -35,6 +35,7 @@
 #include "../libcli/security/security.h"
 #include "ads.h"
 #include "../librpc/gen_ndr/krb5pac.h"
+#include "passdb/machine_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index fd49914328..c369945c35 100644
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -35,6 +35,7 @@
 #include "../librpc/gen_ndr/srv_lsa.h"
 #include "rpc_server/rpc_ncacn_np.h"
 #include "../libcli/security/security.h"
+#include "passdb/machine_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index e87f25e18f..1a6cf8722e 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -25,6 +25,7 @@
 #include "secrets.h"
 #include "../libcli/security/security.h"
 #include "../libcli/auth/pam_errors.h"
+#include "passdb/machine_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND