[Ipsec-tools-commits] ipsec-tools/src/racoon ipsec_doi.c,1.26.2.10,1.26.2.11

[Emmanuel D. <ma...@us...>]

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

Modified Files:
      Tag: ipsec-tools-0_6-branch
	ipsec_doi.c 
Log Message:
Linux build fixes, accomodate different libiconv version


Index: ipsec_doi.c
===================================================================
RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/ipsec_doi.c,v
retrieving revision 1.26.2.10
retrieving revision 1.26.2.11
diff -u -d -r1.26.2.10 -r1.26.2.11
--- ipsec_doi.c	1 Jul 2005 09:11:59 -0000	1.26.2.10
+++ ipsec_doi.c	11 Jul 2005 19:01:27 -0000	1.26.2.11
@@ -92,6 +92,11 @@
 #ifdef HAVE_GSSAPI
 #include <iconv.h>
 #include "gssapi.h"
+#ifdef HAVE_ICONV_2ND_CONST
+#define __iconv_const const
+#else
+#define __iconv_const
+#endif
 #endif
 
 int verbose_proposal_check = 1;
@@ -737,7 +742,7 @@
 		{
 			iconv_t cd;
 			size_t srcleft, dstleft, rv;
-			const char *src;
+			__iconv_const char *src;
 			char *dst;
 			int len = ntohs(d->lorv);
 
@@ -781,7 +786,7 @@
 			dst = sa->gssid->v;
 			dstleft = len / 2;
 
-			rv = iconv(cd, (const char **)&src, &srcleft, 
+			rv = iconv(cd, (__iconv_const char **)&src, &srcleft, 
 				   &dst, &dstleft);
 			if (rv != 0) {
 				if (rv == -1) {
@@ -2825,8 +2830,8 @@
 					goto gssid_done;
 				}
 				odst = dst;
-				rv = iconv(cd, (const char **)&src, &srcleft,
-				    &dst, &dstleft);
+				rv = iconv(cd, (__iconv_const char **)&src, 
+				    &srcleft, &dst, &dstleft);
 				if (rv != 0) {
 					if (rv == -1) {
 						plog(LLV_ERROR, LOCATION, NULL,