[Ipsec-tools-commits] ipsec-tools/src/racoon isakmp_cfg.c,1.40,1.41

[VANHULLEBUS Y. <va...@us...>]

Update of /cvsroot/ipsec-tools/ipsec-tools/src/racoon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26063/src/racoon

Modified Files:
	isakmp_cfg.c 
Log Message:
some includes and some %zu

Index: isakmp_cfg.c
===================================================================
RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/isakmp_cfg.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- isakmp_cfg.c	10 Oct 2005 08:41:44 -0000	1.40
+++ isakmp_cfg.c	30 Oct 2005 10:28:30 -0000	1.41
@@ -37,6 +37,9 @@
 #include <sys/queue.h>
 
 #include <utmp.h>
+#if defined(__APPLE__) && defined(__MACH__)
+#include <util.h>
+#endif
 
 #ifdef __FreeBSD__
 # include <libutil.h>
@@ -66,6 +69,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #include <ctype.h>
 #include <resolv.h>
 
@@ -1979,7 +1985,7 @@
 		return 0;
 
 	plog(LLV_INFO, LOCATION, NULL,
-	    "Resize address pool from %d to %d\n",
+	    "Resize address pool from %zu to %d\n",
 	    isakmp_cfg_config.pool_size, size);
 
 	/* If a pool already exists, check if we can shrink it */
@@ -1988,7 +1994,7 @@
 		for (i = isakmp_cfg_config.pool_size; i >= size; --i) {
 			if (isakmp_cfg_config.port_pool[i].used) {
 				plog(LLV_ERROR, LOCATION, NULL, 
-				    "resize pool from %d to %d impossible "
+				    "resize pool from %zu to %d impossible "
 				    "port %d is in use\n", 
 				    isakmp_cfg_config.pool_size, size, i);
 				size = i;
@@ -2001,7 +2007,7 @@
 	new_pool = racoon_realloc(isakmp_cfg_config.port_pool, len);
 	if (new_pool == NULL) {
 		plog(LLV_ERROR, LOCATION, NULL, 
-		    "resize pool from %d to %d impossible: %s",
+		    "resize pool from %zu to %d impossible: %s",
 		    isakmp_cfg_config.pool_size, size, strerror(errno));
 		return -1;
 	}