Module Name: src
Committed By: riastradh
Date: Mon Aug 28 22:25:33 UTC 2023
Modified Files:
src/tests/usr.sbin/certctl: t_certctl.sh
src/usr.sbin/certctl: certctl.sh
Log Message:
certctl(8): Exit nonzero on missing certs.conf.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.sbin/certctl/t_certctl.sh
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/certctl/certctl.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.sbin/certctl/t_certctl.sh
diff -u src/tests/usr.sbin/certctl/t_certctl.sh:1.2 src/tests/usr.sbin/certctl/t_certctl.sh:1.3
--- src/tests/usr.sbin/certctl/t_certctl.sh:1.2 Mon Aug 28 22:25:21 2023
+++ src/tests/usr.sbin/certctl/t_certctl.sh Mon Aug 28 22:25:32 2023
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: t_certctl.sh,v 1.2 2023/08/28 22:25:21 riastradh Exp $
+# $NetBSD: t_certctl.sh,v 1.3 2023/08/28 22:25:32 riastradh Exp $
#
# Copyright (c) 2023 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -330,7 +330,6 @@ missingconf_body()
{
mkdir certs
atf_check -s exit:0 test ! -e certs.conf
- atf_expect_fail 'wrong exit code on missing config file'
atf_check -s not-exit:0 -e match:'certs\.conf' \
$CERTCTL rehash
}
Index: src/usr.sbin/certctl/certctl.sh
diff -u src/usr.sbin/certctl/certctl.sh:1.1 src/usr.sbin/certctl/certctl.sh:1.2
--- src/usr.sbin/certctl/certctl.sh:1.1 Sat Aug 26 05:27:15 2023
+++ src/usr.sbin/certctl/certctl.sh Mon Aug 28 22:25:32 2023
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: certctl.sh,v 1.1 2023/08/26 05:27:15 riastradh Exp $
+# $NetBSD: certctl.sh,v 1.2 2023/08/28 22:25:32 riastradh Exp $
#
# Copyright (c) 2023 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -234,7 +234,7 @@ configure()
error "$vconfig:$lineno: unknown command: $vop"
;;
esac
- done <$config
+ done <$config || status=$?
return $status
}
