X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=e3f12931fd9d17fe5489636919a14379d60d0969;hb=d440a71683940a58747de6dc32643db452d9cf54;hp=2171457168c294861ece3c644efe34709f74f5cf;hpb=b92a1de60b4988ba966b16948e9a331a0ac35e60;p=paraslash.git

diff --git a/command.c b/command.c
index 21714571..e3f12931 100644
--- a/command.c
+++ b/command.c
@@ -6,10 +6,7 @@
 #include <sys/socket.h>
 #include <regex.h>
 #include <signal.h>
-#include <sys/types.h>
-#include <osl.h>
 #include <arpa/inet.h>
-#include <sys/un.h>
 #include <netdb.h>
 #include <lopsub.h>
 
@@ -22,7 +19,6 @@
 #include "command.h"
 #include "string.h"
 #include "afh.h"
-#include "afs.h"
 #include "net.h"
 #include "server.h"
 #include "list.h"
@@ -554,7 +550,7 @@ out:
 }
 EXPORT_SERVER_CMD_HANDLER(stat);
 
-const char *aux_info_cb(unsigned cmd_num, bool verbose)
+static const char *aux_info_cb(unsigned cmd_num, bool verbose)
 {
 	static char result[80];
 	unsigned perms = server_command_perms[cmd_num];
@@ -745,14 +741,6 @@ out:
 }
 EXPORT_SERVER_CMD_HANDLER(jmp);
 
-/* deprecated, does nothing */
-static int com_tasks(__a_unused struct command_context *cc,
-		__a_unused struct lls_parse_result *lpr)
-{
-	return 1;
-}
-EXPORT_SERVER_CMD_HANDLER(tasks);
-
 static void reset_signals(void)
 {
 	para_sigaction(SIGCHLD, SIG_IGN);
@@ -840,7 +828,7 @@ static int run_command(struct command_context *cc, struct iovec *iov)
 	}
 	perms = server_command_perms[ret];
 	if ((perms & cc->u->perms) != perms)
-		return -E_PERM;
+		return -ERRNO_TO_PARA_ERROR(EPERM);
 	lcmd = lls_cmd(ret, server_cmd_suite);
 	end = iov->iov_base + iov->iov_len;
 	for (i = 0; p < end; i++)