From 235f1485901774bfbeb0f052bc4e1397f4ef0b88 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Tue, 22 Mar 2011 16:50:02 +0100 Subject: [PATCH] s3-passdb: use passdb headers where needed. Guenther --- source3/auth/auth_domain.c | 1 + source3/auth/auth_util.c | 1 + source3/auth/token_util.c | 1 + source3/auth/user_krb5.c | 1 + source3/include/secrets.h | 1 + source3/include/smbldap.h | 1 + source3/lib/privileges.c | 1 + source3/lib/smbldap_util.c | 1 + source3/modules/nfs4_acls.c | 1 + source3/printing/nt_printing.c | 1 + source3/registry/reg_backend_netlogon_params.c | 1 + source3/rpc_client/cli_pipe_schannel.c | 1 + source3/rpc_server/samr/srv_samr_util.h | 2 ++ source3/rpcclient/rpcclient.c | 1 + source3/smbd/lanman.c | 1 + source3/smbd/msg_idmap.c | 1 + source3/smbd/ntquotas.c | 1 + source3/smbd/nttrans.c | 1 + source3/smbd/posix_acls.c | 1 + source3/smbd/process.c | 1 + source3/smbd/server.c | 1 + source3/smbd/service.c | 1 + source3/smbd/share_access.c | 1 + source3/smbd/uid.c | 1 + source3/utils/net_lookup.c | 1 + source3/utils/net_registry.c | 1 + source3/utils/net_rpc.c | 1 + source3/utils/net_rpc_samsync.c | 1 + source3/utils/sharesec.c | 1 + source3/utils/smbcacls.c | 1 + source3/web/swat.c | 1 + source3/winbindd/idmap.c | 1 + source3/winbindd/wb_gettoken.c | 1 + source3/winbindd/wb_next_grent.c | 1 + source3/winbindd/wb_next_pwent.c | 1 + source3/winbindd/winbindd_ads.c | 1 + source3/winbindd/winbindd_cache.c | 1 + source3/winbindd/winbindd_cm.c | 1 + source3/winbindd/winbindd_pam.c | 1 + source3/winbindd/winbindd_samr.c | 1 + source3/winbindd/winbindd_util.c | 1 + 41 files changed, 42 insertions(+) diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index 65b0f205da3..c69ae63b182 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 187db5512a8..72217af51ba 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 025baa6e84d..c2f4571f83b 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 93ad0c051e1..481af6ab73a 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 71206551266..01e635c5803 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 7872ce4d4bf..5be9a92bf66 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 38264245a5c..1d5d19d323a 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 478a3d24ca9..f1f0ff613f3 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 bb457fdc6a2..b7509c85d22 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 1d075e794e0..5147dcef57c 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 b036e75f7e2..a98c92e4d69 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 f9e4a2a2cfc..0535e930be7 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 e8985415593..f992e2b9082 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 4693b1dc169..e80bee748f8 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 369e0ee38ca..99b7d185441 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 8d6a998de44..5c6d40023b3 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 38ee297dde2..f639b25dfcd 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 c1256f259fd..bff8246ddc8 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 0e7ab87b6e6..38ad86bbd34 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 29eb201bed4..f92c0cc811f 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 7461eef62fc..1fb2b6bc2e8 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 800b79989f4..ea549f6a78b 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 d00616b24eb..0c368aae795 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 070c1448eee..53a9c7cc611 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 2afa75c609e..06aedbd4730 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 7050b230226..19405e2c085 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 e0da66671ac..4c523455b65 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 72fa460b889..861f429559f 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 33cdc6a6573..1d7c6c12943 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 2f5ae857b40..45b4163c960 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 1b73b21dd34..b6e5e2ef17a 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 49d7c3aa612..ad21651e5c0 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 2f4cec811cf..5c2af4abd64 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 54c4c1c440e..c7af6416c49 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 345803a7089..4595fbc6533 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 1fa4b81543b..4e8045731ac 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 108e0b39b61..57a93a7a2db 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 302df1e22d4..bb333b39ee3 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 3fe62547939..6f3fee78092 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 fd499143282..c369945c350 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 e87f25e18f4..1a6cf8722e5 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 -- 2.34.1