*** empty log message ***

[moira.git] / server / queries2.c

diff --git a/server/queries2.c b/server/queries2.c
index 315578f6290abb40f17d3f4e8da96812d9866cff..3c9baadd7a462b0e04e3593c7444fa27ed0f418b 100644 (file)
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -25,6 +25,7 @@ int access_service();
 int access_filesys();
 int access_host();
 int access_ahal();
+int access_snt();
 
 /* Query Setup Routines */
 int prefetch_value();
@@ -895,7 +896,7 @@ static struct validate ghal_validate = {
   0,
   0,
   0,
-  0,
+  access_ahal,
   0,
   0,
 };
@@ -938,7 +939,7 @@ static struct validate dhal_validate = {
 
 static char *gsnt_fields[] = {
     NAME,
-    NAME, DESC, ADDRESS, "mask", "low", "high", ACE_TYPE, ACE_NAME,
+    NAME, DESC, ADDRESS, "mask", "low", "high", "prefix", ACE_TYPE, ACE_NAME,
     MOD1, MOD2, MOD3
 };
 
@@ -954,20 +955,20 @@ static struct validate gsnt_validate = {
   0,
   0,
   0,
-  0,
+  access_snt,
   0,
   followup_gsnt,
 };
 
 static char *asnt_fields[] = {
-    NAME, DESC, ADDRESS, "mask", "low", "high", ACE_TYPE, ACE_NAME,
+    NAME, DESC, ADDRESS, "mask", "low", "high", "prefix", ACE_TYPE, ACE_NAME,
 };
 
 static struct valobj asnt_valobj[] = {
   {V_LOCK, 0, SUBNET, 0, SNET_ID, MR_DEADLOCK},
   {V_CHAR, 0},
-  {V_TYPE, 6, ACE_TYPE, 0, 0, MR_ACE},
-  {V_TYPEDATA, 7, 0, 0, 0, MR_ACE},
+  {V_TYPE, 7, ACE_TYPE, 0, 0, MR_ACE},
+  {V_TYPEDATA, 8, 0, 0, 0, MR_ACE},
 };
 
 static struct validate asnt_validate = 
@@ -975,8 +976,8 @@ static struct validate asnt_validate =
     asnt_valobj,
     4,
     NAME,
-    "name = uppercase(LEFT('%s',SIZE(name))) OR description = '__'+'%s' OR saddr = '%s'",
-    3,
+    "name = uppercase(LEFT('%s',SIZE(name)))",
+    1,
     SNET_ID,
     0,
     prefetch_value,
@@ -985,15 +986,15 @@ static struct validate asnt_validate =
 
 static char *usnt_fields[] = {
     NAME,
-    "newname", DESC, ADDRESS, "mask", "low", "high", ACE_TYPE, ACE_NAME,
+    "newname", DESC, ADDRESS, "mask", "low", "high", "prefix", ACE_TYPE, ACE_NAME,
 };
 
 static struct valobj usnt_valobj[] = {
   {V_LOCK, 0, SUBNET, 0, SNET_ID, MR_DEADLOCK},
   {V_ID, 0, SUBNET, NAME, SNET_ID, MR_NO_MATCH},
   {V_RENAME, 1, SUBNET, NAME, SNET_ID, MR_NOT_UNIQUE},
-  {V_TYPE, 7, ACE_TYPE, 0, 0, MR_ACE},
-  {V_TYPEDATA, 8, 0, 0, 0, MR_ACE},
+  {V_TYPE, 8, ACE_TYPE, 0, 0, MR_ACE},
+  {V_TYPEDATA, 9, 0, 0, 0, MR_ACE},
 };
 
 static struct validate usnt_validate = 
@@ -1001,8 +1002,8 @@ static struct validate usnt_validate =
     usnt_valobj,
     5,
     NAME,
-    "snet_id = %d OR description = '__'+'%s' OR description = '__'+'%s' OR saddr = '%s'",
-    4,
+    "snet_id = %d",
+    1,
     SNET_ID,
     0,
     0,
@@ -3095,9 +3096,9 @@ struct query Queries2[] = {
     RETRIEVE,
     "s",
     SUBNET,
-    "CHAR(s.name), CHAR(s.description), CHAR(s.saddr), CHAR(s.mask), CHAR(s.low), CHAR(s.high), s.owner_type, CHAR(s.owner_id), CHAR(s.modtime), CHAR(s.modby), s.modwith FROM subnet s",
+    "CHAR(s.name), CHAR(s.description), CHAR(s.saddr), CHAR(s.mask), CHAR(s.low), CHAR(s.high), s.prefix, s.owner_type, CHAR(s.owner_id), CHAR(s.modtime), CHAR(s.modby), s.modwith FROM subnet s",
     gsnt_fields,
-    11,
+    12,
     "s.name LIKE '%s' ESCAPE '*' and s.snet_id != 0",
     1,
     &gsnt_validate,
@@ -3110,9 +3111,9 @@ struct query Queries2[] = {
     APPEND,
     "s",
     SUBNET,
-    "INTO subnet (name, description, saddr, mask, low, high, owner_type, owner_id, snet_id) VALUES (uppercase('%s'), '%s', %s, %s, %s, %s, '%s', %d, %s)",
+    "INTO subnet (name, description, saddr, mask, low, high, prefix, owner_type, owner_id, snet_id) VALUES (uppercase('%s'), '%s', %s, %s, %s, %s, '%s', '%s', %d, %s)",
     asnt_fields,
-    8,
+    9,
     0,
     0,
     &asnt_validate,
@@ -3125,9 +3126,9 @@ struct query Queries2[] = {
     UPDATE,
     "s",
     SUBNET,
-    "subnet SET name=uppercase('%s'), description='%s', saddr=%s, mask=%s, low=%s, high=%s, owner_type='%s', owner_id=%d",
+    "subnet SET name=uppercase('%s'), description='%s', saddr=%s, mask=%s, low=%s, high=%s, prefix='%s', owner_type='%s', owner_id=%d",
     usnt_fields,
-    8,
+    9,
     "snet_id = %d",
     1,
     &usnt_validate,