From: Andre Noll <maan@systemlinux.org>
Date: Thu, 3 Feb 2011 08:15:58 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.6~44^2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=d5738d17b54186db8c9c7f119a03b58382ae9be4;p=paraslash.git

Merge branch 'maint'
---

d5738d17b54186db8c9c7f119a03b58382ae9be4
diff --cc command.c
index 57e851f9,1810e5b1..f462016b
--- a/command.c
+++ b/command.c
@@@ -458,12 -387,10 +458,10 @@@ int com_help(struct rc4_context *rc4c, 
  	}
  	/* 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 = send_va_buffer(fd,
 +	ret = rc4_send_va_buffer(rc4c,
  		"%s - %s\n\n"
  		"handler: %s\n"
  		"permissions: %s\n"