From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 23 Apr 2011 17:28:57 +0000 (+0200)
Subject: Don't ignore non-virtual NSC_EXTRA columns in ef_verify.c
X-Git-Tag: v4.3.28~96
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=e1caa1173317a408685a2012d3fad9d73f759a9f

Don't ignore non-virtual NSC_EXTRA columns in ef_verify.c

These are commonly timestamps (no verification implemented), or
aliases for a non-extra column (which gets verified).  Commit 49780e2c
(v4.3.12) added the exception: EF_SECTOR's uid.  Proof by example that
ignoring these columns is wrong.  Fix: ignore only virtual columns.
---

diff --git a/src/lib/common/ef_verify.c b/src/lib/common/ef_verify.c
index 2b79f4d25..a938aca3f 100644
--- a/src/lib/common/ef_verify.c
+++ b/src/lib/common/ef_verify.c
@@ -114,8 +114,8 @@ verify_row(int type, int row)
     }
 
     for (i = 0; ca[i].ca_name; ++i) {
-	if (ca[i].ca_flags & NSC_EXTRA)
-	    continue;
+	if (ca[i].ca_get)
+	    continue;		/* virtual */
 	n = ca[i].ca_type != NSC_STRINGY ? ca[i].ca_len : 0;
 	j = 0;
 	do {