X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=fee817b005f69c7325760238725700d04046a25e;hp=aed9e6a0a34ab94ea6fce7b5708ac0b6e228efd2;hb=c73d23911d78ed10179c12ef8f79a3fcf3bbcdaf;hpb=55b45ec9ba3ef54395b3d22b3d00404f35e636a3

diff --git a/command.c b/command.c
index aed9e6a0..fee817b0 100644
--- a/command.c
+++ b/command.c
@@ -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)
 {
@@ -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"
 	);
 }
 
@@ -696,7 +704,6 @@ int handle_connect(int fd, const char *peername)
 	signal(SIGINT, SIG_DFL);
 	signal(SIGTERM, SIG_DFL);
 	signal(SIGHUP, SIG_DFL);
-	signal(SIGUSR1, SIG_IGN);
 
 	/* we need a blocking fd here as recv() might return EAGAIN otherwise. */
 	ret = mark_fd_blocking(fd);
@@ -797,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);