X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=458faf884d4b441313b02ced6e137aaca425e933;hp=68cc5ab55f7c8da0362bb1ae9aa018014a97ede9;hb=e6940831fbcf21dd0e6243ca89ea0c7f8b195d9e;hpb=6de8cd316c938093c3d9e5e07d959daef4768575

diff --git a/command.c b/command.c
index 68cc5ab5..458faf88 100644
--- a/command.c
+++ b/command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -20,12 +20,12 @@
 #include "afs.h"
 #include "server.h"
 #include "vss.h"
+#include "list.h"
 #include "send.h"
 #include "rc4.h"
 #include "net.h"
 #include "daemon.h"
 #include "fd.h"
-#include "list.h"
 #include "user_list.h"
 #include "server_command_list.h"
 #include "afs_command_list.h"
@@ -40,8 +40,16 @@ static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 extern struct misc_meta_data *mmd;
 extern struct sender senders[];
 
-static void dummy(__a_unused int s)
-{}
+static void dummy(int s)
+{
+	/*
+	 * At least on Solaris, SIGUSR1 is one-shot, i.e. the signal action is
+	 * restored to the default state once the signal handler has been
+	 * called.
+	 */
+	if (s == SIGUSR1)
+		signal(SIGUSR1, dummy);
+}
 
 static void mmd_dup(struct misc_meta_data *new_mmd)
 {
@@ -234,9 +242,9 @@ int com_sender(int fd, int argc, char * const * argv)
 		if (scd.sender_num < 0)
 			return ret;
 		msg = senders[scd.sender_num].help();
-		send_buffer(fd, msg);
+		ret = send_buffer(fd, msg);
 		free(msg);
-		return 1;
+		return ret;
 	}
 	for (i = 0; i < 10; i++) {
 		mmd_lock();
@@ -301,7 +309,7 @@ int com_version(int fd, int argc, __a_unused char * const * argv)
 		return -E_COMMAND_SYNTAX;
 	return send_buffer(fd, VERSION_TEXT("server")
 		"built: " BUILD_DATE "\n"
-		SYSTEM ", " CC_VERSION "\n"
+		UNAME_RS ", " CC_VERSION "\n"
 	);
 }
 
@@ -570,7 +578,7 @@ out:
  */
 static int check_perms(unsigned int perms, struct server_command *cmd_ptr)
 {
-	PARA_DEBUG_LOG("%s", "checking permissions\n");
+	PARA_DEBUG_LOG("checking permissions\n");
 	return (cmd_ptr->perms & perms) < cmd_ptr->perms ? -E_PERM : 0;
 }
 
@@ -796,9 +804,9 @@ int handle_connect(int fd, const char *peername)
 		goto out;
 	}
 err_out:
-	send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+	send_va_buffer(fd, "%s\n", para_strerror(-ret));
 net_err:
-	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret));
+	PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 	ret = EXIT_FAILURE;
 out:
 	free(command);