fixed header again - tom

[moira.git] / server / mr_glue.c

diff --git a/server/mr_glue.c b/server/mr_glue.c
index 2ce97b99dd215260355b159cc805e74839b59d27..8fd1505d99f7201f21ce9a3f235ea3e4c4154c43 100644 (file)
--- a/server/mr_glue.c
+++ b/server/mr_glue.c
@@ -16,13 +16,13 @@ static char *rcsid_mr_glue_c = "$Header$";
 #endif lint
 
 #include <mit-copyright.h>
-#include "mr_server.h"
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/wait.h>
 #include <krb_et.h>
 #include <pwd.h>
 #include "query.h"
+#include "mr_server.h"
 
 static int already_connected = 0;
 
@@ -30,7 +30,7 @@ static int already_connected = 0;
 
 static client pseudo_client;
 extern int errno;
-extern char *malloc(), *whoami;
+extern char *whoami;
 extern time_t now;
 void reapchild();
 
@@ -130,8 +130,8 @@ int mr_query(name, argc, argv, callproc, callarg)
     hints.proc = callproc;
     hints.hint = callarg;
     next_incremental();
-    return mr_process_query(&pseudo_client, name, argc, argv,
-                            callback, &hints);
+    return mr_process_query(&pseudo_client, name, argc,
+                           mr_copy_args(argv, argc), callback, &hints);
 
 }
 
@@ -141,7 +141,8 @@ int mr_access(name, argc, argv)
     char **argv;               /* Args */
 {
     time(&now);
-    return mr_check_access(&pseudo_client, name, argc, argv);
+    return mr_check_access(&pseudo_client, name, argc,
+                          mr_copy_args(argv, argc));
 }
 
 int mr_query_internal(argc, argv, callproc, callarg)
@@ -156,8 +157,8 @@ int mr_query_internal(argc, argv, callproc, callarg)
     hints.proc = callproc;
     hints.hint = callarg;
     next_incremental();
-    return mr_process_query(&pseudo_client, argv[0], argc-1, argv+1,
-                            callback, &hints);
+    return mr_process_query(&pseudo_client, argv[0], argc-1,
+                           mr_copy_args(argv+1, argc-1), callback, &hints);
 }
 
 int mr_access_internal(argc, argv)
@@ -165,7 +166,8 @@ int mr_access_internal(argc, argv)
     char **argv;
 {
     time(&now);
-    return mr_check_access(&pseudo_client, argv[0], argc-1, argv+1);
+    return mr_check_access(&pseudo_client, argv[0], argc-1,
+                          mr_copy_args(argv+1, argc-1));
 }
 
 mr_shutdown(why)