summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-21 00:40:10 +0100
committerMichael Adam <obnox@samba.org>2008-01-21 08:49:12 +0100
commit99dfd664881f92dd1972f872c7471c5665869b86 (patch)
treef4138117ca0dea4cd0b4f86eb2d3a83b57c24d6f
parent1b4dfc2e7d7841ee0dba95062d5369d37dd85700 (diff)
downloadsamba-99dfd664881f92dd1972f872c7471c5665869b86.tar.gz
samba-99dfd664881f92dd1972f872c7471c5665869b86.tar.bz2
samba-99dfd664881f92dd1972f872c7471c5665869b86.zip
Rename lib/util_reg_smbconf.c to registry/reg_init_smbconf.c
This actually is a counterpart to reg_init_full, in that is does open and initialize the registry too, but only registeres the backends necessary to access the SMBCONF key. Michael (This used to be commit 01bda3ab359fb3868c1dc849044f613bf2bc563e)
-rw-r--r--source3/Makefile.in7
-rw-r--r--source3/registry/reg_init_smbconf.c (renamed from source3/lib/util_reg_smbconf.c)0
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 29df2a07eb..c519ff8985 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -416,7 +416,7 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
#
UTIL_REG_OBJ = lib/util_reg.o
UTIL_REG_API_OBJ = lib/util_reg_api.o
-UTIL_REG_SMBCONF_OBJ = lib/util_reg_smbconf.o
+REG_INIT_SMBCONF_OBJ = registry/reg_init_smbconf.o
REGFIO_OBJ = registry/regfio.o
@@ -441,7 +441,8 @@ REGISTRY_OBJ = registry/reg_init_full.o registry/reg_cachehook.o \
registry/reg_api.o \
registry/reg_dispatcher.o \
$(REGISTRY_BACKENDS) \
- $(UTIL_REG_API_OBJ) $(UTIL_REG_SMBCONF_OBJ)
+ $(UTIL_REG_API_OBJ) \
+ $(REG_INIT_SMBCONF_OBJ)
# objects to be used when not all of the registry code should be
# loaded but only the portion needed by reg_api, typically for
@@ -456,7 +457,7 @@ REG_API_OBJ = registry/reg_api.o \
\
lib/util_nttoken.o \
$(UTIL_REG_API_OBJ) \
- $(UTIL_REG_SMBCONF_OBJ)
+ $(REG_INIT_SMBCONF_OBJ)
RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o
diff --git a/source3/lib/util_reg_smbconf.c b/source3/registry/reg_init_smbconf.c
index 6452b0b15b..6452b0b15b 100644
--- a/source3/lib/util_reg_smbconf.c
+++ b/source3/registry/reg_init_smbconf.c