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.

diff --git a/source3/include/registry.h b/source3/include/registry.h
index 6b43b522bc633b69add067b7962c07037651f047..762928f37831ed20c9ea4c236a796f38b4bfebe5 100644 (file)
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -1,8 +1,6 @@
 #ifndef _REGISTRY_H
 #define _REGISTRY_H
 
 #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
 /*
  * 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

diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index b5321abbf0e0ec00b8163983e13b2e8f825bc2e6..48db5ca7d2f6b9cd5fb3b0521341f55668cb1c40 100644 (file)
--- a/source3/libads/ldap_printer.c
+++ b/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 "../librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
 #include "registry.h"

+#include "registry/reg_objects.h"

 
 #ifdef HAVE_ADS
 
 
 #ifdef HAVE_ADS
 

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 1823b16a862d45fb3774a00c7218ac29e3789bd3..42ea5fb7c4e71be0813d6913a05a4c64dec64e00 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -23,6 +23,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "printing/pcap.h"
 #include "registry.h"
 #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 */
 
 static TDB_CONTEXT *tdb_forms; /* used for forms files */
 static TDB_CONTEXT *tdb_drivers; /* used for driver files */

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 32759ed6e1e6ebff58c41d64818cc4cb791ad1d2..4f3b7a2f86a101ea286fdeb10294b43908fbb651 100644 (file)
--- a/source3/registry/reg_api.c
+++ b/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_backend_db.h"
 #include "reg_dispatcher.h"
 #include "reg_util_marshalling.h"

+#include "reg_objects.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/reg_backend_current_version.c b/source3/registry/reg_backend_current_version.c
index d5d1a496c06175c1b9981baa068b93977c43581a..ee4131ae6795eba968feea04148afeb2a0e307e1 100644 (file)
--- a/source3/registry/reg_backend_current_version.c
+++ b/source3/registry/reg_backend_current_version.c
@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "reg_util_internal.h"
 #include "includes.h"
 #include "registry.h"
 #include "reg_util_internal.h"

+#include "reg_objects.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index db2dccf4b3aff351a0628d173af1a17379abfd3d..0c906189bc012886fc5912d97e3745446b258203 100644 (file)
--- a/source3/registry/reg_backend_db.c
+++ b/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_db.h"
 #include "reg_util_internal.h"
 #include "reg_backend_db.h"

+#include "reg_objects.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/reg_backend_hkpt_params.c b/source3/registry/reg_backend_hkpt_params.c
index a303e72517e65b80a64a339f858de8842a7a92bd..d34d1acf3caf4831a04b60941dd3edd83eb15773 100644 (file)
--- a/source3/registry/reg_backend_hkpt_params.c
+++ b/source3/registry/reg_backend_hkpt_params.c
@@ -27,6 +27,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "reg_perfcount.h"
 #include "includes.h"
 #include "registry.h"
 #include "reg_perfcount.h"

+#include "reg_objects.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/reg_backend_netlogon_params.c b/source3/registry/reg_backend_netlogon_params.c
index 5a5bcce57729a306062efaec65527ff8f53e3135..b036e75f7e2f0a276770d2b18cf4e2f98638e870 100644 (file)
--- a/source3/registry/reg_backend_netlogon_params.c
+++ b/source3/registry/reg_backend_netlogon_params.c
@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "registry.h"
 
 #include "includes.h"
 #include "registry.h"

+#include "reg_objects.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/reg_backend_perflib.c b/source3/registry/reg_backend_perflib.c
index da9e8521a7e9b4c6513595d298f31ba9b9f0cc40..396ea07e5d3222a44127c7c727c34a7a0591d72c 100644 (file)
--- a/source3/registry/reg_backend_perflib.c
+++ b/source3/registry/reg_backend_perflib.c
@@ -28,6 +28,7 @@
 #include "registry.h"
 #include "reg_util_internal.h"
 #include "reg_perfcount.h"
 #include "registry.h"
 #include "reg_util_internal.h"
 #include "reg_perfcount.h"

+#include "reg_objects.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/reg_backend_printing.c b/source3/registry/reg_backend_printing.c
index 92d7846bc99045ce029ace5a8ce5d746e8e507fb..a874a62f9dbd36b4c45b1253cb1573d810f0767b 100644 (file)
--- a/source3/registry/reg_backend_printing.c
+++ b/source3/registry/reg_backend_printing.c
@@ -23,6 +23,7 @@
 #include "registry.h"
 #include "reg_util_internal.h"
 #include "reg_backend_db.h"
 #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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/reg_backend_prod_options.c b/source3/registry/reg_backend_prod_options.c
index 764d98f6d63f3c54b5941740a05d67d0426cfa04..655c587ac405dfa6b468211c66c0ce5ec6f56d16 100644 (file)
--- a/source3/registry/reg_backend_prod_options.c
+++ b/source3/registry/reg_backend_prod_options.c
@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "registry.h"
 
 #include "includes.h"
 #include "registry.h"

