summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGregor Beck <gbeck@sernet.de>2011-10-21 15:32:27 +0200
committerMichael Adam <obnox@samba.org>2011-11-25 13:24:34 +0100
commit2d9b4015d6835fa9b83f9945cb94ca289c5ab5c7 (patch)
treed37adfe7ed1cc837afb1c007ff4431133afcc5fc /source3
parent9b42b8a346b80ff5df9125c2ba27315ef3bc57e5 (diff)
downloadsamba-2d9b4015d6835fa9b83f9945cb94ca289c5ab5c7.tar.gz
samba-2d9b4015d6835fa9b83f9945cb94ca289c5ab5c7.tar.bz2
samba-2d9b4015d6835fa9b83f9945cb94ca289c5ab5c7.zip
s3:net registry check: improve console output
Signed-off-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/utils/net_registry_check.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/source3/utils/net_registry_check.c b/source3/utils/net_registry_check.c
index 0936aea3b4..8e67edd7f1 100644
--- a/source3/utils/net_registry_check.c
+++ b/source3/utils/net_registry_check.c
@@ -874,7 +874,7 @@ static bool get_version(struct check_ctx *ctx) {
"version %d with %d\n", info_version, version);
} else {
printf("Warning: found registry format version %d but "
- "expected %d\n", info_version, version);
+ "expected %d, use --force to proceed.\n", info_version, version);
return false;
}
}
@@ -1191,15 +1191,13 @@ static bool check_ctx_fix_inplace(struct check_ctx *ctx) {
NTSTATUS status;
status = dbwrap_traverse(ctx->reg, fix_tree_action, ctx, NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("fix traverse failed: %s\n",
- nt_errstr(status)));
+ DEBUG(0, ("fix traverse failed: %s\n", nt_errstr(status)));
return false;
}
status = dbwrap_traverse(ctx->del, delete_invalid_action, ctx, NULL);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, ("delete traverse failed: %s\n",
- nt_errstr(status)));
+ DEBUG(0, ("delete traverse failed: %s\n", nt_errstr(status)));
return false;
}
return true;
@@ -1213,8 +1211,7 @@ static bool check_ctx_write_new_db(struct check_ctx *ctx) {
if (ctx->opt.wipe) {
int ret = dbwrap_wipe(ctx->odb);
if (ret != 0) {
- DEBUG(0, ("wiping %s failed\n",
- ctx->opt.output));
+ DEBUG(0, ("wiping %s failed\n", ctx->opt.output));
return false;
}
}