svn commit: samba r7741 - in
branches/SAMBA_4_0/source/lib/ldb/tools: .
tridge at samba.org
tridge at samba.org
Sun Jun 19 01:32:48 GMT 2005
Author: tridge
Date: 2005-06-19 01:32:47 +0000 (Sun, 19 Jun 2005)
New Revision: 7741
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7741
Log:
fixed the verbose option in ldbedit
Modified:
branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c 2005-06-19 01:31:27 UTC (rev 7740)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c 2005-06-19 01:32:47 UTC (rev 7741)
@@ -41,7 +41,7 @@
#include "system/filesys.h"
#endif
-static int verbose;
+static struct ldb_cmdline *options;
/*
debug routine
@@ -77,16 +77,16 @@
return 0;
}
+ if (options->verbose > 0) {
+ ldif_write_msg(ldb, stdout, LDB_CHANGETYPE_MODIFY, mod);
+ }
+
if (ldb_modify(ldb, mod) != 0) {
fprintf(stderr, "failed to modify %s - %s\n",
msg1->dn, ldb_errstring(ldb));
return -1;
}
- if (verbose > 0) {
- ldif_write_msg(ldb, stdout, LDB_CHANGETYPE_MODIFY, mod);
- }
-
return mod->num_elements;
}
@@ -121,14 +121,14 @@
for (i=0;i<count2;i++) {
msg = msg_find(msgs1, count1, msgs2[i]->dn);
if (!msg) {
+ if (options->verbose > 0) {
+ ldif_write_msg(ldb, stdout, LDB_CHANGETYPE_ADD, msgs2[i]);
+ }
if (ldb_add(ldb, msgs2[i]) != 0) {
fprintf(stderr, "failed to add %s - %s\n",
msgs2[i]->dn, ldb_errstring(ldb));
return -1;
}
- if (verbose > 0) {
- ldif_write_msg(ldb, stdout, LDB_CHANGETYPE_ADD, msgs2[i]);
- }
adds++;
} else {
if (modify_record(ldb, msg, msgs2[i]) > 0) {
@@ -141,14 +141,14 @@
for (i=0;i<count1;i++) {
msg = msg_find(msgs2, count2, msgs1[i]->dn);
if (!msg) {
+ if (options->verbose > 0) {
+ ldif_write_msg(ldb, stdout, LDB_CHANGETYPE_DELETE, msgs1[i]);
+ }
if (ldb_delete(ldb, msgs1[i]->dn) != 0) {
fprintf(stderr, "failed to delete %s - %s\n",
msgs1[i]->dn, ldb_errstring(ldb));
return -1;
}
- if (verbose > 0) {
- ldif_write_msg(ldb, stdout, LDB_CHANGETYPE_DELETE, msgs1[i]);
- }
deletes++;
}
}
@@ -280,7 +280,6 @@
int ret;
const char *expression = NULL;
const char * const * attrs = NULL;
- struct ldb_cmdline *options;
ldb = ldb_init(NULL);
More information about the samba-cvs
mailing list