From 66731461a6882faf5ec6ba23944e4d4b357125b7 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 18 Sep 2010 10:56:10 +0400 Subject: tdb: add restore Based on an idea by Simon McVittie, largely rewritten --- lib/tdb/config.mk | 9 ++ lib/tdb/manpages/tdbrestore.8.xml | 66 +++++++++++ lib/tdb/tdb.mk | 7 +- lib/tdb/tools/tdbrestore.c | 226 ++++++++++++++++++++++++++++++++++++++ lib/tdb/wscript | 4 + 5 files changed, 310 insertions(+), 2 deletions(-) create mode 100644 lib/tdb/manpages/tdbrestore.8.xml create mode 100644 lib/tdb/tools/tdbrestore.c (limited to 'lib/tdb') diff --git a/lib/tdb/config.mk b/lib/tdb/config.mk index b2e322cebc..22caadaba5 100644 --- a/lib/tdb/config.mk +++ b/lib/tdb/config.mk @@ -34,6 +34,15 @@ PRIVATE_DEPENDENCIES = \ tdbtorture_OBJ_FILES = $(tdbsrcdir)/tools/tdbtorture.o +################################################ +# Start BINARY tdbrestore +[BINARY::tdbrestore] +INSTALLDIR = BINDIR +PRIVATE_DEPENDENCIES = \ + LIBTDB +# End BINARY tdbrestore +################################################ + ################################################ # Start BINARY tdbdump [BINARY::tdbdump] diff --git a/lib/tdb/manpages/tdbrestore.8.xml b/lib/tdb/manpages/tdbrestore.8.xml new file mode 100644 index 0000000000..64c0ba2dac --- /dev/null +++ b/lib/tdb/manpages/tdbrestore.8.xml @@ -0,0 +1,66 @@ + + + + + + tdbrestore + 8 + Samba + System Administration tools + 3.6 + + + + + tdbrestore + tool for creating a TDB file out of a tdbdump output + + + + + tdbrestore + tdbfilename + + + + + DESCRIPTION + + This tool is part of the samba + 1 suite. + + tdbrestore is a very simple utility that 'restores' the + contents of dump file into TDB (Trivial DataBase) file. The dump file is obtained from the tdbdump + command. + + + This tool wait on the standard input for the content of the dump and will write the tdb in the tdbfilename + parameter. + + This tool can be used for unpacking the content of tdb as backup mean. + + + + + + VERSION + + This man page is correct for version 3 of the Samba suite. + + + + AUTHOR + + + The original Samba software and related utilities were created by Andrew Tridgell. + Samba is now developed by the Samba Team as an Open Source project similar to the way + the Linux kernel is developed. + + This tool was initially written by Volker Lendecke based on an + idea by Simon McVittie. + + + The tdbrestore man page was written by Matthieu Patou. + + + diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk index 0dcd419da4..64d7996583 100644 --- a/lib/tdb/tdb.mk +++ b/lib/tdb/tdb.mk @@ -1,7 +1,7 @@ dirs:: @mkdir -p bin common tools -PROGS = bin/tdbtool$(EXEEXT) bin/tdbdump$(EXEEXT) bin/tdbbackup$(EXEEXT) +PROGS = bin/tdbtool$(EXEEXT) bin/tdbrestore$(EXEEXT) bin/tdbdump$(EXEEXT) bin/tdbbackup$(EXEEXT) PROGS_NOINSTALL = bin/tdbtest$(EXEEXT) bin/tdbtorture$(EXEEXT) ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL) @@ -23,6 +23,9 @@ bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(TDB_LIB) bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB) $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb $(TDB_DEPS) +bin/tdbrestore$(EXEEXT): tools/tdbrestore.o $(TDB_LIB) + $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbrestore tools/tdbrestore.o -L. -ltdb $(TDB_DEPS) + bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB) $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb $(TDB_DEPS) @@ -53,7 +56,7 @@ tdb.$(SHLIBEXT): libtdb.$(SHLIBEXT) pytdb.o install:: installdirs installbin installheaders installlibs \ $(PYTHON_INSTALL_TARGET) installdocs -doc:: manpages/tdbbackup.8 manpages/tdbdump.8 manpages/tdbtool.8 +doc:: manpages/tdbbackup.8 manpages/tdbrestore.8 manpages/tdbdump.8 manpages/tdbtool.8 .SUFFIXES: .8.xml .8 diff --git a/lib/tdb/tools/tdbrestore.c b/lib/tdb/tools/tdbrestore.c new file mode 100644 index 0000000000..485c440df1 --- /dev/null +++ b/lib/tdb/tools/tdbrestore.c @@ -0,0 +1,226 @@ +/* + tdbrestore -- construct a tdb from tdbdump output. + Copyright (C) Volker Lendecke 2010 + Copyright (C) Simon McVittie 2005 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include +#include "replace.h" +#include "system/locale.h" +#include "system/time.h" +#include "system/filesys.h" +#include "system/wait.h" +#include "tdb.h" + +#define debug_fprintf(file, fmt, ...) do {/*nothing*/} while (0) + +static int read_linehead(FILE *f) +{ + int i, c; + int num_bytes; + char prefix[128]; + + while (1) { + c = getc(f); + if (c == EOF) { + return -1; + } + if (c == '\(') { + break; + } + } + for (i=0; idptr = (unsigned char *)malloc(size); + if (d->dptr == NULL) { + return -1; + } + d->dsize = size; + + for (i=0; idptr[i] = (low|high); + } else { + d->dptr[i] = c; + } + } + return 0; +} + +static int swallow(FILE *f, const char *s, int *eof) +{ + char line[128]; + + if (fgets(line, sizeof(line), f) == NULL) { + if (eof != NULL) { + *eof = 1; + } + return -1; + } + if (strcmp(line, s) != 0) { + return -1; + } + return 0; +} + +static int read_rec(FILE *f, TDB_CONTEXT *tdb, int *eof) +{ + int length; + TDB_DATA key, data; + int ret = -1; + + key.dptr = NULL; + data.dptr = NULL; + + if (swallow(f, "{\n", eof) == -1) { + goto fail; + } + length = read_linehead(f); + if (length == -1) { + goto fail; + } + if (read_data(f, &key, length) == -1) { + goto fail; + } + if (swallow(f, "\"\n", NULL) == -1) { + goto fail; + } + length = read_linehead(f); + if (length == -1) { + goto fail; + } + if (read_data(f, &data, length) == -1) { + goto fail; + } + if ((swallow(f, "\"\n", NULL) == -1) + || (swallow(f, "}\n", NULL) == -1)) { + goto fail; + } + if (tdb_store(tdb, key, data, TDB_INSERT) == -1) { + fprintf(stderr, "TDB error: %s\n", tdb_errorstr(tdb)); + goto fail; + } + + ret = 0; +fail: + free(key.dptr); + free(data.dptr); + return ret; +} + +static int restore_tdb(const char *fname) +{ + TDB_CONTEXT *tdb; + + tdb = tdb_open(fname, 0, 0, O_RDWR|O_CREAT|O_EXCL, 0666); + if (!tdb) { + perror("tdb_open"); + fprintf(stderr, "Failed to open %s\n", fname); + return 1; + } + + while (1) { + int eof = 0; + if (read_rec(stdin, tdb, &eof) == -1) { + if (eof) { + break; + } + return 1; + } + } + if (tdb_close(tdb)) { + fprintf(stderr, "Error closing tdb\n"); + return 1; + } + fprintf(stderr, "EOF\n"); + return 0; +} + +int main(int argc, char *argv[]) +{ + char *fname; + + if (argc < 2) { + printf("Usage: %s dbname < tdbdump_output\n", argv[0]); + exit(1); + } + + fname = argv[1]; + + return restore_tdb(fname); +} diff --git a/lib/tdb/wscript b/lib/tdb/wscript index d661e41d3e..ff468f2797 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -75,6 +75,10 @@ def build(bld): 'tdb', install=False) + bld.SAMBA_BINARY('tdbrestore', + 'tools/tdbrestore.c', + 'tdb', manpages='manpages/tdbrestore.8') + bld.SAMBA_BINARY('tdbdump', 'tools/tdbdump.c', 'tdb', manpages='manpages/tdbdump.8') -- cgit