From: Volker Lendecke Date: Thu, 18 Oct 2018 19:53:36 +0000 (+0200) Subject: lib: Remove gencache.h from proto.h X-Git-Tag: tdb-1.3.17~1275 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=5b2c3f2f422f4f99036e9584a0fd398a30c8618a;p=samba.git lib: Remove gencache.h from proto.h It's a pain to recompile the world if gencache.h changes Signed-off-by: Volker Lendecke Reviewed-by: Andreas Schneider Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Fri Oct 19 18:52:50 CEST 2018 on sn-devel-144 --- diff --git a/source3/auth/user_util.c b/source3/auth/user_util.c index 63841a1fe51..a76b5d47ba2 100644 --- a/source3/auth/user_util.c +++ b/source3/auth/user_util.c @@ -22,6 +22,7 @@ #include "includes.h" #include "system/filesys.h" #include "auth.h" +#include "lib/gencache.h" #ifdef HAVE_NETGROUP /* rpc/xdr.h uses TRUE and FALSE */ diff --git a/source3/include/proto.h b/source3/include/proto.h index 685d481c100..75ce12de320 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -80,8 +80,6 @@ int map_errno_from_nt_status(NTSTATUS status); struct file_id vfs_file_id_from_sbuf(connection_struct *conn, const SMB_STRUCT_STAT *sbuf); -#include "lib/gencache.h" - /* The following definitions come from lib/interface.c */ bool ismyaddr(const struct sockaddr *ip); diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c index 6f7734c2004..f566534a1a6 100644 --- a/source3/lib/gencache.c +++ b/source3/lib/gencache.c @@ -22,6 +22,7 @@ */ #include "includes.h" +#include "lib/gencache.h" #include "system/filesys.h" #include "system/glob.h" #include "util_tdb.h" diff --git a/source3/lib/idmap_cache.c b/source3/lib/idmap_cache.c index 187723689ad..4c65841fd9c 100644 --- a/source3/lib/idmap_cache.c +++ b/source3/lib/idmap_cache.c @@ -21,6 +21,7 @@ #include "idmap_cache.h" #include "../libcli/security/security.h" #include "../librpc/gen_ndr/idmap.h" +#include "lib/gencache.h" /** * Find a sid2xid mapping diff --git a/source3/lib/util.c b/source3/lib/util.c index da8ec55fa61..a3fe7c8aea2 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -36,6 +36,7 @@ #include "lib/util/sys_rw_data.h" #include "lib/util/util_process.h" #include "lib/dbwrap/dbwrap_ctdb.h" +#include "lib/gencache.h" #ifdef HAVE_SYS_PRCTL_H #include diff --git a/source3/lib/wins_srv.c b/source3/lib/wins_srv.c index 6f7d5b3b0c6..4872d1c75b3 100644 --- a/source3/lib/wins_srv.c +++ b/source3/lib/wins_srv.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "lib/gencache.h" /* This is pretty much a complete rewrite of the earlier code. The main diff --git a/source3/libads/sitename_cache.c b/source3/libads/sitename_cache.c index 3a1310750b6..549d5890354 100644 --- a/source3/libads/sitename_cache.c +++ b/source3/libads/sitename_cache.c @@ -20,6 +20,7 @@ #include "includes.h" #include "libads/sitename_cache.h" +#include "lib/gencache.h" /**************************************************************************** Store and fetch the AD client sitename. diff --git a/source3/libsmb/conncache.c b/source3/libsmb/conncache.c index 9bf4c56a339..d5a865fb112 100644 --- a/source3/libsmb/conncache.c +++ b/source3/libsmb/conncache.c @@ -25,6 +25,7 @@ #include "includes.h" +#include "lib/gencache.h" /** * @file diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c index bf96a243379..08477065f34 100644 --- a/source3/libsmb/dsgetdcname.c +++ b/source3/libsmb/dsgetdcname.c @@ -28,6 +28,7 @@ #include "libads/cldap.h" #include "../lib/addns/dnsquery.h" #include "libsmb/clidgram.h" +#include "lib/gencache.h" /* 15 minutes */ #define DSGETDCNAME_CACHE_TTL 60*15 diff --git a/source3/libsmb/namecache.c b/source3/libsmb/namecache.c index f325c346898..082f256bc02 100644 --- a/source3/libsmb/namecache.c +++ b/source3/libsmb/namecache.c @@ -22,6 +22,7 @@ */ #include "includes.h" +#include "lib/gencache.h" #define NBTKEY_FMT "NBT/%s#%02X" diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index d2ce78675ff..6564f4869ea 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -30,6 +30,7 @@ #include "libsmb/unexpected.h" #include "../libcli/nbt/libnbt.h" #include "libads/kerberos_proto.h" +#include "lib/gencache.h" /* nmbd.c sets this to True. */ bool global_in_nmbd = False; diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index cb4a46d9261..85c3d7177f3 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -27,6 +27,7 @@ #include "messages.h" #include "../lib/util/pidfile.h" #include "util_cluster.h" +#include "lib/gencache.h" int ClientNMB = -1; int ClientDGRAM = -1; diff --git a/source3/passdb/account_pol.c b/source3/passdb/account_pol.c index 4d94dfe817c..e566eca78eb 100644 --- a/source3/passdb/account_pol.c +++ b/source3/passdb/account_pol.c @@ -26,6 +26,7 @@ #include "dbwrap/dbwrap_open.h" #include "../libcli/security/security.h" #include "lib/privileges.h" +#include "lib/gencache.h" static struct db_context *db; diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index ac76e7e6e1b..024f19a73aa 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -58,6 +58,7 @@ #include "rpc_client/cli_winreg_spoolss.h" #include "../libcli/smb/smbXcli_base.h" #include "rpc_server/spoolss/srv_spoolss_handle.h" +#include "lib/gencache.h" /* macros stolen from s4 spoolss server */ #define SPOOLSS_BUFFER_UNION(fn,info,level) \ diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c index c34c912a433..2a34f067a24 100644 --- a/source3/smbd/server_exit.c +++ b/source3/smbd/server_exit.c @@ -48,6 +48,7 @@ #include "../lib/util/pidfile.h" #include "smbprofile.h" #include "libcli/auth/netlogon_creds_cli.h" +#include "lib/gencache.h" static struct files_struct *log_writeable_file_fn( struct files_struct *fsp, void *private_data) diff --git a/source3/torture/test_namemap_cache.c b/source3/torture/test_namemap_cache.c index 01dd1b7c8dc..4b0ead1a25b 100644 --- a/source3/torture/test_namemap_cache.c +++ b/source3/torture/test_namemap_cache.c @@ -21,6 +21,7 @@ #include "torture/proto.h" #include "lib/namemap_cache.h" #include "libcli/security/dom_sid.h" +#include "lib/gencache.h" static const struct dom_sid domsid = { 1, 4, {0,0,0,0,0,5}, {21, 123, 456, 789} diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 3053596b439..18f6917af0c 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -45,6 +45,7 @@ #include "lib/util/base64.h" #include "lib/util/time.h" #include "lib/crypto/md5.h" +#include "lib/gencache.h" extern char *optarg; extern int optind; diff --git a/source3/utils/net.c b/source3/utils/net.c index 7f07644b611..1138d1984e6 100644 --- a/source3/utils/net.c +++ b/source3/utils/net.c @@ -49,6 +49,7 @@ #include "passdb.h" #include "messages.h" #include "cmdline_contexts.h" +#include "lib/gencache.h" #ifdef WITH_FAKE_KASERVER #include "utils/net_afs.h" diff --git a/source3/utils/net_cache.c b/source3/utils/net_cache.c index f9d12ef4945..2d6989918f5 100644 --- a/source3/utils/net_cache.c +++ b/source3/utils/net_cache.c @@ -24,6 +24,7 @@ #include "../librpc/gen_ndr/ndr_netlogon.h" #include "libcli/security/dom_sid.h" #include "lib/util/strv.h" +#include "lib/gencache.h" /** * @file net_cache.c diff --git a/source3/winbindd/wb_dsgetdcname.c b/source3/winbindd/wb_dsgetdcname.c index cbd2cf6fd78..d2aaa8068ea 100644 --- a/source3/winbindd/wb_dsgetdcname.c +++ b/source3/winbindd/wb_dsgetdcname.c @@ -21,6 +21,7 @@ #include "winbindd.h" #include "librpc/gen_ndr/ndr_winbind_c.h" #include "librpc/gen_ndr/ndr_netlogon.h" +#include "lib/gencache.h" struct wb_dsgetdcname_state { struct netr_DsRGetDCNameInfo *dcinfo; diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c index 641c0ea96ab..ae25c6affa3 100644 --- a/source3/winbindd/winbindd.c +++ b/source3/winbindd/winbindd.c @@ -46,6 +46,7 @@ #include "libcli/auth/netlogon_creds_cli.h" #include "passdb.h" #include "lib/util/tevent_req_profile.h" +#include "lib/gencache.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 21cf40bf5cd..f3f8d547c7e 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -84,6 +84,7 @@ #include "rpc_server/rpc_ncacn_np.h" #include "auth/credentials/credentials.h" #include "lib/param/param.h" +#include "lib/gencache.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND