From owner-p4-projects@FreeBSD.ORG Thu Mar 19 16:53:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FCF110656FC; Thu, 19 Mar 2009 16:53:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4916E1065670 for ; Thu, 19 Mar 2009 16:53:38 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 375338FC13 for ; Thu, 19 Mar 2009 16:53:38 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2JGra8L093490 for ; Thu, 19 Mar 2009 16:53:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2JGraxZ093488 for perforce@freebsd.org; Thu, 19 Mar 2009 16:53:36 GMT (envelope-from jhb@freebsd.org) Date: Thu, 19 Mar 2009 16:53:36 GMT Message-Id: <200903191653.n2JGraxZ093488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 159455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2009 16:53:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=159455 Change 159455 by jhb@jhb_jhbbsd on 2009/03/19 16:53:25 IFC @159453 Affected files ... .. //depot/projects/smpng/sys/netipsec/key.c#31 integrate Differences ... ==== //depot/projects/smpng/sys/netipsec/key.c#31 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/key.c,v 1.44 2009/03/19 15:44:13 vanhu Exp $ */ +/* $FreeBSD: src/sys/netipsec/key.c,v 1.45 2009/03/19 15:50:45 vanhu Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ /*- @@ -4161,7 +4161,8 @@ if (sav->lft_s->addtime != 0 && now - sav->created > sav->lft_s->addtime) { key_sa_chgstate(sav, SADB_SASTATE_DYING); - /* Actually, only send expire message if SA has been used, as it + /* + * Actually, only send expire message if SA has been used, as it * was done before, but should we always send such message, and let IKE * daemon decide if it should be renegociated or not ? * XXX expire message will actually NOT be sent if SA is only used