Changes from dtanner for password processing for w2k KDC, and some code

[moira.git] / server / qvalidate.pc

diff --git a/server/qvalidate.pc b/server/qvalidate.pc
index 41a51ec77e3ed846f8a23f80826ffcdfbad622e9..f9500511693166aade4db91759af0674eedefab4 100644 (file)
--- a/server/qvalidate.pc
+++ b/server/qvalidate.pc
@@ -206,6 +206,8 @@ int validate_id(struct query *q, char *argv[], struct valobj *vo)
   else if (status == MR_NO_MATCH && tbl == STRINGS_TABLE &&
           (q->type == APPEND || q->type == UPDATE))
     {
+      if (strlen(name) >= STRINGS_STRING_SIZE)
+       return MR_ARG_TOO_LONG;
       id = add_string(name);
       cache_entry(name, STRINGS_TABLE, id);
       *(int *)argv[vo->index] = id;
@@ -373,7 +375,7 @@ int validate_typedata(struct query *q, char *argv[], struct valobj *vo)
           * that we're trying to resolve, we should get the value of
           * numvalues.[idfield] for the id.
           */
-         if (vo->idfield && !strcmp(argv[0], argv[vo->index]))
+         if (vo->idfield && (*(int *)argv[0] == *(int *)argv[vo->index]))
            {
              set_next_object_id(q->validate->object_id, q->rtable, 0);
              name = vo->idfield;
@@ -412,13 +414,15 @@ int validate_typedata(struct query *q, char *argv[], struct valobj *vo)
        {
          if (q->type != APPEND && q->type != UPDATE)
            return MR_STRING;
+         if (strlen(name) >= STRINGS_STRING_SIZE)
+           return MR_ARG_TOO_LONG;
          id = add_string(name);
          cache_entry(name, STRINGS_TABLE, id);
        }
       else if (status)
        return status;
     }
-  else if (!strcmp(data_type, "none"))
+  else if (!strcmp(data_type, "none") || !strcmp(data_type, "all"))
     id = 0;
   else
     return MR_TYPE;
@@ -460,11 +464,12 @@ int validate_num(char *argv[], struct valobj *vo)
       strcpy(p, "-1");
       return MR_EXISTS;
     }
-  if (!*p)
-    return MR_INTEGER;
 
   if (*p == '-')
     p++;
+  if (!*p)
+    return MR_INTEGER;
+
   for (; *p; p++)
     {
       if (*p < '0' || *p > '9')