X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=66c658acb3f5c33a98eb2cf4bdf0249f26d9d1bc;hb=b9f9601828dd1a103ec9315bd430d39b458d2b80;hp=4b9782f8e8505b3f7088b0a705a64e67cde411ce;hpb=a27ec6094608c05a9f87e445902c29d15ca11547;p=paraslash.git

diff --git a/command.c b/command.c
index 4b9782f8..66c658ac 100644
--- a/command.c
+++ b/command.c
@@ -19,7 +19,6 @@
 /** \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"
@@ -32,6 +31,7 @@
 #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;
@@ -699,11 +699,12 @@ out:
 	return ret;
 }
 
-static int send_description(int fd, struct server_command *cmd, const char *handler, int num)
+static int send_list_of_commands(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 +750,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_list_of_commands(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_list_of_commands(fd, cmd, handler);
 		free(handler);
 		return ret;
 	}
@@ -992,70 +993,6 @@ long int para_rand(long unsigned max)
 	return (long int) ((max + 0.0) * (random() / (RAND_MAX + 1.0)));
 }
 
-/* Open user_list file, returns pointer to opened file on success,
- * NULL on errors
- */
-static FILE *open_user_list(char *file)
-{
-	PARA_DEBUG_LOG("opening user list %s\n", file);
-	return fopen(file, "r");
-}
-
-/*
- * lookup user in user_list file. Fills in a user struct containing
- * filename of the user's public key as well as the permissions of that user.
- * Returns 1 on success, 0 if user does not exist and < 0 on errors.
- */
-static int get_user(struct user *user) {
-	FILE *file_ptr;
-	char *char_ptr;
-	char line[MAXLINE];
-	/* keyword, user, key, perms */
-	char w[MAXLINE], n[MAXLINE], k[MAXLINE], p[MAXLINE], tmp[4][MAXLINE];
-	int num, ret;
-
-	file_ptr = open_user_list(user_list);
-	if (!file_ptr)
-		return -E_USERLIST;
-	for (;;) {
-		ret = para_fgets(line, MAXLINE, file_ptr);
-		if (ret < 0)
-			PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-		if (ret <= 0)
-			break;
-		if (sscanf(line,"%200s %200s %200s %200s", w, n, k, p) < 3)
-			continue;
-		if (strcmp(w, "user") || strcmp(user->name, n))
-			continue;
-		PARA_DEBUG_LOG("found entry for %s\n", n);
-		strcpy(user->name, n);
-		strcpy(user->pubkey_file, k);
-		user->perms = 0;
-		char_ptr = p;
-		num = sscanf(char_ptr, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]",
-			tmp[0], tmp[1], tmp[2], tmp[3]);
-		PARA_DEBUG_LOG("found %i perm entries\n", num);
-		user->perms = 0;
-		while (num > 0) {
-			num--;
-			if (!strcmp(tmp[num], "AFS_READ"))
-				user->perms = user->perms | AFS_READ;
-			else if (!strcmp(tmp[num], "AFS_WRITE"))
-				user->perms = user->perms | AFS_WRITE;
-			else if (!strcmp(tmp[num], "DB_READ"))
-				user->perms = user->perms | DB_READ;
-			else if (!strcmp(tmp[num], "DB_WRITE"))
-				user->perms = user->perms | DB_WRITE;
-			else /* unknown permission */
-				PARA_WARNING_LOG("unknown permission: %s\n",
-					tmp[num]);
-		}
-		break;
-	}
-	fclose(file_ptr);
-	return ret;
-}
-
 static void init_rc4_keys(void)
 {
 	int i;
@@ -1086,7 +1023,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	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;
@@ -1126,7 +1063,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);