From 7b73ad2755290c5345b506dcc9c8afa04432bd5e Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 19 Jan 2008 12:54:46 +0100 Subject: Link ndr_xattr.o with LIBNDR_GEN_OBJ It will be used elsewhere (net xattr for example) (This used to be commit 924c4ede2acbd4e1d327ccdefc92bbbb3d67d7d8) --- source3/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index 45aa4cbc37..d3e37826d7 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -276,6 +276,7 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \ librpc/gen_ndr/ndr_netlogon.o \ librpc/gen_ndr/ndr_samr.o \ librpc/gen_ndr/ndr_notify.o \ + librpc/gen_ndr/ndr_xattr.o \ librpc/gen_ndr/ndr_libnet_join.o RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o @@ -515,7 +516,7 @@ VFS_EXPAND_MSDFS_OBJ = modules/vfs_expand_msdfs.o VFS_SHADOW_COPY_OBJ = modules/vfs_shadow_copy.o VFS_SHADOW_COPY2_OBJ = modules/vfs_shadow_copy2.o VFS_AFSACL_OBJ = modules/vfs_afsacl.o -VFS_XATTR_TDB_OBJ = modules/vfs_xattr_tdb.o librpc/gen_ndr/ndr_xattr.o +VFS_XATTR_TDB_OBJ = modules/vfs_xattr_tdb.o VFS_POSIXACL_OBJ = modules/vfs_posixacl.o VFS_AIXACL_OBJ = modules/vfs_aixacl.o modules/vfs_aixacl_util.o VFS_AIXACL2_OBJ = modules/vfs_aixacl2.o modules/vfs_aixacl_util.o modules/nfs4_acls.o -- cgit From 4ba64fce494b064590a932d53cdbdb5f7bc4a837 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 19 Jan 2008 23:33:11 +0100 Subject: vfs_streams_xattr module Store streams in posix xattrs. A kludge, as xattrs are limited in many ways, but it might be a help for some situations. (This used to be commit 83a805220e52742119546c76a054d50582e33a24) --- source3/Makefile.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index d3e37826d7..ec06bc971d 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -526,6 +526,7 @@ VFS_HPUXACL_OBJ = modules/vfs_hpuxacl.o VFS_IRIXACL_OBJ = modules/vfs_irixacl.o VFS_TRU64ACL_OBJ = modules/vfs_tru64acl.o VFS_CATIA_OBJ = modules/vfs_catia.o +VFS_STREAMS_XATTR_OBJ = modules/vfs_streams_xattr.o VFS_CACHEPRIME_OBJ = modules/vfs_cacheprime.o VFS_PREALLOC_OBJ = modules/vfs_prealloc.o VFS_COMMIT_OBJ = modules/vfs_commit.o @@ -1747,6 +1748,10 @@ bin/catia.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_CATIA_OBJ) @echo "Building plugin $@" @$(SHLD_MODULE) $(VFS_CATIA_OBJ) +bin/streams_xattr.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_STREAMS_XATTR_OBJ) + @echo "Building plugin $@" + @$(SHLD_MODULE) $(VFS_STREAMS_XATTR_OBJ) + bin/cacheprime.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_CACHEPRIME_OBJ) @echo "Building plugin $@" @$(SHLD_MODULE) $(VFS_CACHEPRIME_OBJ) -- cgit From dfd05b9b65c5ad12dbb64b626d3180fb9e21ccb0 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 19 Jan 2008 23:36:34 +0100 Subject: vfs_streams_depot Store streams in a file each. Not 100% finished, and not built by default. (This used to be commit 5f5fc72b01c8e8fc096375c7cb4a97186c387259) --- source3/Makefile.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index ec06bc971d..ea5e5a82a7 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -527,6 +527,7 @@ VFS_IRIXACL_OBJ = modules/vfs_irixacl.o VFS_TRU64ACL_OBJ = modules/vfs_tru64acl.o VFS_CATIA_OBJ = modules/vfs_catia.o VFS_STREAMS_XATTR_OBJ = modules/vfs_streams_xattr.o +VFS_STREAMS_DEPOT_OBJ = modules/vfs_streams_depot.o VFS_CACHEPRIME_OBJ = modules/vfs_cacheprime.o VFS_PREALLOC_OBJ = modules/vfs_prealloc.o VFS_COMMIT_OBJ = modules/vfs_commit.o @@ -1752,6 +1753,10 @@ bin/streams_xattr.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_STREAMS_XATTR_OBJ) @echo "Building plugin $@" @$(SHLD_MODULE) $(VFS_STREAMS_XATTR_OBJ) +bin/streams_depot.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_STREAMS_DEPOT_OBJ) + @echo "Building plugin $@" + @$(SHLD_MODULE) $(VFS_STREAMS_DEPOT_OBJ) + bin/cacheprime.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_CACHEPRIME_OBJ) @echo "Building plugin $@" @$(SHLD_MODULE) $(VFS_CACHEPRIME_OBJ) -- cgit From 663815ec2bbb4b2566a6d72f6680b39953640bb1 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 18 Jan 2008 16:15:43 +0100 Subject: Add a registry backend prod_options that replaces the former dynamic overlay. Michael (This used to be commit d9b89e9d30702f64805b3a3a3612066b19c051d1) --- source3/Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index ea5e5a82a7..57605d1018 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -419,6 +419,7 @@ REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_pri registry/reg_smbconf.o registry/reg_api.o \ registry/reg_frontend_hilvl.o \ registry/reg_backend_netlogon_params.o \ + registry/reg_backend_prod_options.o \ $(UTIL_REG_API_OBJ) $(UTIL_REG_SMBCONF_OBJ) RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o -- cgit From c5a5b404b43817525590aa924f1762824f49d156 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 19 Jan 2008 23:46:13 +0100 Subject: Add a registry backend tcpip_params that replaces the former dynamic overlay. Michael (This used to be commit a8a743b693a162954948ca2438ce4b842c5cba30) --- source3/Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index 57605d1018..7416ee2b3c 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -420,6 +420,7 @@ REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_pri registry/reg_frontend_hilvl.o \ registry/reg_backend_netlogon_params.o \ registry/reg_backend_prod_options.o \ + registry/reg_backend_tcpip_params.o \ $(UTIL_REG_API_OBJ) $(UTIL_REG_SMBCONF_OBJ) RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o -- cgit From 949a88ee2f1163605a73a28920190c11c25e4609 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 20 Jan 2008 01:00:14 +0100 Subject: Add a registry backend hkpt_params that replaces the former dynamic overlay. Michael (This used to be commit 8e8bb6ba120adf9942f612b7fd89bdbced6c1285) --- source3/Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index 7416ee2b3c..0def36dd64 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -421,6 +421,7 @@ REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_pri registry/reg_backend_netlogon_params.o \ registry/reg_backend_prod_options.o \ registry/reg_backend_tcpip_params.o \ + registry/reg_backend_hkpt_params.o \ $(UTIL_REG_API_OBJ) $(UTIL_REG_SMBCONF_OBJ) RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o -- cgit From 2925d8357319c9872d570fe045c883a25891b59e Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 20 Jan 2008 03:24:13 +0100 Subject: Add a registry backend current_version that replaces the former dynamic overlay. Make sure to only respond to the exact current version key since subkeys are registered by other backends (printing and - soon - perflib). Michael (This used to be commit 2c650bf63ccd9dc5dddbf4700831489544ded055) --- source3/Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index 0def36dd64..fa40d92948 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -422,6 +422,7 @@ REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_pri registry/reg_backend_prod_options.o \ registry/reg_backend_tcpip_params.o \ registry/reg_backend_hkpt_params.o \ + registry/reg_backend_current_version.o \ $(UTIL_REG_API_OBJ) $(UTIL_REG_SMBCONF_OBJ) RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o -- cgit From c16b74cc861c031fda34ea131dadc9d4e175a8ed Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 20 Jan 2008 03:39:27 +0100 Subject: Add a registry backend perflib that replaces the former dynamic overlay. Michael (This used to be commit c3fba415951329ee90c7250b4e8d539f91b227f6) --- source3/Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index fa40d92948..1dcf75847f 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -423,6 +423,7 @@ REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_pri registry/reg_backend_tcpip_params.o \ registry/reg_backend_hkpt_params.o \ registry/reg_backend_current_version.o \ + registry/reg_backend_perflib.o \ $(UTIL_REG_API_OBJ) $(UTIL_REG_SMBCONF_OBJ) RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o -- cgit From e45dacce898021bbce0ba5b2c18dc8e103931e51 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 20 Jan 2008 03:45:40 +0100 Subject: Remove the dynamic registry overlay. It is unnecessary now the dynamic functions have been made registry backends of their own. Michael (This used to be commit e327953bd6b11aeb6f2ae48b49550a942eae8e88) --- source3/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index 1dcf75847f..b32fc2fe77 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -415,7 +415,7 @@ REGOBJS_OBJ = registry/reg_objects.o REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_printing.o \ registry/reg_db.o registry/reg_eventlog.o registry/reg_shares.o \ - registry/reg_util.o registry/reg_dynamic.o registry/reg_perfcount.o \ + registry/reg_util.o registry/reg_perfcount.o \ registry/reg_smbconf.o registry/reg_api.o \ registry/reg_frontend_hilvl.o \ registry/reg_backend_netlogon_params.o \ @@ -741,7 +741,6 @@ REG_API_OBJ = registry/reg_api.o \ registry/reg_cachehook.o \ registry/reg_eventlog.o \ registry/reg_perfcount.o \ - registry/reg_dynamic.o \ \ lib/util_nttoken.o \ $(UTIL_REG_API_OBJ) \ -- cgit From ea725473b3255082069b866bc9ecc49232642305 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 20 Jan 2008 23:44:33 +0100 Subject: reg_eventlog.o and reg_perfcount.o are no longer neede for reg_smbconf. This is an effect of the removal of the dynamic registry overlay. This is the beginning of a restructuring of registry linkage in Makefile.in. Michael (This used to be commit 7453e78a8e63aaaff57c1779d6b7cf0ec8fc263f) --- source3/Makefile.in | 2 -- 1 file changed, 2 deletions(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index b32fc2fe77..fd2ded6ccd 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -739,8 +739,6 @@ REG_API_OBJ = registry/reg_api.o \ registry/reg_util.o \ \ registry/reg_cachehook.o \ - registry/reg_eventlog.o \ - registry/reg_perfcount.o \ \ lib/util_nttoken.o \ $(UTIL_REG_API_OBJ) \ -- cgit From 8f290dccc967f00b55e8c8a115dc804c2464ba67 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 20 Jan 2008 23:39:16 +0100 Subject: Makefile.in: extract registry backend objects to common variable. Michael (This used to be commit 562c3eb37e2ff2b385203be9d556daf37df7d20e) --- source3/Makefile.in | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index fd2ded6ccd..76480b950f 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -413,17 +413,24 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \ REGOBJS_OBJ = registry/reg_objects.o -REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_printing.o \ - registry/reg_db.o registry/reg_eventlog.o registry/reg_shares.o \ +REGISTRY_BACKENDS = registry/reg_printing.o \ + registry/reg_db.o \ + registry/reg_smbconf.o \ + registry/reg_shares.o \ + registry/reg_backend_netlogon_params.o \ + registry/reg_backend_prod_options.o \ + registry/reg_backend_tcpip_params.o \ + registry/reg_backend_hkpt_params.o \ + registry/reg_backend_current_version.o \ + registry/reg_backend_perflib.o + + +REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o \ + registry/reg_eventlog.o \ registry/reg_util.o registry/reg_perfcount.o \ - registry/reg_smbconf.o registry/reg_api.o \ + registry/reg_api.o \ registry/reg_frontend_hilvl.o \ - registry/reg_backend_netlogon_params.o \ - registry/reg_backend_prod_options.o \ - registry/reg_backend_tcpip_params.o \ - registry/reg_backend_hkpt_params.o \ - registry/reg_backend_current_version.o \ - registry/reg_backend_perflib.o \ + $(REGISTRY_BACKENDS) \ $(UTIL_REG_API_OBJ) $(UTIL_REG_SMBCONF_OBJ) RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o -- cgit From 625c17e67025e6af319ac05b0b406208a91d4fea Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 20 Jan 2008 23:48:28 +0100 Subject: Makefile.in: Group together registry related object variables. Michael (This used to be commit cf485273f61e3dcd41ab7af756cc82f32131bf08) --- source3/Makefile.in | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index 76480b950f..0932997f1a 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -411,6 +411,15 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \ $(LIBNDR_GEN_OBJ) \ $(RPCCLIENT_NDR_OBJ) +# +# registry-related objects +# +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 + +REGFIO_OBJ = registry/regfio.o + REGOBJS_OBJ = registry/reg_objects.o REGISTRY_BACKENDS = registry/reg_printing.o \ @@ -433,6 +442,22 @@ REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o \ $(REGISTRY_BACKENDS) \ $(UTIL_REG_API_OBJ) $(UTIL_REG_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 +# using smbconf (registry) - full access +REG_API_OBJ = registry/reg_api.o \ + registry/reg_frontend_hilvl.o \ + registry/reg_smbconf.o \ + registry/reg_db.o \ + registry/reg_util.o \ + \ + registry/reg_cachehook.o \ + \ + lib/util_nttoken.o \ + $(UTIL_REG_API_OBJ) \ + $(UTIL_REG_SMBCONF_OBJ) + + RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o RPC_NETLOG_OBJ = rpc_server/srv_netlog.o rpc_server/srv_netlog_nt.o @@ -440,8 +465,6 @@ RPC_NETLOG_OBJ = rpc_server/srv_netlog.o rpc_server/srv_netlog_nt.o RPC_SAMR_OBJ = rpc_server/srv_samr.o rpc_server/srv_samr_nt.o \ rpc_server/srv_samr_util.o -REGFIO_OBJ = registry/regfio.o - RPC_INITSHUTDOWN_OBJ = librpc/gen_ndr/srv_initshutdown.o rpc_server/srv_initshutdown_nt.o RPC_REG_OBJ = rpc_server/srv_winreg_nt.o \ @@ -732,26 +755,6 @@ CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \ $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \ $(DISPLAY_SEC_OBJ) -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 - -# objects to be used when not all of the registry code should be -# loaded but only the portion needed by reg_api, typically for -# using smbconf (registry) - full access -REG_API_OBJ = registry/reg_api.o \ - registry/reg_frontend_hilvl.o \ - registry/reg_smbconf.o \ - registry/reg_db.o \ - registry/reg_util.o \ - \ - registry/reg_cachehook.o \ - \ - lib/util_nttoken.o \ - $(UTIL_REG_API_OBJ) \ - $(UTIL_REG_SMBCONF_OBJ) - - LIBNETAPI_OBJ1 = lib/netapi/netapi.o \ lib/netapi/joindomain.o \ lib/netapi/serverinfo.o \ -- cgit From 1e68e24c8ef105ebef249d770aa7e39db0abfa30 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 20 Jan 2008 23:59:06 +0100 Subject: Rename reg_printing.c to reg_backend_printing.c Start making naming of source files more systematic to facilitate understanding of the structures. Michael (This used to be commit b3c2fb17a4226559788a47fee968ef19b7fbb6b2) --- source3/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index 0932997f1a..da7fd9bcac 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -422,7 +422,7 @@ REGFIO_OBJ = registry/regfio.o REGOBJS_OBJ = registry/reg_objects.o -REGISTRY_BACKENDS = registry/reg_printing.o \ +REGISTRY_BACKENDS = registry/reg_backend_printing.o \ registry/reg_db.o \ registry/reg_smbconf.o \ registry/reg_shares.o \ -- cgit From 4ccee0dc0cd6cacc6e1ed57eb2a7e3993ec81748 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 21 Jan 2008 00:07:41 +0100 Subject: Rename reg_smbconf.c to reg_backend_smbconf.c Michael (This used to be commit b85e5ee45075211dd3ab85ac79c2d856187d5e3e) --- source3/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index da7fd9bcac..0c50e2c452 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -424,7 +424,7 @@ REGOBJS_OBJ = registry/reg_objects.o REGISTRY_BACKENDS = registry/reg_backend_printing.o \ registry/reg_db.o \ - registry/reg_smbconf.o \ + registry/reg_backend_smbconf.o \ registry/reg_shares.o \ registry/reg_backend_netlogon_params.o \ registry/reg_backend_prod_options.o \ @@ -447,7 +447,7 @@ REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o \ # using smbconf (registry) - full access REG_API_OBJ = registry/reg_api.o \ registry/reg_frontend_hilvl.o \ - registry/reg_smbconf.o \ + registry/reg_backend_smbconf.o \ registry/reg_db.o \ registry/reg_util.o \ \ -- cgit From e7520f3ad8af65cd6c59030724c5354423b9937f Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 21 Jan 2008 00:14:10 +0100 Subject: Rename reg_shares.c to reg_backend_shares.c Michael (This used to be commit aaf33ae5b8bfaefd2342c9ce6363577ce7c0c4f1) --- source3/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index 0c50e2c452..f9c80318cb 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -425,7 +425,7 @@ REGOBJS_OBJ = registry/reg_objects.o REGISTRY_BACKENDS = registry/reg_backend_printing.o \ registry/reg_db.o \ registry/reg_backend_smbconf.o \ - registry/reg_shares.o \ + registry/reg_backend_shares.o \ registry/reg_backend_netlogon_params.o \ registry/reg_backend_prod_options.o \ registry/reg_backend_tcpip_params.o \ -- cgit From b5666ceefbeae35dfb390c0be6a6dc5caa1f0406 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 21 Jan 2008 00:16:40 +0100 Subject: Rename reg_db.c to reg_backend_db.c Michael (This used to be commit c3f695d3b14ee06fc5d517ca094236e885f9e707) --- source3/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index f9c80318cb..f6a2c2eee5 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -423,7 +423,7 @@ REGFIO_OBJ = registry/regfio.o REGOBJS_OBJ = registry/reg_objects.o REGISTRY_BACKENDS = registry/reg_backend_printing.o \ - registry/reg_db.o \ + registry/reg_backend_db.o \ registry/reg_backend_smbconf.o \ registry/reg_backend_shares.o \ registry/reg_backend_netlogon_params.o \ @@ -448,7 +448,7 @@ REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o \ REG_API_OBJ = registry/reg_api.o \ registry/reg_frontend_hilvl.o \ registry/reg_backend_smbconf.o \ - registry/reg_db.o \ + registry/reg_backend_db.o \ registry/reg_util.o \ \ registry/reg_cachehook.o \ @@ -861,7 +861,7 @@ EVTLOGADM_OBJ = $(EVTLOGADM_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(REGOBJS_OBJ) $(ERRORMAP_OBJ) $(RPC_PARSE_OBJ1) $(LIBSAMBA_OBJ) $(DOSERR_OBJ) \ $(SECRETS_OBJ) \ registry/reg_eventlog.o rpc_server/srv_eventlog_lib.o registry/reg_util.o \ - registry/reg_db.o + registry/reg_backend_db.o SHARESEC_OBJ0 = utils/sharesec.o SHARESEC_OBJ = $(SHARESEC_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(REGOBJS_OBJ) \ -- cgit From 99186bf72642ad81505cb9588a444da4e89b3be2 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 21 Jan 2008 00:28:39 +0100 Subject: Extract regkey_open_internal() from reg_frontend.c to new reg_util_legacy.c reg_openpath should be used instead of this function (along with the reg_api interface). Last callers of this function are in services_db.c Michael (This used to be commit 0005b88d74fca1ea1410c9911d504b0a636a0472) --- source3/Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index f6a2c2eee5..674dd2aa40 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -437,6 +437,7 @@ REGISTRY_BACKENDS = registry/reg_backend_printing.o \ REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o \ registry/reg_eventlog.o \ registry/reg_util.o registry/reg_perfcount.o \ + registry/reg_util_legacy.o \ registry/reg_api.o \ registry/reg_frontend_hilvl.o \ $(REGISTRY_BACKENDS) \ -- cgit From 42641d6321ca88efa07137af5ed17c3a17e9dcbf Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 21 Jan 2008 00:32:01 +0100 Subject: Extend/fix comments. Michael (This used to be commit 4952417fca89f5d797c861cde9fe74050ae02e2f) --- source3/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index 674dd2aa40..df0c99d851 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -434,7 +434,7 @@ REGISTRY_BACKENDS = registry/reg_backend_printing.o \ registry/reg_backend_perflib.o -REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o \ +REGISTRY_OBJ = registry/reg_init_full.o registry/reg_cachehook.o \ registry/reg_eventlog.o \ registry/reg_util.o registry/reg_perfcount.o \ registry/reg_util_legacy.o \ -- cgit From 1b4dfc2e7d7841ee0dba95062d5369d37dd85700 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 21 Jan 2008 00:34:06 +0100 Subject: Move reg_frontend_hilvl.c to reg_dispatcher.c This is actually the dispatcher to the registered registry backends. Michael (This used to be commit 39d65d11f8eff0aff998d5bfed8480b0f00655bd) --- source3/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index df0c99d851..29df2a07eb 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -439,7 +439,7 @@ REGISTRY_OBJ = registry/reg_init_full.o registry/reg_cachehook.o \ registry/reg_util.o registry/reg_perfcount.o \ registry/reg_util_legacy.o \ registry/reg_api.o \ - registry/reg_frontend_hilvl.o \ + registry/reg_dispatcher.o \ $(REGISTRY_BACKENDS) \ $(UTIL_REG_API_OBJ) $(UTIL_REG_SMBCONF_OBJ) @@ -447,7 +447,7 @@ REGISTRY_OBJ = registry/reg_init_full.o registry/reg_cachehook.o \ # loaded but only the portion needed by reg_api, typically for # using smbconf (registry) - full access REG_API_OBJ = registry/reg_api.o \ - registry/reg_frontend_hilvl.o \ + registry/reg_dispatcher.o \ registry/reg_backend_smbconf.o \ registry/reg_backend_db.o \ registry/reg_util.o \ -- cgit From 99dfd664881f92dd1972f872c7471c5665869b86 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 21 Jan 2008 00:40:10 +0100 Subject: 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) --- source3/Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source3/Makefile.in') 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 -- cgit