s3-build: avoid to globally include printing and spoolss headers.

This shrinks precompiled headers by 3MB and will slightly speed up any build.

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7ffb630ff423a7ebc1181e2b201f66df95256ac9..2573585f6edfdd996ec7c68ecdcee567fc74ebbe 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -657,7 +657,6 @@ struct ntlmssp_state;
 #include "auth.h"
 #include "ntdomain.h"
 #include "librpc/rpc/dcerpc.h"
-#include "nt_printing.h"
 #include "idmap.h"
 #include "client.h"
 

diff --git a/source3/include/proto.h b/source3/include/proto.h
index bf7a41e13e26f2f2f1408d679fd430071bb2abab..4e3ec7a24f34ad5666c8ca43cf4ed8f4333abdf8 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1908,9 +1908,6 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
                                          TALLOC_CTX *mem_ctx,
                                          ADS_MODLIST *mods,
                                          const char *printer);
-bool get_local_printer_publishing_data(TALLOC_CTX *mem_ctx,
-                                      ADS_MODLIST *mods,
-                                      NT_PRINTER_DATA *data);
 
 /* The following definitions come from libads/ldap_user.c  */
 
@@ -5460,7 +5457,6 @@ void reply_transs(struct smb_request *req);
 
 /* The following definitions come from smbd/lanman.c  */
 
