projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doxify acl.c.
[paraslash.git]
/
command.c
diff --git
a/command.c
b/command.c
index aed9e6a0a34ab94ea6fce7b5708ac0b6e228efd2..a7e330c75588e5d7c0a7052d26209add9b3d0ac7 100644
(file)
--- a/
command.c
+++ b/
command.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1997-200
7
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-200
8
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-40,8
+40,16
@@
static unsigned char rc4_buf[2 * RC4_KEY_LEN];
extern struct misc_meta_data *mmd;
extern struct sender senders[];
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)
{
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"
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(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);
/* 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:
goto out;
}
err_out:
- send_va_buffer(fd, "%s\n",
PARA_STRERROR
(-ret));
+ send_va_buffer(fd, "%s\n",
para_strerror
(-ret));
net_err:
net_err:
- PARA_NOTICE_LOG("%s\n",
PARA_STRERROR
(-ret));
+ PARA_NOTICE_LOG("%s\n",
para_strerror
(-ret));
ret = EXIT_FAILURE;
out:
free(command);
ret = EXIT_FAILURE;
out:
free(command);