s3-passdb: use passdb headers where needed.

Guenther

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

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

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

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

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);

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,

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_"
 

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, 

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

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 */
 

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

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

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,

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,

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

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 {

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

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;
 

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;
 

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;
 

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);

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;
 

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

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;

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)
 {

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"
 
 /*
  *

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);

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,

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;
 

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;
 

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;

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

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;

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;

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;

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
 

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

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

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

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

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