[src/netbsd-1-6]: src/sys/netkey Pull up revision 1.74 (requested by itojun i...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9257b499f696
branches:  netbsd-1-6
changeset: 529414:9257b499f696
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Nov 19 21:21:50 2002 +0000

description:
Pull up revision 1.74 (requested by itojun in ticket #705):
should return error code from key_senderror().  sync w/kame

diffstat:

 sys/netkey/key.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 401e104d613c -r 9257b499f696 sys/netkey/key.c
--- a/sys/netkey/key.c  Tue Nov 19 21:19:06 2002 +0000
+++ b/sys/netkey/key.c  Tue Nov 19 21:21:50 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.63.2.1 2002/11/19 21:19:06 tron Exp $        */
+/*     $NetBSD: key.c,v 1.63.2.2 2002/11/19 21:21:50 tron Exp $        */
 /*     $KAME: key.c,v 1.234 2002/05/13 03:21:17 itojun Exp $   */
 
 /*
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.63.2.1 2002/11/19 21:19:06 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.63.2.2 2002/11/19 21:21:50 tron Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -1851,8 +1851,7 @@
        if (mhp->ext[SADB_X_EXT_POLICY] == NULL ||
            mhp->extlen[SADB_X_EXT_POLICY] < sizeof(struct sadb_x_policy)) {
                ipseclog((LOG_DEBUG, "key_spddelete2: invalid message is passed.\n"));
-               key_senderror(so, m, EINVAL);
-               return 0;
+               return key_senderror(so, m, EINVAL);
        }
 
        id = ((struct sadb_x_policy *)mhp->ext[SADB_X_EXT_POLICY])->sadb_x_policy_id;
@@ -1860,7 +1859,7 @@
        /* Is there SP in SPD ? */
        if ((sp = key_getspbyid(id)) == NULL) {
                ipseclog((LOG_DEBUG, "key_spddelete2: no SP found id:%u.\n", id));
-               key_senderror(so, m, EINVAL);
+               return key_senderror(so, m, EINVAL);
        }
 
        key_sp_dead(sp);