svn commit: samba r11173 - in
branches/SAMBA_4_0/source/torture/nbt: .
metze at samba.org
metze at samba.org
Wed Oct 19 06:30:06 GMT 2005
Author: metze
Date: 2005-10-19 06:30:05 +0000 (Wed, 19 Oct 2005)
New Revision: 11173
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11173
Log:
print out the correct messages
metze
Modified:
branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/nbt/winsreplication.c
===================================================================
--- branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2005-10-19 06:13:53 UTC (rev 11172)
+++ branches/SAMBA_4_0/source/torture/nbt/winsreplication.c 2005-10-19 06:30:05 UTC (rev 11173)
@@ -2944,6 +2944,25 @@
}
if (!records[i].cleanup) {
+ const char *expected;
+ const char *ips;
+
+ if (records[i].r2.merge_expected) {
+ expected = "MERGE";
+ } else if (records[i].r2.apply_expected) {
+ expected = "REPLACE";
+ } else {
+ expected = "NOT REPLACE";
+ }
+
+ if (!records[i].r1.ips && !records[i].r2.ips) {
+ ips = "no";
+ } else if (records[i].r1.ips==records[i].r2.ips) {
+ ips = "same";
+ } else {
+ ips = "different";
+ }
+
printf("%s,%s%s vs. %s,%s%s with %s ip(s) => %s\n",
wrepl_name_type_string(records[i].r1.type),
wrepl_name_state_string(records[i].r1.state),
@@ -2951,8 +2970,7 @@
wrepl_name_type_string(records[i].r2.type),
wrepl_name_state_string(records[i].r2.state),
(records[i].r2.is_static?",static":""),
- (records[i].r1.ips==records[i].r2.ips?"same":"different"),
- (records[i].r2.apply_expected?"REPLACE":"NOT REPLACE"));
+ ips, expected);
}
/*
More information about the samba-cvs
mailing list