X-Git-Url: https://git.saurik.com/apple/ipsec.git/blobdiff_plain/52b7d2ce06d68d0a9160d16f6e7c08c21c149d0d..869d26af2154b0619928167c83079c8c0bf7163d:/ipsec-tools/racoon/gssapi.c

diff --git a/ipsec-tools/racoon/gssapi.c b/ipsec-tools/racoon/gssapi.c
index 0a11f83..a2cce3c 100644
--- a/ipsec-tools/racoon/gssapi.c
+++ b/ipsec-tools/racoon/gssapi.c
@@ -79,7 +79,7 @@ gssapi_error(OM_uint32 status_code, const char *where,
 	va_list ap;
 
 	va_start(ap, fmt);
-	plogv(LLV_ERROR, where, NULL, fmt, ap);
+	plogv(LLV_ERROR, where, NULL, fmt, &ap);
 	va_end(ap);
 
 	message_context = 0;
@@ -153,6 +153,7 @@ gssapi_get_default_name(struct ph1handle *iph1, int remote, gss_name_t *service)
 {
 	char name[NI_MAXHOST];
 	struct sockaddr *sa;
+	char* buf = NULL;
 	gss_buffer_desc name_token;
 	OM_uint32 min_stat, maj_stat;
 
@@ -161,8 +162,9 @@ gssapi_get_default_name(struct ph1handle *iph1, int remote, gss_name_t *service)
 	if (getnameinfo(sa, sysdep_sa_len(sa), name, NI_MAXHOST, NULL, 0, 0) != 0)
 		return -1;
 
-	name_token.length = asprintf((char **)&name_token.value,
-	    "%s@%s", GSSAPI_DEF_NAME, name);  
+	name_token.length = asprintf(&buf, "%s@%s", GSSAPI_DEF_NAME, name);
+	name_token.value = buf;
+
 	maj_stat = gss_import_name(&min_stat, &name_token,
 	    GSS_C_NT_HOSTBASED_SERVICE, service);
 	if (GSS_ERROR(maj_stat)) {
@@ -288,7 +290,7 @@ gssapi_get_itoken(struct ph1handle *iph1, int *lenp)
 	if (iph1->approval != NULL && iph1->approval->gssid != NULL) {
 		plog(LLV_DEBUG, LOCATION, NULL,
 		    "using provided service '%.*s'\n",
-		    iph1->approval->gssid->l, iph1->approval->gssid->v);
+		    (int)iph1->approval->gssid->l, iph1->approval->gssid->v);
 		name_token.length = iph1->approval->gssid->l;
 		name_token.value = iph1->approval->gssid->v;
 		maj_stat = gss_import_name(&min_stat, &name_token,
@@ -466,7 +468,7 @@ gssapi_get_itokens(struct ph1handle *iph1, vchar_t **tokens)
 	*tokens = toks;
 
 	plog(LLV_DEBUG, LOCATION, NULL,
-		"%d itokens of length %d\n", gps->gsscnt, (*tokens)->l);
+		"%d itokens of length %zu\n", gps->gsscnt, (*tokens)->l);
 
 	return 0;
 }
@@ -547,7 +549,7 @@ gssapi_wraphash(struct ph1handle *iph1)
 		return NULL;
 	}
 
-	plog(LLV_DEBUG, LOCATION, NULL, "wrapped HASH, ilen %d olen %d\n",
+	plog(LLV_DEBUG, LOCATION, NULL, "wrapped HASH, ilen %zu olen %zu\n",
 	    hash_in->length, hash_out->length);
 
 	maj_stat = gss_release_buffer(&min_stat, hash_in);
@@ -589,7 +591,7 @@ gssapi_unwraphash(struct ph1handle *iph1)
 	hashbuf.length = ntohs(iph1->pl_hash->h.len) - sizeof(*iph1->pl_hash);
 	hashbuf.value = (char *)(iph1->pl_hash + 1);
 
-	plog(LLV_DEBUG, LOCATION, NULL, "unwrapping HASH of len %d\n",
+	plog(LLV_DEBUG, LOCATION, NULL, "unwrapping HASH of len %zu\n",
 	    hashbuf.length);
 
 	maj_stat = gss_unwrap(&min_stat, gps->gss_context, hash_in, hash_out,