/** \file command.c does client authentication and executes server commands */
#include <sys/time.h> /* gettimeofday */
-#include "crypt.h"
#include "server.cmdline.h"
#include "db.h"
#include "server.h"
#include "daemon.h"
#include "string.h"
#include "fd.h"
+#include "user_list.h"
static RC4_KEY rc4_recv_key;
static RC4_KEY rc4_send_key;
return ret;
}
-static int send_description(int fd, struct server_command *cmd, const char *handler, int num)
+static int send_description(int fd, struct server_command *cmd, const char *handler)
{
int ret, i;
- for (i = 1; cmd->name && (!num || i <= num); cmd++, i++) {
+ for (i = 1; cmd->name; cmd++, i++) {
char *perms = cmd_perms_itohuman(cmd->perms);
ret = send_va_buffer(fd, "%s\t%s\t%s\t%s\n", cmd->name,
handler,
if (argc < 2) {
/* no argument given, print list of commands */
- if ((ret = send_description(fd, cmd_struct, "server", 0)) < 0)
+ if ((ret = send_description(fd, cmd_struct, "server")) < 0)
return ret;
mmd_lock();
handler = para_strdup(selectors[mmd->selector_num].name);
cmd = selectors[mmd->selector_num].cmd_list;
mmd_unlock();
- ret = send_description(fd, cmd, handler, 0);
+ ret = send_description(fd, cmd, handler);
free(handler);
return ret;
}
int numbytes, ret, argc, use_rc4 = 0;
char buf[STRINGSIZE];
unsigned char crypt_buf[MAXLINE];
- struct _user u;
+ struct user u;
struct server_command *cmd = NULL;
long unsigned challenge_nr, chall_response;
char **argv = NULL;
}
PARA_DEBUG_LOG("received %s request for user %s\n",
use_rc4? "rc4" : "auth", u.name);
- if ((ret = _get_user(&u)) < 0)
+ if ((ret = lookup_user(&u)) < 0)
goto err_out;
if (!ret) { /* user not found */
PARA_WARNING_LOG("auth request for unknown user %s\n", u.name);