+#include "reg_objects.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/reg_backend_shares.c b/source3/registry/reg_backend_shares.c
index e211e439fd532323261edb1b8566bffd681950cb..3113f0f84ca3b8b8f5f3d22a85bddb587d5d8910 100644 (file)
--- a/source3/registry/reg_backend_shares.c
+++ b/source3/registry/reg_backend_shares.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "registry.h"
 
 #include "includes.h"
 #include "registry.h"

+#include "reg_objects.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/reg_backend_tcpip_params.c b/source3/registry/reg_backend_tcpip_params.c
index 02bf59c23c69069dcf42b699a25bb0d50bfa749a..dd132df093ba916bb13b4a7be669028aa9d28706 100644 (file)
--- a/source3/registry/reg_backend_tcpip_params.c
+++ b/source3/registry/reg_backend_tcpip_params.c
@@ -26,6 +26,7 @@
 
 #include "includes.h"
 #include "registry.h"
 
 #include "includes.h"
 #include "registry.h"

+#include "reg_objects.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/reg_eventlog.c b/source3/registry/reg_eventlog.c
index 3fe35542a1b8f56dab9a543a8de57ff8694207a0..6bedf4635ebdc536a2db80cae9693f56b1b5ed4a 100644 (file)
--- a/source3/registry/reg_eventlog.c
+++ b/source3/registry/reg_eventlog.c
@@ -24,6 +24,7 @@
 #include "registry.h"
 #include "reg_backend_db.h"
 #include "reg_eventlog.h"
 #include "registry.h"
 #include "reg_backend_db.h"
 #include "reg_eventlog.h"

+#include "reg_objects.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index 55559461280864875b28b9c2dcfbdc44d4c8a66a..895435d44a5491cc584bc0aa4c0973a95758c1da 100644 (file)
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "registry.h"
 
 #include "includes.h"
 #include "registry.h"

+#include "reg_objects.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/include/reg_objects.h b/source3/registry/reg_objects.h
similarity index 100%
rename from source3/include/reg_objects.h
rename to source3/registry/reg_objects.h

diff --git a/source3/rpc_server/srv_ntsvcs_nt.c b/source3/rpc_server/srv_ntsvcs_nt.c
index ebe117db42f475d93835a9530ae88eca7bc189d9..f864dc175dd4c72baa85ab5fee6d23869d96a5be 100644 (file)
--- a/source3/rpc_server/srv_ntsvcs_nt.c
+++ b/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 "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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 37d1044ef639905f67bd53874394c884d3cfa56e..81c72c20ae0d956949f5bb4debb94ef1e5530ddd 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/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 "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) \
 
 /* macros stolen from s4 spoolss server */
 #define SPOOLSS_BUFFER_UNION(fn,info,level) \

diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index 86e329e2739bc83d27914d9c2fc199b13a325d69..24c67d3baf5f4bf800ea7e729645c9114604f211 100644 (file)
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/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 "../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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index e2d59be5e0e0021b539b35f572970c8683cc06bd..f4646c43c3c05a118cf944f00b6f2ad1c61d7311 100644 (file)
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/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 "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) \
 { \
 
 #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \
 { \

diff --git a/source3/services/services_db.c b/source3/services/services_db.c
index aa99ac9fef6e4afd2a87feba592b140b2bf4d655..2672b95bcab5126fe8e189c9d7077bc96b418d64 100644 (file)
--- a/source3/services/services_db.c
+++ b/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.h"
 #include "registry/reg_util_legacy.h"
 #include "registry/reg_dispatcher.h"

+#include "registry/reg_objects.h"

 
 struct rcinit_file_information {
        char *description;
 
 struct rcinit_file_information {
        char *description;

diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 882291339605a10d1925edcf4ae70abce6b5eb93..7d8c67fb4da625b42e23510795fd0e5c81880c27 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 "registry.h"
 #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[]= {
 
 /* support itanium as well */
 static const struct print_architecture_table_node archi_table[]= {

diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index db2e8d62057d34c30ef0740885ef8dee74f78714..7f8f5bb6ffa40af835df6b9db51169a744d0cd59 100644 (file)
--- a/source3/utils/net_rpc_registry.c
+++ b/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 "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)
 
 /*******************************************************************
  connect to a registry hive root (open a registry policy)

diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index f793704be5c2b3055aa9041e3fad7fcee34c5524..ce330a8b1692e6dfd4896a7c7b686cf02bc42016 100644 (file)
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "reg_objects.h"
+#include "registry/reg_objects.h"

 #include "regfio.h"
 
 /* GLOBAL VARIABLES */
 #include "regfio.h"
 
 /* GLOBAL VARIABLES */