s3-passdb: add passdb.h where needed.

Guenther

44 files changed, 44 insertions, 0 deletions

diff --git a/source3/auth/check_samsec.c b/source3/auth/check_samsec.c
index db5f68fdfeb..98d7ce87e39 100644
--- a/source3/auth/check_samsec.c
+++ b/source3/auth/check_samsec.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index 363236c7346..ca35ba76a14 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -23,6 +23,7 @@
 #include "../libcli/security/security.h"
 #include "rpc_client/util_netlogon.h"
 #include "nsswitch/libwbclient/wbclient.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/server_info_sam.c b/source3/auth/server_info_sam.c
index c09ae764b95..35bbebabfe7 100644
--- a/source3/auth/server_info_sam.c
+++ b/source3/auth/server_info_sam.c
@@ -25,6 +25,7 @@
 #include "smbd/globals.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "nsswitch/winbind_client.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 00ae4a1790c..3646e04d0a3 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "passdb.h"
 #include "groupdb/mapping.h"
 #include "../libcli/security/security.h"
 #include "lib/winbind_util.h"
diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index 26345521277..1137b8f6587 100644
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "passdb.h"
 #include "groupdb/mapping.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c
index cd5943e5f0d..ab347567f14 100644
--- a/source3/libnet/libnet_dssync_passdb.c
+++ b/source3/libnet/libnet_dssync_passdb.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/ndr_drsuapi.h"
 #include "dbwrap.h"
 #include "../libds/common/flag_mapping.h"
+#include "passdb.h"
 
 /****************************************************************
 ****************************************************************/
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index a11145b851f..e702ffc13be 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -37,6 +37,7 @@
 #include "rpc_client/cli_pipe.h"
 #include "krb5_env.h"
 #include "../libcli/security/security.h"
+#include "passdb.h"
 
 /****************************************************************
 ****************************************************************/
diff --git a/source3/libnet/libnet_samsync_display.c b/source3/libnet/libnet_samsync_display.c
index f2cff78dd95..d503ffb4283 100644
--- a/source3/libnet/libnet_samsync_display.c
+++ b/source3/libnet/libnet_samsync_display.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "libnet/libnet_samsync.h"
+#include "passdb.h"
 
 static void display_group_mem_info(uint32_t rid,
 				   struct netr_DELTA_GROUP_MEMBER *r)
diff --git a/source3/libnet/libnet_samsync_ldif.c b/source3/libnet/libnet_samsync_ldif.c
index 8c6522a7232..4154a07fdab 100644
--- a/source3/libnet/libnet_samsync_ldif.c
+++ b/source3/libnet/libnet_samsync_ldif.c
@@ -27,6 +27,7 @@
 #include "libnet/libnet_samsync.h"
 #include "smbldap.h"
 #include "transfer_file.h"
+#include "passdb.h"
 
 #ifdef HAVE_LDAP
 
diff --git a/source3/libnet/libnet_samsync_passdb.c b/source3/libnet/libnet_samsync_passdb.c
index 3ad9ffe6525..b579723f6fd 100644
--- a/source3/libnet/libnet_samsync_passdb.c
+++ b/source3/libnet/libnet_samsync_passdb.c
@@ -27,6 +27,7 @@
 #include "system/passwd.h"
 #include "libnet/libnet_samsync.h"
 #include "../libcli/security/security.h"
+#include "passdb.h"
 
 /* Convert a struct samu_DELTA to a struct samu. */
 #define STRING_CHANGED (old_string && !new_string) ||\
diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
index 7ecc167343b..08377fbfbc6 100644
--- a/source3/libsmb/trusts_util.c
+++ b/source3/libsmb/trusts_util.c
@@ -26,6 +26,7 @@
 #include "rpc_client/cli_pipe.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "secrets.h"
+#include "passdb.h"
 
 /*********************************************************
  Change the domain password on the PDC.
diff --git a/source3/pam_smbpass/general.h b/source3/pam_smbpass/general.h
index 74bd870bc58..6e13f8d9361 100644
--- a/source3/pam_smbpass/general.h
+++ b/source3/pam_smbpass/general.h
@@ -1,5 +1,6 @@
 #include "../librpc/gen_ndr/samr.h"
 #include "../libcli/auth/pam_errors.h"
+#include "passdb.h"
 
 #ifndef LINUX
 /* This is only needed by modules in the Sun implementation. */
