include X_TAG into ACQUIRE message, if possible.

kame · Jul 8, 2003 · 7315c55 · 7315c55
1 parent 9a4316d
commit 7315c55
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/kame/sys/netkey/key.c b/kame/sys/netkey/key.c
@@ -1,4 +1,4 @@
-/*	$KAME: key.c,v 1.295 2003/07/07 11:23:44 keiichi Exp $	*/
+/*	$KAME: key.c,v 1.296 2003/07/08 22:01:38 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -2518,7 +2518,7 @@ key_setdumpsp(sp, type, seq, pid)
 		if (!m)
 			goto fail;
 		m_cat(result, m);
-	} else {
+	} else if (sp->tag) {
 		m = key_setsadbxtag(sp->tag);
 		if (!m)
 			goto fail;
@@ -2681,7 +2681,7 @@ key_spdexpire(sp)
 			goto fail;
 		}
 		m_cat(result, m);
-	} else {
+	} else if (sp->tag) {
 		m = key_setsadbxtag(sp->tag);
 		if (!m) {
 			error = ENOBUFS;
@@ -6146,6 +6146,16 @@ key_acquire(saidx, sp)
 		m_cat(result, m);
 	}
 
+	/* set sadb_x_tag */
+	if (sp && sp->tag) {
+		m = key_setsadbxtag(sp->tag);
+		if (!m) {
+			error = ENOBUFS;
+			goto fail;
+		}
+		m_cat(result, m);
+	}
+
 	/* XXX identity (optional) */
 #if 0
 	if (idexttype && fqdn) {