X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=837c49cf3976b6bb7d8a1c5b7284e53d4ba51257;hp=69564336c6f8228a072f699ad83dbbe19d154338;hb=23af03dbfb283045ff952267ee83c2b7f2ef6380;hpb=c52dfd608f15c8779df38fd46602e562b287171a

diff --git a/command.c b/command.c
index 69564336..837c49cf 100644
--- a/command.c
+++ b/command.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file command.c Client authentication and server commands. */
 
@@ -398,7 +394,7 @@ static int com_si(struct command_context *cc,
 		"supported audio formats: %s\n",
 		ut, mmd->num_played,
 		(int)getppid(),
-		(int)mmd->afs_pid,
+		(int)afs_pid,
 		mmd->active_connections,
 		mmd->num_commands,
 		mmd->num_connects,
@@ -744,12 +740,11 @@ out:
 }
 EXPORT_SERVER_CMD_HANDLER(jmp);
 
-static int com_tasks(struct command_context *cc,
+/* deprecated, does nothing */
+static int com_tasks(__a_unused struct command_context *cc,
 		__a_unused struct lls_parse_result *lpr)
 {
-	char *tl = server_get_tasks();
-	assert(tl);
-	return send_sb(&cc->scc, tl, strlen(tl), SBD_OUTPUT, false);
+	return 1;
 }
 EXPORT_SERVER_CMD_HANDLER(tasks);
 
@@ -808,8 +803,7 @@ out:
 
 #define HANDSHAKE_BUFSIZE 4096
 
-static int run_command(struct command_context *cc, struct iovec *iov,
-		const char *peername)
+static int run_command(struct command_context *cc, struct iovec *iov)
 {
 	int ret, i, argc;
 	char *p, *end, **argv;
@@ -842,8 +836,8 @@ static int run_command(struct command_context *cc, struct iovec *iov,
 		p += strlen(p) + 1;
 	}
 	argv[argc] = NULL;
-	PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", lls_command_name(lcmd),
-		cc->u->name, peername);
+	PARA_NOTICE_LOG("calling com_%s() for user %s\n",
+		lls_command_name(lcmd), cc->u->name);
 	ret = lls(lls_parse(argc, argv, lcmd, &lpr, &errctx));
 	if (ret >= 0) {
 		const struct server_cmd_user_data *ud = lls_user_data(lcmd);
@@ -864,7 +858,6 @@ static int run_command(struct command_context *cc, struct iovec *iov,
  * Perform user authentication and execute a command.
  *
  * \param fd The file descriptor to send output to.
- * \param peername Identifies the connecting peer.
  *
  * Whenever para_server accepts an incoming tcp connection on the port it
  * listens on, it forks and the resulting child calls this function.
@@ -885,7 +878,7 @@ static int run_command(struct command_context *cc, struct iovec *iov,
  *
  * \sa alarm(2), \ref crypt.c, \ref crypt.h.
  */
-__noreturn void handle_connect(int fd, const char *peername)
+__noreturn void handle_connect(int fd)
 {
 	int ret;
 	unsigned char rand_buf[CHALLENGE_SIZE + 2 * SESSION_KEY_LEN];
@@ -971,7 +964,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 	ret = recv_sb(&cc->scc, SBD_COMMAND, MAX_COMMAND_LEN, &iov);
 	if (ret < 0)
 		goto net_err;
-	ret = run_command(cc, &iov, peername);
+	ret = run_command(cc, &iov);
 	free(iov.iov_base);
 	if (ret < 0)
 		goto err_out;