X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=f9ef6cd75ab8733408d3c2542230ae806281bf85;hp=664d25734aa14e877735c891f172600982ad2939;hb=0a5226b8f6b9131024893f35de615d0b829afe27;hpb=b15735ae7de59e0d9db43f23388d8ac47a6d2def

diff --git a/command.c b/command.c
index 664d2573..f9ef6cd7 100644
--- a/command.c
+++ b/command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -458,10 +458,8 @@ int com_help(struct rc4_context *rc4c, int argc, char * const * argv)
 	}
 	/* argument given for help */
 	cmd = get_cmd_ptr(argv[1], &handler);
-	if (!cmd) {
-		free(handler);
+	if (!cmd)
 		return -E_BAD_CMD;
-	}
 	perms = cmd_perms_itohuman(cmd->perms);
 	ret = rc4_send_va_buffer(rc4c,
 		"%s - %s\n\n"
@@ -745,24 +743,24 @@ __noreturn void handle_connect(int fd, const char *peername)
 	/* we need a blocking fd here as recv() might return EAGAIN otherwise. */
 	ret = mark_fd_blocking(fd);
 	if (ret < 0)
-		goto err_out;
+		goto net_err;
 	/* send Welcome message */
 	ret = send_va_buffer(fd, "This is para_server, version "
 		PACKAGE_VERSION  ".\n" );
 	if (ret < 0)
-		goto err_out;
+		goto net_err;
 	/* recv auth request line */
 	ret = recv_buffer(fd, buf, sizeof(buf));
 	if (ret < 0)
-		goto err_out;
+		goto net_err;
 	if (ret < 10) {
 		ret = -E_AUTH_REQUEST;
-		goto err_out;
+		goto net_err;
 	}
 	numbytes = ret;
 	ret = -E_AUTH_REQUEST;
 	if (strncmp(buf, AUTH_REQUEST_MSG, strlen(AUTH_REQUEST_MSG)))
-		goto err_out;
+		goto net_err;
 	p = buf + strlen(AUTH_REQUEST_MSG);
 	PARA_DEBUG_LOG("received auth request for user %s\n", p);
 	ret = -E_BAD_USER;
@@ -772,7 +770,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 		ret = para_encrypt_buffer(u->rsa, rand_buf, sizeof(rand_buf),
 			(unsigned char *)buf);
 		if (ret < 0)
-			goto err_out;
+			goto net_err;
 		numbytes = ret;
 	} else {
 		/*