The branch, master has been updated via bdf755c s3-build: add bin/dbwrap_tool to the BIN_PROGS2 dependencies via 66eefde s3-registry: fix upgrade code via bdc973b s3-utils: net - Fix one error/usage message via 9557750 s3-printing: fix typo from 881feda s3:torture: let SMB2-BASICS work against w2k8r2 and win8pre0
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit bdf755ce08995ff3e3b593763df384bf468c139d Author: Björn Baumbach <b...@sernet.de> Date: Wed Nov 2 15:27:30 2011 +0100 s3-build: add bin/dbwrap_tool to the BIN_PROGS2 dependencies Signed-off-by: Michael Adam <ob...@samba.org> Autobuild-User: Michael Adam <ob...@samba.org> Autobuild-Date: Thu Nov 3 11:52:53 CET 2011 on sn-devel-104 commit 66eefde53b68b0665557095158411c89d44a1934 Author: Björn Baumbach <b...@sernet.de> Date: Wed Nov 2 13:40:36 2011 +0100 s3-registry: fix upgrade code Assume REGDB_VERSION_V1 if no version key found in registry.tdb Signed-off-by: Michael Adam <ob...@samba.org> commit bdc973b5db871ec9a9db3a16eea72f62e9ff6e64 Author: Björn Baumbach <b...@sernet.de> Date: Wed Nov 2 13:38:18 2011 +0100 s3-utils: net - Fix one error/usage message Signed-off-by: Michael Adam <ob...@samba.org> commit 955775023bc5c3968492c3571e5f3070f98b2240 Author: Björn Baumbach <b...@sernet.de> Date: Fri Oct 28 14:29:56 2011 +0200 s3-printing: fix typo Signed-off-by: Michael Adam <ob...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/Makefile.in | 3 +-- source3/printing/nt_printing.c | 2 +- source3/registry/reg_backend_db.c | 22 ++++++++++++++++++---- source3/utils/net_registry_check.c | 2 +- 4 files changed, 21 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index a372573..1453434 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -212,8 +212,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) + $(TDBRESTORE) $(TDBTOOL) bin/dbwrap_tool@EXEEXT@ BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \ bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ bin/sharesec@EXEEXT@ \ bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@ diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index fc00f6a..a8fde25 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -1852,7 +1852,7 @@ void nt_printer_remove(TALLOC_CTX *mem_ctx, result = winreg_delete_printer_key_internal(mem_ctx, session_info, msg_ctx, printer, ""); if (!W_ERROR_IS_OK(result)) { - DEBUG(0, ("nt_printer_remove: failed to remove rpinter %s", + DEBUG(0, ("nt_printer_remove: failed to remove printer %s", printer)); } } diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index fad6c08..7fa6249 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -667,10 +667,24 @@ WERROR regdb_init(void) if (!NT_STATUS_IS_OK(status)) { DEBUG(10, ("regdb_init: registry version uninitialized " "(got %d), initializing to version %d\n", - vers_id, REGDB_CODE_VERSION)); - - werr = regdb_store_regdb_version(regdb, REGDB_CODE_VERSION); - return werr; + vers_id, REGDB_VERSION_V1)); + + /* + * There was a regdb format version prior to version 1 + * which did not store a INFO/version key. The format + * of this version was identical to version 1 except for + * the lack of the sorted subkey cache records. + * Since these are disposable, we can safely assume version + * 1 if no INFO/version key is found and run the db through + * the whole chain of upgrade. If the database was not + * initialized, this does not harm. If it was the unversioned + * version ("0"), then it do the right thing with the records. + */ + werr = regdb_store_regdb_version(regdb, REGDB_VERSION_V1); + if (!W_ERROR_IS_OK(werr)) { + return werr; + } + vers_id = REGDB_VERSION_V1; } if (vers_id > REGDB_CODE_VERSION || vers_id == 0) { diff --git a/source3/utils/net_registry_check.c b/source3/utils/net_registry_check.c index 870a0ed..22d18a6 100644 --- a/source3/utils/net_registry_check.c +++ b/source3/utils/net_registry_check.c @@ -862,7 +862,7 @@ static bool get_version(struct check_ctx *ctx) { if (!version) { printf("Couldn't determine registry format version, " - "specify with --version\n"); + "specify with --reg-version\n"); return false; } -- Samba Shared Repository