diff --git a/source3/passdb/account_pol.c b/source3/passdb/account_pol.c
index a30b9ca32a7..7eeb38fdd8a 100644
--- a/source3/passdb/account_pol.c
+++ b/source3/passdb/account_pol.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "passdb.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
 static struct db_context *db;
diff --git a/source3/passdb/login_cache.c b/source3/passdb/login_cache.c
index a12265642df..1785a4dacac 100644
--- a/source3/passdb/login_cache.c
+++ b/source3/passdb/login_cache.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 386207889ac..677566187c8 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "secrets.h"
 #include "memcache.h"
diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index f3206d4eb8e..dcf37d1b2b4 100644
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -23,6 +23,7 @@
    such as the local SID and machine trust password */
 
 #include "includes.h"
+#include "passdb.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "secrets.h"
 #include "dbwrap.h"
diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c
index 977cd20eb9c..8fd51031648 100644
--- a/source3/passdb/machine_sid.c
+++ b/source3/passdb/machine_sid.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 #include "secrets.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 80366a24e64..62af5be7eb4 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 #include "system/passwd.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "secrets.h"
diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index dc728ee4541..3746da3a4fe 100644
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 #include "tldap.h"
 #include "tldap_util.h"
 #include "../libds/common/flags.h"
diff --git a/source3/passdb/pdb_compat.c b/source3/passdb/pdb_compat.c
index 17a18bca8ee..a4fb1bf3c08 100644
--- a/source3/passdb/pdb_compat.c
+++ b/source3/passdb/pdb_compat.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 #include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
diff --git a/source3/passdb/pdb_get_set.c b/source3/passdb/pdb_get_set.c
index e572c3d94fe..6c1a2ab23d7 100644
--- a/source3/passdb/pdb_get_set.c
+++ b/source3/passdb/pdb_get_set.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../libcli/security/security.h"
 
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 56b66892d09..36d5aaa01a7 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "passdb.h"
 #include "secrets.h"
 #include "../librpc/gen_ndr/samr.h"
 #include "memcache.h"
diff --git a/source3/passdb/pdb_ipa.c b/source3/passdb/pdb_ipa.c
index feae2287e77..3fffbe0657b 100644
--- a/source3/passdb/pdb_ipa.c
+++ b/source3/passdb/pdb_ipa.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 #include "libcli/security/dom_sid.h"
 
 #include "smbldap.h"
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 7621bb62791..7ce5edcefa9 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -44,6 +44,7 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "secrets.h"
 #include "idmap_cache.h"
diff --git a/source3/passdb/pdb_nds.c b/source3/passdb/pdb_nds.c
index 1545b45d741..56375a813f6 100644
--- a/source3/passdb/pdb_nds.c
+++ b/source3/passdb/pdb_nds.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 
 #include <lber.h>
 #include <ldap.h>
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index c39394bfa58..43d6eaf6645 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -21,6 +21,7 @@
  */
 
 #include "includes.h"
+#include "passdb.h"
 #include "system/passwd.h"
 #include "system/filesys.h"
 #include "../librpc/gen_ndr/samr.h"
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index f2495382086..79c0ed196af 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "passdb.h"
 #include "dbwrap.h"
 #include "../libcli/security/security.h"
 
diff --git a/source3/passdb/pdb_wbc_sam.c b/source3/passdb/pdb_wbc_sam.c
index 742e7899010..64529c78961 100644
--- a/source3/passdb/pdb_wbc_sam.c
+++ b/source3/passdb/pdb_wbc_sam.c
@@ -37,6 +37,7 @@
  */
 
 #include "includes.h"