-time_t spoolss_Time_to_time_t(const struct spoolss_Time *r);
 void api_reply(connection_struct *conn, uint16 vuid,
               struct smb_request *req,
               char *data, char *params,

diff --git a/source3/include/registry.h b/source3/include/registry.h
index 9e7a1d2d0f6dbf3b69918b3737702c5dfc669fff..ca3a1d03642f677ddb2ff3835bb8bdd0a19575c2 100644 (file)
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -23,6 +23,8 @@
 #ifndef _REGISTRY_H
 #define _REGISTRY_H
 
+#include "../librpc/gen_ndr/winreg.h"
+
 struct registry_value {
        enum winreg_Type type;
        DATA_BLOB data;

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 5266192f0d38b30cf4d7ab3ec4988e42caa73b22..53228ba97969559944dd028d4f1929320d1cd8e7 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -180,7 +180,6 @@ typedef union unid_t {
 #include "librpc/gen_ndr/epmapper.h"
 #include "librpc/gen_ndr/krb5pac.h"
 #include "librpc/gen_ndr/dcerpc.h"
-#include "librpc/gen_ndr/spoolss.h"
 
 struct lsa_dom_info {
        bool valid;

diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index 0aa21badf4e3c5df98dfecfe6460a1e5cb4f6a97..c997218a480fb4847c856a1b84e3344343dc041c 100644 (file)
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -22,6 +22,7 @@
 #include "rpc_client/cli_spoolss.h"
 #include "registry.h"
 #include "registry/reg_objects.h"
+#include "nt_printing.h"
 
 #ifdef HAVE_ADS
 
@@ -396,7 +397,7 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
        return result;
 }
 
-bool get_local_printer_publishing_data(TALLOC_CTX *mem_ctx,
+static bool get_local_printer_publishing_data(TALLOC_CTX *mem_ctx,
                                       ADS_MODLIST *mods,
                                       NT_PRINTER_DATA *data)
 {

diff --git a/source3/printing/notify.c b/source3/printing/notify.c
index 1d155bb3a4c8adc539d719db1d00c600ea93a536..df9a15073df1c8d58912a66e6867acee7f685a6e 100644 (file)
--- a/source3/printing/notify.c
+++ b/source3/printing/notify.c
@@ -22,6 +22,8 @@
 #include "includes.h"
 #include "printing.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../librpc/gen_ndr/spoolss.h"
+#include "nt_printing.h"
 
 static TALLOC_CTX *send_ctx;
 

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 1186c6710cfd267ca1c4ce7f4fc4324bd7071c9f..c9ce969b8893a182dafd1962d02a728daa6bf615 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -27,8 +27,9 @@
 #include "registry.h"
 #include "registry/reg_objects.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "../librpc/gen_ndr/ndr_spoolss.h"
 #include "rpc_server/srv_spoolss_util.h"
-
+#include "nt_printing.h"
 #include "../rpc_server/srv_spoolss_util.h"
 
 /* Map generic permissions to printer object specific permissions */

diff --git a/source3/printing/nt_printing_tdb.c b/source3/printing/nt_printing_tdb.c
index 29f6463ff8feca056d4176db83f86dc9353b8e58..90f11eee743ebd320cca2c71e28b67993a8bb523 100644 (file)
--- a/source3/printing/nt_printing_tdb.c
+++ b/source3/printing/nt_printing_tdb.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "printing/nt_printing_tdb.h"
-
+#include "librpc/gen_ndr/spoolss.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 #define FORMS_PREFIX "FORMS/"

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 3635e59c34d54211cefb6b1512f4308abea28384..a2737105c4e0698ced30fe39745920bada419f47 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -22,6 +22,8 @@
 #include "includes.h"
 #include "printing.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../librpc/gen_ndr/ndr_spoolss.h"
+#include "nt_printing.h"
 
 extern struct current_user current_user;
 extern userdom_struct current_user_info;

diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index d18b4e620edce942d93af04a41d164f6cef161ba..3fdea105b16a7845f86c9b606aa815d837c5c584 100644 (file)
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -27,6 +27,7 @@
 #include "reg_util_internal.h"
 #include "reg_backend_db.h"
 #include "reg_objects.h"
+#include "nt_printing.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/rpc_client/init_spoolss.c b/source3/rpc_client/init_spoolss.c
index 736de269478dae790adb25933a923cae0f9947a7..d1dc7e6dce8661ff8c4b070c65ba98bdfaa33ff0 100644 (file)
--- a/source3/rpc_client/init_spoolss.c
+++ b/source3/rpc_client/init_spoolss.c
@@ -18,8 +18,8 @@
  */
 
 #include "includes.h"
-#include "rpc_client/init_spoolss.h"
 #include "../librpc/gen_ndr/ndr_spoolss.h"
+#include "rpc_client/init_spoolss.h"
 
 /*******************************************************************
 ********************************************************************/

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 0341b93c42a0a10785c9b8aa5c11aa01f2804b22..0cfceec9e76be967ee554cd7e0c32c60259d6bcb 100644 (file)
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -29,6 +29,7 @@
 #include "rpc_client/init_spoolss.h"
 #include "registry.h"
 #include "registry/reg_objects.h"
+#include "nt_printing.h"
 
 #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \
 { \

diff --git a/source3/rpcclient/cmd_test.c b/source3/rpcclient/cmd_test.c
index e854df9a780eb196a1b72dcec4eb300f1543dbfb..3b91d877dc5303fe8e11f7603b99fd0f2b70f4ab 100644 (file)
--- a/source3/rpcclient/cmd_test.c
+++ b/source3/rpcclient/cmd_test.c
@@ -23,6 +23,7 @@
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/ndr_samr.h"
+#include "../librpc/gen_ndr/winreg.h"
 
 static NTSTATUS cmd_testme(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                           int argc, const char **argv)

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2b7852ecf00b17429704f9b55bc48bcb3b637491..ba4c90d55299dce791712866a87c508706659f96 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -29,6 +29,7 @@
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
+#include "rpc_client/init_spoolss.h"
 
 /****************************************************************************
  Ensure we check the path in *exactly* the same way as W2K for a findfirst/findnext

diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index e958d284f81672c587924abad31124803df4adae..a4646462b012fa659405cefac3250588aaa85365 100644 (file)
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "nt_printing.h"
 
 /****************************************************************************
  Reload printers

diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index c398253616b1bb4815967b532437777438f9fcf5..589a569879776ee13d9707d237f8bdd6d58386a4 100644 (file)
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -21,6 +21,7 @@
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
 #include "rpc_client/init_spoolss.h"
+#include "nt_printing.h"
 #include "registry.h"
 #include "registry/reg_objects.h"
 

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 9ddabc87574755b030f6eac8356eef882ebc0339..ee96a02a6f89b502eb28a6baadb5f02b8d855881 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -25,6 +25,8 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "librpc/gen_ndr/spoolss.h"
+#include "nt_printing.h"
 
 #if HAVE_LIBUNWIND_H
 #include <libunwind.h>