[src/netbsd-3]: src/crypto/dist/ipsec-tools/src/racoon Pull up revision 1.4 (...

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

details:   https://anonhg.NetBSD.org/src/rev/00682dfea066
branches:  netbsd-3
changeset: 576608:00682dfea066
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Jul 12 17:37:41 2005 +0000

description:
Pull up revision 1.4 (requested by manu in ticket #581):
Don't use adminport when it is disabled

diffstat:

 crypto/dist/ipsec-tools/src/racoon/admin.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r f4c46b3f1183 -r 00682dfea066 crypto/dist/ipsec-tools/src/racoon/admin.c
--- a/crypto/dist/ipsec-tools/src/racoon/admin.c        Tue Jul 12 17:37:35 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/admin.c        Tue Jul 12 17:37:41 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: admin.c,v 1.1.1.2.2.1 2005/05/11 12:16:57 tron Exp $   */
+/*     $NetBSD: admin.c,v 1.1.1.2.2.2 2005/07/12 17:37:41 tron Exp $   */
 
 /* Id: admin.c,v 1.17 2005/01/02 08:39:09 manubsd Exp */
 
@@ -572,8 +572,10 @@
 int
 admin_init()
 {
-       if (adminsock_path == NULL)
+       if (adminsock_path == NULL) {
+               lcconf->sock_admin = -1;
                return 0;
+       }
 
        memset(&sunaddr, 0, sizeof(sunaddr));
        sunaddr.sun_family = AF_UNIX;