projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client.c: supervisor task should use post_select instead of pre_select.
[paraslash.git]
/
command.c
diff --git
a/command.c
b/command.c
index aed9e6a0a34ab94ea6fce7b5708ac0b6e228efd2..4eab9f65348990e5f4f95568623f032376a43b4e 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.
*/
@@
-20,12
+20,12
@@
#include "afs.h"
#include "server.h"
#include "vss.h"
#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 "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"
#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[];
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)
{
@@
-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();
if (scd.sender_num < 0)
return ret;
msg = senders[scd.sender_num].help();
- send_buffer(fd, msg);
+
ret =
send_buffer(fd, msg);
free(msg);
free(msg);
- return
1
;
+ return
ret
;
}
for (i = 0; i < 10; i++) {
mmd_lock();
}
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"
return -E_COMMAND_SYNTAX;
return send_buffer(fd, VERSION_TEXT("server")
"built: " BUILD_DATE "\n"
-
SYSTEM
", " CC_VERSION "\n"
+
UNAME_RS
", " CC_VERSION "\n"
);
}
);
}
@@
-327,7
+335,7
@@
int com_stat(int fd, int argc, char * const * argv)
if (ret < 0)
goto out;
ret = 1;
if (ret < 0)
goto out;
ret = 1;
- if (num
== 1
)
+ if (num
> 0 && !--num
)
goto out;
sleep(50);
if (getppid() == 1)
goto out;
sleep(50);
if (getppid() == 1)
@@
-570,7
+578,7
@@
out:
*/
static int check_perms(unsigned int perms, struct server_command *cmd_ptr)
{
*/
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;
}
return (cmd_ptr->perms & perms) < cmd_ptr->perms ? -E_PERM : 0;
}
@@
-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);