remove some unused code (setup_akum), uppercasify ahal/dhal

diff --git a/server/mr_server.h b/server/mr_server.h
index e5aec58eaa31cc30db6a8b902bdd85988cd3dfcb..9b9e9a39a79a8de0726b7280f6758a667351d3f3 100644 (file)
--- a/server/mr_server.h
+++ b/server/mr_server.h
@@ -221,7 +221,6 @@ int setup_dfil(struct query *q, char *argv[], client *cl);
 int setup_aftg(struct query *q, char *argv[], client *cl);
 int setup_dnfp(struct query *q, char *argv[], client *cl);
 int setup_dqot(struct query *q, char *argv[], client *cl);
-int setup_akum(struct query *q, char *argv[], client *cl);
 int setup_dsnt(struct query *q, char *argv[], client *cl);
 int setup_ahst(struct query *q, char *argv[], client *cl);
 int setup_ahal(struct query *q, char *argv[], client *cl);
@@ -232,8 +231,6 @@ int add_member_to_list(struct query *q, char *argv[], client *cl);
 int delete_member_from_list(struct query *q, char *argv[], client *cl);
 int register_user(struct query *q, char *argv[], client *cl);
 
-int get_list_info(struct query *q, char **argv, client *cl,
-                 int (*action)(int, char *[], void *), void *actarg);
 int get_ace_use(struct query *q, char **argv, client *cl,
                int (*action)(int, char *[], void *), void *actarg);
 int qualified_get_lists(struct query *q, char **argv, client *cl,

diff --git a/server/qsetup.pc b/server/qsetup.pc
index c76544da37c9f766098e9955df306e66a8f44925..b68700d831fadb6c9507889cfdafc75c667bb8a1 100644 (file)
--- a/server/qsetup.pc
+++ b/server/qsetup.pc
@@ -747,32 +747,6 @@ int setup_dqot(struct query *q, char **argv, client *cl)
 }
 
 
-/* setup add_kerberos_user_mapping: add the string to the string
- * table if necessary.
- */
-
-int setup_akum(struct query *q, char **argv, client *cl)
-{
-  EXEC SQL BEGIN DECLARE SECTION;
-  int id;
-  char *name;
-  EXEC SQL END DECLARE SECTION;
-
-  name = argv[1];
-  if (name_to_id(name, STRINGS_TABLE, &id) != MR_SUCCESS)
-    {
-      if (q->type != APPEND)
-       return MR_STRING;
-      id = add_string(name);
-      cache_entry(name, STRINGS_TABLE, id);
-    }
-  if (dbms_errno)
-    return mr_errcode;
-  *(int *)argv[1] = id;
-  return MR_SUCCESS;
-}
-
-
 /* prefetch_value():
  * This routine fetches an appropriate value from the numvalues table.
  * It is a little hack to get around the fact that SQL doesn't let you

diff --git a/server/queries2.c b/server/queries2.c
index fb4025c65e33db923c4ea3ffd623ec1aaa7870d2..93deff0ab6f326ceaae106c4ce3220eccc49eebf 100644 (file)
--- a/server/queries2.c
+++ b/server/queries2.c
@@ -414,7 +414,7 @@ static struct validate akum_validate =
   2,
   "users_id",
   access_user,
-  setup_akum,
+  0,
   0,
 };
 
@@ -693,7 +693,7 @@ static struct validate ahal_validate = {
   ahal_valobj,
   2,
   "name",
-  "name = '%s'",
+  "name = UPPER('%s')",
   1,
   "mach_id",
   access_ahal,
@@ -709,7 +709,7 @@ static struct validate dhal_validate = {
   dhal_valobj,
   1,
   "name",
-  "name = '%s' AND mach_id = %d",
+  "name = UPPER('%s') AND mach_id = %d",
   2,
   "mach_id",
   access_ahal,