diff options
| author | Volker Lendecke <vl@samba.org> | 2010-09-18 10:56:10 +0400 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-09-23 12:19:09 -0700 |
| commit | 66731461a6882faf5ec6ba23944e4d4b357125b7 (patch) | |
| tree | fa07b00b4db35b82aad0aa5591c63e34e4072394 /source3 | |
| parent | e74b7091cd97eba52227d8e93d003043a2f1a0cf (diff) | |
| download | samba-66731461a6882faf5ec6ba23944e4d4b357125b7.tar.gz samba-66731461a6882faf5ec6ba23944e4d4b357125b7.tar.bz2 samba-66731461a6882faf5ec6ba23944e4d4b357125b7.zip | |
tdb: add restore
Based on an idea by Simon McVittie, largely rewritten
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 9 | ||||
| -rw-r--r-- | source3/configure.in | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 882ad437f5..79e394a6a9 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -95,6 +95,7 @@ TALLOCTORT = @TALLOCTORT@ TDBBACKUP = @TDBBACKUP@ TDBTOOL = @TDBTOOL@ TDBDUMP = @TDBDUMP@ +TDBRESTORE = @TDBRESTORE@ TDBTORTURE = @TDBTORTURE@ INSTALLCMD=@INSTALL@ @@ -216,6 +217,7 @@ BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \ bin/smbta-util@EXEEXT@ BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ $(TDBBACKUP) \ bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ $(TDBDUMP) \ + $(TDBRESTORE) \ $(TDBTOOL) BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \ bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ bin/sharesec@EXEEXT@ \ @@ -1436,6 +1438,9 @@ TDBTOOL_OBJ = @tdbdir@/tools/tdbtool.o $(LIBREPLACE_OBJ) \ TDBDUMP_OBJ = @tdbdir@/tools/tdbdump.o $(LIBREPLACE_OBJ) \ $(SOCKET_WRAPPER_OBJ) +TDBRESTORE_OBJ = @tdbdir@/tools/tdbrestore.o $(LIBREPLACE_OBJ) \ + $(SOCKET_WRAPPER_OBJ) + TDBTORTURE_OBJ = @tdbdir@/tools/tdbtorture.o $(LIBREPLACE_OBJ) \ $(SOCKET_WRAPPER_OBJ) @@ -3040,6 +3045,10 @@ bin/tdbdump@EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) $(LIBTDB) @echo Linking $@ @$(CC) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) $(LIBTDB_LIBS) $(LIBREPLACE_LIBS) +bin/tdbrestore@EXEEXT@: $(BINARY_PREREQS) $(TDBRESTORE_OBJ) $(LIBTDB) + @echo Linking $@ + @$(CC) -o $@ $(LDFLAGS) $(TDBRESTORE_OBJ) $(DYNEXP) $(LIBTDB_LIBS) $(LIBREPLACE_LIBS) + bin/tdbtorture@EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) $(LIBTALLOC) $(LIBTDB) @echo Linking $@ @$(CC) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) \ diff --git a/source3/configure.in b/source3/configure.in index 7929be8004..9868dc007a 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -2152,6 +2152,8 @@ then AC_SUBST(TDBBACKUP) TDBDUMP="bin/tdbdump\$(EXEEXT)" AC_SUBST(TDBDUMP) + TDBRESTORE="bin/tdbrestore\$(EXEEXT)" + AC_SUBST(TDBRESTORE) TDBTOOL="bin/tdbtool\$(EXEEXT)" AC_SUBST(TDBTOOL) TDBTORTURE="bin/tdbtorture\$(EXEEXT)" |