diff options
| author | Michael Adam <obnox@samba.org> | 2008-02-15 15:31:31 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-02-15 16:23:10 +0100 |
| commit | 355faf2e3d0aa83401c63e70a5aff9c9f5466195 (patch) | |
| tree | 0c80bf9c7db9b1b56dc6148bbe9116861448e410 /source3/Makefile.in | |
| parent | c720a0e228bd157b8c743f8b98cc63817650d364 (diff) | |
| download | samba-355faf2e3d0aa83401c63e70a5aff9c9f5466195.tar.gz samba-355faf2e3d0aa83401c63e70a5aff9c9f5466195.tar.bz2 samba-355faf2e3d0aa83401c63e70a5aff9c9f5466195.zip | |
Move the implementation of _winreg_RestoreKey to reg_api.c
This removes the internals of reg_api from srv_winreg_nt.c entirely,
only reg_api is used there, now. This enlarges the dependencies of
reg_api somewhat now since it adds regfio. But this can be separated
out later. The current goal is to achieve a complete use of reg_api.
Michael
(This used to be commit 2222acbac955cd6d5bd48d1ce5cf4b4c7c067093)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 2d249a6f61..c3840d788d 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -459,7 +459,8 @@ REGISTRY_OBJ = registry/reg_init_full.o registry/reg_cachehook.o \ registry/reg_dispatcher.o \ $(REGISTRY_BACKENDS) \ $(UTIL_REG_API_OBJ) \ - $(REG_INIT_SMBCONF_OBJ) + $(REG_INIT_SMBCONF_OBJ) \ + $(REGFIO_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 @@ -474,7 +475,8 @@ REG_API_OBJ = registry/reg_api.o \ \ lib/util_nttoken.o \ $(UTIL_REG_API_OBJ) \ - $(REG_INIT_SMBCONF_OBJ) + $(REG_INIT_SMBCONF_OBJ) \ + $(REGFIO_OBJ) RPC_LSA_OBJ = rpc_server/srv_lsa.o rpc_server/srv_lsa_nt.o librpc/gen_ndr/srv_lsa.o @@ -489,8 +491,7 @@ RPC_SAMR_OBJ = rpc_server/srv_samr_nt.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 \ - librpc/gen_ndr/srv_winreg.o \ - $(REGFIO_OBJ) + librpc/gen_ndr/srv_winreg.o RPC_DSSETUP_OBJ = rpc_server/srv_dssetup_nt.o librpc/gen_ndr/srv_dssetup.o @@ -810,7 +811,7 @@ NET_OBJ = $(NET_OBJ1) $(PARAM_WITHOUT_REG_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \ $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \ $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \ $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \ - $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(REGFIO_OBJ) $(READLINE_OBJ) \ + $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(READLINE_OBJ) \ $(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \ $(REG_API_OBJ) $(DISPLAY_DSDCINFO_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ) \ $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ |