X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=321883ca58ad2e339c5a0a981c42c70e4de3ea2f;hp=5da5833ba3fb953d7ccdfe521ddc5f14632fb4f8;hb=50b3c6723e256f77159b77deae77378d8d65d71e;hpb=c2708c767b300a33c8636681ed4550d4f3be0ce0

diff --git a/command.c b/command.c
index 5da5833b..321883ca 100644
--- a/command.c
+++ b/command.c
@@ -699,11 +699,11 @@ out:
 	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,
@@ -749,13 +749,13 @@ static int com_help(int fd, int argc, char **argv)
 
 	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;
 	}
@@ -1062,7 +1062,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	}
 	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);