From: Andre Noll <maan@systemlinux.org>
Date: Thu, 9 Jul 2009 14:14:19 +0000 (+0200)
Subject: Merge commit 'meins/next' into next
X-Git-Tag: v0.4.0~54
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=a37e903213215dd36b11bbde4ea98e1d4590a472;hp=-c;p=paraslash.git

Merge commit 'meins/next' into next
---

a37e903213215dd36b11bbde4ea98e1d4590a472
diff --combined command.c
index a9eb03f1,afa1e667..8fdb839a
--- a/command.c
+++ b/command.c
@@@ -6,6 -6,7 +6,7 @@@
  
  /** \file command.c Client authentication and server commands. */
  
+ #include <regex.h>
  #include <signal.h>
  #include <sys/time.h>
  #include <sys/types.h>
@@@ -777,7 -778,7 +778,7 @@@ __noreturn void handle_connect(int fd, 
  		numbytes = 256;
  		get_random_bytes_or_die((unsigned char *)buf, numbytes);
  	}
 -	PARA_DEBUG_LOG("sending %zu byte challenge + rc4 keys (%u bytes)\n",
 +	PARA_DEBUG_LOG("sending %u byte challenge + rc4 keys (%zu bytes)\n",
  		CHALLENGE_SIZE, numbytes);
  	ret = send_bin_buffer(fd, buf, numbytes);
  	if (ret < 0)
@@@ -787,7 -788,7 +788,7 @@@
  	if (ret < 0)
  		goto net_err;
  	numbytes = ret;
 -	PARA_DEBUG_LOG("received %zu bytes challenge response\n", ret);
 +	PARA_DEBUG_LOG("received %d bytes challenge response\n", ret);
  	ret = -E_BAD_USER;
  	if (!u)
  		goto net_err;