Index: udp6_output.c
===================================================================
RCS file: /home/dcvs/src/sys/netinet6/udp6_output.c,v
retrieving revision 1.8
diff -u -u -r1.8 udp6_output.c
--- udp6_output.c	29 Dec 2006 18:02:56 -0000	1.8
+++ udp6_output.c	22 Jun 2008 02:48:12 -0000
@@ -139,7 +139,9 @@
 
 	priv = !suser(td);	/* 1 if privilaged, 0 if not */
 	if (control) {
-		if ((error = ip6_setpktoptions(control, &opt, priv, 0)) != 0)
+		if ((error = ip6_setpktoptions(control, &opt,
+		    in6p->in6p_outputopts, 
+		    IPPROTO_UDP, priv)) != 0)
 			goto release;
 		in6p->in6p_outputopts = &opt;
 	}
@@ -304,7 +306,7 @@
 
 releaseopt:
 	if (control) {
-		ip6_clearpktopts(in6p->in6p_outputopts, 0, -1);
+		ip6_clearpktopts(in6p->in6p_outputopts, -1);
 		in6p->in6p_outputopts = stickyopt;
 		m_freem(control);
 	}