[src/netbsd-3]: src/sbin/veriexecctl Pull up revision 1.14 (requested by elad...

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

details:   https://anonhg.NetBSD.org/src/rev/bfd2139ab94b
branches:  netbsd-3
changeset: 576168:bfd2139ab94b
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Jun 10 15:30:07 2005 +0000

description:
Pull up revision 1.14 (requested by elad in ticket #389):
Don't create duplicate tables for the same device.

diffstat:

 sbin/veriexecctl/veriexecctl.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r db21601bb603 -r bfd2139ab94b sbin/veriexecctl/veriexecctl.c
--- a/sbin/veriexecctl/veriexecctl.c    Fri Jun 10 15:29:58 2005 +0000
+++ b/sbin/veriexecctl/veriexecctl.c    Fri Jun 10 15:30:07 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: veriexecctl.c,v 1.5.6.8 2005/06/10 15:25:43 tron Exp $ */
+/*     $NetBSD: veriexecctl.c,v 1.5.6.9 2005/06/10 15:30:07 tron Exp $ */
 
 /*-
  * Copyright 2005 Elad Efrat <elad%bsd.org.il@localhost>
@@ -109,13 +109,16 @@
 
        while (!CIRCLEQ_EMPTY(&params_list)) {
                struct veriexec_up *vup;
+               extern int errno;
 
                vup = CIRCLEQ_FIRST(&params_list);
 
-               if (ioctl(gfd, VERIEXEC_TABLESIZE, &(vup->vu_param)) == -1)
-                       err(1, "Error in phase 1: Can't "
-                           "set hash table size for device %d",
-                           vup->vu_param.dev);
+               if (ioctl(gfd, VERIEXEC_TABLESIZE, &(vup->vu_param)) == -1) {
+                       if (errno != EEXIST)
+                               err(1, "Error in phase 1: Can't "
+                                   "set hash table size for device %d",
+                                   vup->vu_param.dev);
+               }
 
                if (verbose) {
                        printf(" => Hash table sizing successful for device "