X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=77d3ef7f0ddd223b0408285f1df18e61b45ddd6f;hp=6f6fad7c4028e0f10833cc30033402e126731d66;hb=47fedd501291bf9b0ca2204e2af3d1617b6f18a8;hpb=48107fb4b9ad286edc38bc336a8703eea7048f88

diff --git a/command.c b/command.c
index 6f6fad7c..77d3ef7f 100644
--- a/command.c
+++ b/command.c
@@ -20,7 +20,7 @@
 
 #include <sys/time.h> /* gettimeofday */
 #include "server.cmdline.h"
-#include "db.h"
+#include "afs.h"
 #include "server.h"
 #include "vss.h"
 #include "send.h"
@@ -78,8 +78,8 @@ static char *cmd_perms_itohuman(unsigned int perms)
 {
 	char *msg = para_malloc(5 * sizeof(char));
 
-	msg[0] = perms & DB_READ? 'a' : '-';
-	msg[1] = perms & DB_WRITE? 'A' : '-';
+	msg[0] = perms & AFS_READ? 'a' : '-';
+	msg[1] = perms & AFS_WRITE? 'A' : '-';
 	msg[2] = perms & VSS_READ? 'v' : '-';
 	msg[3] = perms & VSS_WRITE? 'V' : '-';
 	msg[4] = '\0';
@@ -793,7 +793,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	int numbytes, ret, argc, use_rc4 = 0;
 	char buf[4096];
 	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;
@@ -825,16 +825,18 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 		goto err_out;
 
 	if (numbytes < 9 || strncmp(buf, "auth rc4 ", 9))
-		u.name = para_strdup(buf + 5); /* client version < 0.2.6 */
+		p = buf + 5; /* client version < 0.2.6 */
 	else {
-		u.name = para_strdup(buf + 9); /* client version >= 0.2.6 */
+		p = buf + 9; /* client version >= 0.2.6 */
 		use_rc4 = 1;
 	}
 	PARA_DEBUG_LOG("received %s request for user %s\n",
-		use_rc4? "rc4" : "auth", u.name);
-	if ((ret = lookup_user(&u)) < 0)
+		use_rc4? "rc4" : "auth", p);
+	ret = -E_BAD_USER;
+	u = lookup_user(p);
+	if (!u)
 		goto err_out;
-	ret = para_encrypt_challenge(u.rsa, challenge_nr, crypt_buf);
+	ret = para_encrypt_challenge(u->rsa, challenge_nr, crypt_buf);
 	if (ret <= 0)
 		goto err_out;
 	numbytes = ret;
@@ -855,11 +857,11 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 			|| chall_response != challenge_nr)
 		goto err_out;
 	/* auth successful. Send 'Proceed' message */
-	PARA_INFO_LOG("good auth for %s (%lu)\n", u.name, challenge_nr);
+	PARA_INFO_LOG("good auth for %s (%lu)\n", u->name, challenge_nr);
 	sprintf(buf, "%s", PROCEED_MSG);
 	if (use_rc4) {
 		init_rc4_keys();
-		ret = para_encrypt_buffer(u.rsa, rc4_buf, 2 * RC4_KEY_LEN,
+		ret = para_encrypt_buffer(u->rsa, rc4_buf, 2 * RC4_KEY_LEN,
 			(unsigned char *)buf + PROCEED_MSG_LEN + 1);
 		if (ret <= 0)
 			goto err_out;
@@ -891,7 +893,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	if (!(cmd = parse_cmd(command)))
 		goto err_out;
 	/* valid command, check permissions */
-	ret = check_perms(u.perms, cmd);
+	ret = check_perms(u->perms, cmd);
 	if (ret < 0)
 		goto err_out;
 	/* valid command and sufficient perms */
@@ -900,7 +902,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	mmd_lock();
 	mmd->num_commands++;
 	mmd_unlock();
-	PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u.name,
+	PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
 		inet_ntoa(addr->sin_addr));
 	ret = cmd->handler(fd, argc, argv);
 	if (ret >= 0) {
@@ -917,7 +919,7 @@ out:
 	free(command);
 	free(argv);
 	mmd_lock();
-	if (cmd && (cmd->perms & DB_WRITE) && ret >= 0)
+	if (cmd && (cmd->perms & AFS_WRITE) && ret >= 0)
 		mmd->events++;
 	mmd->active_connections--;
 	mmd_unlock();