+#include "passdb.h"
 #include "lib/winbind_util.h"
 
 /***************************************************************************
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index db9fb7275de..c16d15807bd 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "passdb.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_secrets.h"
 #include "secrets.h"
diff --git a/source3/passdb/util_builtin.c b/source3/passdb/util_builtin.c
index 9cd6780784d..d37b8edff4e 100644
--- a/source3/passdb/util_builtin.c
+++ b/source3/passdb/util_builtin.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 #include "../libcli/security/security.h"
 
 struct rid_name_map {
diff --git a/source3/passdb/util_unixsids.c b/source3/passdb/util_unixsids.c
index fba4749dbb5..e6f73a14437 100644
--- a/source3/passdb/util_unixsids.c
+++ b/source3/passdb/util_unixsids.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 #include "system/passwd.h"
 #include "../libcli/security/security.h"
 #include "../lib/util/util_pw.h"
diff --git a/source3/passdb/util_wellknown.c b/source3/passdb/util_wellknown.c
index 2d83ebef126..1810efac178 100644
--- a/source3/passdb/util_wellknown.c
+++ b/source3/passdb/util_wellknown.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "passdb.h"
 #include "../libcli/security/security.h"
 
 struct rid_name_map {
diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c
index 01e4a644b5e..07d7fd46dd5 100644
--- a/source3/rpc_server/lsa/srv_lsa_nt.c
+++ b/source3/rpc_server/lsa/srv_lsa_nt.c
@@ -41,6 +41,7 @@
 #include "../lib/crypto/arcfour.h"
 #include "../libcli/security/dom_sid.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
index 6fe92eb1725..90e8c6c6e36 100644
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
@@ -43,6 +43,7 @@
 #include "lib/crypto/md4.h"
 #include "nsswitch/libwbclient/wbclient.h"
 #include "../libcli/registry/util_reg.h"
+#include "passdb.h"
 
 extern userdom_struct current_user_info;
 
diff --git a/source3/rpc_server/samr/srv_samr_chgpasswd.c b/source3/rpc_server/samr/srv_samr_chgpasswd.c
index 613758f4546..c5394edec0e 100644
--- a/source3/rpc_server/samr/srv_samr_chgpasswd.c
+++ b/source3/rpc_server/samr/srv_samr_chgpasswd.c
@@ -52,6 +52,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../lib/crypto/arcfour.h"
 #include "rpc_server/samr/srv_samr_util.h"
+#include "passdb.h"
 
 #ifndef ALLOW_CHANGE_PASSWORD
 #if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID))
diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index cbb72f8fdd2..6759f238a3b 100644
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -41,6 +41,7 @@
 #include "secrets.h"
 #include "rpc_client/init_lsa.h"
 #include "../libcli/security/security.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/samr/srv_samr_util.c b/source3/rpc_server/samr/srv_samr_util.c
index 8dfeae15e83..29123321f86 100644
--- a/source3/rpc_server/samr/srv_samr_util.c
+++ b/source3/rpc_server/samr/srv_samr_util.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/samr.h"
 #include "rpc_server/samr/srv_samr_util.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/torture/pdbtest.c b/source3/torture/pdbtest.c
index 82f8132797f..7ab20c76926 100644
--- a/source3/torture/pdbtest.c
+++ b/source3/torture/pdbtest.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "popt_common.h"
+#include "passdb.h"
 
 static bool samu_correct(struct samu *s1, struct samu *s2)
 {
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 965cd443f34..9eace766619 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -46,6 +46,7 @@
 #include "secrets.h"
 #include "lib/netapi/netapi.h"
 #include "../libcli/security/security.h"
+#include "passdb.h"
 
 #ifdef WITH_FAKE_KASERVER
 #include "utils/net_afs.h"
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 6f9a6ce802a..818905e122f 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -25,6 +25,7 @@
 #include "system/passwd.h"
 #include "utils/net.h"
 #include "../libcli/security/security.h"
+#include "passdb.h"
 
 /*********************************************************
  Figure out if the input was an NT group or a SID string.
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 0156660e868..dfd9a78cc30 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -25,6 +25,7 @@
 #include "smbldap.h"
 #include "../libcli/security/security.h"
 #include "lib/winbind_util.h"
+#include "passdb.h"
 
 /*
  * Set a user's data
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index ec324cd5e8e..cea3e3b2950 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -24,6 +24,7 @@
 #include "popt_common.h"
 #include "../librpc/gen_ndr/samr.h"
 #include "../libcli/security/security.h"
+#include "passdb.h"
 
 #define BIT_BACKEND	0x00000004
 #define BIT_VERBOSE	0x00000008
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 487f7a68d92..ada057c2479 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -21,6 +21,7 @@
 #include "secrets.h"
 #include "../librpc/gen_ndr/samr.h"
 #include "../lib/util/util_pw.h"
+#include "passdb.h"
 
 /*
  * Next two lines needed for SunOS and don't
diff --git a/source3/winbindd/idmap_passdb.c b/source3/winbindd/idmap_passdb.c
index 276ae2c1047..4731756d5a5 100644
--- a/source3/winbindd/idmap_passdb.c
+++ b/source3/winbindd/idmap_passdb.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "idmap.h"
+#include "passdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP