From: zacheiss <zacheiss>
Date: Thu, 18 Oct 2001 14:02:12 +0000 (+0000)
Subject: Give version 2 queries their own validate struct so they still work.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/9db6a21ed230dfd1071ef9af82715c7d02c8623f

Give version 2 queries their own validate struct so they still work.
---

diff --git a/server/queries2.c b/server/queries2.c
index 485e4ed0..4c7d7e97 100644
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -106,6 +106,19 @@ static char *gubl_fields[] = {
   "creator", 
 };
 
+static struct validate gubl2_validate =
+{
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  access_login,
+  0,
+  followup_fix_modby,
+};
+
 static struct validate gubl_validate =
 {
   0,
@@ -147,6 +160,19 @@ static char *guan_fields[] = {
   "modtime", "modby", "modwith", "created", "creator",
 };
 
+static struct validate guan2_validate =
+{
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  followup_fix_modby,
+};
+
 static struct validate guan_validate =
 {
   0,
@@ -201,6 +227,19 @@ static char *gubu_fields[] = {
   "creator",
 };
 
+static struct validate gubu2_validate =
+{
+  VOnum0,
+  1,
+  0,
+  0,
+  0,
+  0,
+  access_login,
+  0,
+  followup_fix_modby,
+};
+
 static struct validate gubu_validate =
 {
   VOnum0,
@@ -227,6 +266,19 @@ static char *gubn_fields[] = {
   "creator",
 };
 
+static struct validate gubn2_validate =
+{
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  followup_fix_modby,
+};
+
 static struct validate gubn_validate =
 {
   0,
@@ -3564,7 +3616,7 @@ struct query Queries[] = {
     "u.login LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id",
     1,
     "u.login",
-    &gubl_validate,
+    &gubl2_validate,
   },
 
   {
@@ -3598,7 +3650,7 @@ struct query Queries[] = {
     "u.unix_uid = %s AND u.users_id != 0 AND u.comments = str.string_id",
     1,
     "u.login",
-    &gubu_validate,
+    &gubu2_validate,
   },
 
   {
@@ -3632,7 +3684,7 @@ struct query Queries[] = {
     "u.first LIKE '%s' AND u.last LIKE '%s' AND u.users_id != 0 and u.comments = str.string_id",
     2,
     "u.login",
-    &guan_validate,
+    &guan2_validate,
   },
 
   {
@@ -3683,7 +3735,7 @@ struct query Queries[] = {
     "u.type = UPPER('%s') AND u.users_id != 0 AND u.comments = str.string_id",
     1,
     "u.login",
-    &VDfix_modby,
+    &guan_validate,
   },
 
   {
@@ -3717,7 +3769,7 @@ struct query Queries[] = {
     "u.clearid LIKE '%s' AND u.users_id != 0 AND u.comments = str.string_id",
     1,
     "u.login",
-    &VDfix_modby,
+    &guan_validate,
   },
 
   {
@@ -3734,7 +3786,7 @@ struct query Queries[] = {
     "u.login LIKE '%s' AND u.users_id != 0",
     1,
     "u.login",
-    &gubl_validate,
+    &gubl2_validate,
   },
 
   {
@@ -3768,7 +3820,7 @@ struct query Queries[] = {
     "u.unix_uid = %s AND u.users_id != 0",
     1,
     "u.login",
-    &gubu_validate,
+    &gubu2_validate,
   },
 
   {
@@ -3802,7 +3854,7 @@ struct query Queries[] = {
     "u.first LIKE '%s' AND u.last LIKE '%s' AND u.users_id != 0",
     2,
     "u.login",
-    &gubn_validate,
+    &gubn2_validate,
   },
 
   {
@@ -3853,7 +3905,7 @@ struct query Queries[] = {
     "u.type = UPPER('%s') AND u.users_id != 0",
     1,
     "u.login",
-    &VDfix_modby,
+    &guan_validate,
   },
 
   {
@@ -3887,7 +3939,7 @@ struct query Queries[] = {
     "u.clearid LIKE '%s' AND u.users_id != 0",
     1,
     "u.login",
-    &VDfix_modby,
+    &guan_validate,
   },
 
   {