Diane Delgado's changes for a fixed table-locking order

[moira.git] / server / mr_scall.c

diff --git a/server/mr_scall.c b/server/mr_scall.c
index eb936e11fcdadb7e9b1e243c484e51acadab549e..eecc2d0df7dbe205d5f305ec54d67a108ecd3358 100644 (file)
--- a/server/mr_scall.c
+++ b/server/mr_scall.c
@@ -24,7 +24,6 @@ static char *rcsid_sms_scall_c = "$Header$";
 extern char buf1[];
 extern int nclients;
 extern char *whoami;
-extern char *malloc();
 extern int errno;
 
 extern void clist_delete(), do_auth(), do_shutdown();
@@ -247,7 +246,6 @@ list_users(callbk, callarg)
        extern client **clients;
        extern char *inet_ntoa();
        char *cp;
-       char *index();
        char *ctime();
 
        for (i = 0; i < nclients; i++) {
@@ -278,6 +276,11 @@ do_retr(cl)
        cl->reply.mr_status = 0;
        row_count = 0;
 
+       if (cl->args->mr_argc < 1) {
+           cl->reply.mr_status = MR_ARGS;
+           com_err(whoami, MR_ARGS, "got nameless query");
+           return;
+       }
        queryname = cl->args->mr_argv[0];
        
        if (cl->args->mr_version_no == MR_VERSION_2)
@@ -290,7 +293,7 @@ do_retr(cl)
        else {
                cl->reply.mr_status = 
                        mr_process_query(cl,
-                                         cl->args->mr_argv[0],
+                                         queryname,
                                          cl->args->mr_argc-1,
                                          cl->args->mr_argv+1,
                                          retr_callback,
@@ -308,6 +311,11 @@ do_retr(cl)
 do_access(cl)
        client *cl;
 {
+       if (cl->args->mr_argc < 1) {
+           cl->reply.mr_status = MR_ARGS;
+           com_err(whoami, MR_ARGS, "got nameless access");
+           return;
+       }
        cl->reply.mr_argc = 0;
 
        cl->reply.mr_status =