s3:registry: move reg_objects.h to registry/ and use it only where needed

Every place outside of registry/ where this is used, should probably
be changed to use pure reg_api.c code.

source3/include/registry.h

@@ -1,8 +1,6 @@
 #ifndef _REGISTRY_H
 #define _REGISTRY_H
 
-#include "reg_objects.h"
-
 /*
  * A REG_SZ string is not necessarily NULL terminated. When retrieving it from
  * the net, we guarantee this however. A server might want to push it without

source3/libads/ldap_printer.c

@@ -21,6 +21,7 @@
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 #ifdef HAVE_ADS
 

source3/printing/nt_printing.c

@@ -23,6 +23,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "printing/pcap.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 static TDB_CONTEXT *tdb_forms; /* used for forms files */
 static TDB_CONTEXT *tdb_drivers; /* used for driver files */

source3/registry/reg_api.c

@@ -70,6 +70,7 @@
 #include "reg_backend_db.h"
 #include "reg_dispatcher.h"
 #include "reg_util_marshalling.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/registry/reg_backend_current_version.c

@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "reg_util_internal.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/registry/reg_backend_db.c

@@ -25,6 +25,7 @@
 #include "reg_db.h"
 #include "reg_util_internal.h"
 #include "reg_backend_db.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/registry/reg_backend_hkpt_params.c

@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "reg_perfcount.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/registry/reg_backend_netlogon_params.c

@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/registry/reg_backend_perflib.c

@@ -28,6 +28,7 @@
 #include "registry.h"
 #include "reg_util_internal.h"
 #include "reg_perfcount.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/registry/reg_backend_printing.c

@@ -23,6 +23,7 @@
 #include "registry.h"
 #include "reg_util_internal.h"
 #include "reg_backend_db.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/registry/reg_backend_prod_options.c

@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/registry/reg_backend_shares.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/registry/reg_backend_tcpip_params.c

@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/registry/reg_eventlog.c

@@ -24,6 +24,7 @@
 #include "registry.h"
 #include "reg_backend_db.h"
 #include "reg_eventlog.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/registry/reg_objects.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/rpc_server/srv_ntsvcs_nt.c

@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_ntsvcs.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

source3/rpc_server/srv_spoolss_nt.c

@@ -32,6 +32,7 @@
 #include "rpc_client/init_spoolss.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \

source3/rpc_server/srv_svcctl_nt.c

@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/srv_svcctl.h"
 #include "services/services.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

source3/rpcclient/cmd_spoolss.c

@@ -28,6 +28,7 @@
 #include "rpc_client/cli_spoolss.h"
 #include "rpc_client/init_spoolss.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \
 { \

source3/services/services_db.c

@@ -25,6 +25,7 @@
 #include "registry.h"
 #include "registry/reg_util_legacy.h"
 #include "registry/reg_dispatcher.h"
+#include "registry/reg_objects.h"
 
 struct rcinit_file_information {
 	char *description;

source3/utils/net_rpc_printer.c

@@ -21,6 +21,7 @@
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
 #include "registry.h"
+#include "registry/reg_objects.h"
 
 /* support itanium as well */
 static const struct print_architecture_table_node archi_table[]= {

source3/utils/net_rpc_registry.c

@@ -24,6 +24,7 @@
 #include "regfio.h"
 #include "../librpc/gen_ndr/cli_winreg.h"
 #include "registry/reg_util_marshalling.h"
+#include "registry/reg_objects.h"
 
 /*******************************************************************
  connect to a registry hive root (open a registry policy)

source3/utils/profiles.c

@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "reg_objects.h"
+#include "registry/reg_objects.h"
 #include "regfio.h"
 
 /* GLOBAL VARIABLES */