--- src/config/cmdline.c.orig	2002-12-29 16:41:02.000000000 +0100
+++ src/config/cmdline.c	2004-11-20 02:01:38.821706921 +0100
@@ -57,17 +57,17 @@
 		else if ( !strcmp("-v",argv[i]) || !strcmp("-h",argv[1]) ||
 		     !strcmp("--version", argv[1]) || !strcmp("--help", argv[i]) ) 
 		{
-			printf("
-%s version %s
-Copyright (C) 2002: F. Lindenberg, A. Szalkowski
-Usage:
-\t%s [options]\n\n Where options is one of:
--h --help or
--v --version\tprint this info and quit.
--f --file\tdefine the configuration file (makes no 
-\t\tsense without config file support).
--p --port\tdefine the port number.
-", _progname_long, _version, argv[0]);
+			printf(
+"%s version %s\n"
+"Copyright (C) 2002: F. Lindenberg, A. Szalkowski\n"
+"Usage:\n"
+"\t%s [options]\n\n Where options is one of:\n"
+"-h --help or\n"
+"-v --version\tprint this info and quit.\n"
+"-f --file\tdefine the configuration file (makes no\n"
+"\t\tsense without config file support).\n"
+"-p --port\tdefine the port number.\n\n",
+_progname_long, _version, argv[0]);
 			exit ( 0 );
 		}
 		
--- src/capifwd.c.orig	2006-09-23 10:39:30.000000000 +0300
+++ src/capifwd.c	2006-09-23 10:41:32.836443500 +0300
@@ -13,7 +13,7 @@
 		ssize_t n = recv(fd, buf, left, 0);
 		if (n <= 0)
 			return n;
-		(char*)buf += n;
+		buf = (char*)buf + n;
 		left -= n;
 	}
 	return size;