tame "stdio rpath" before opening the file, tame "stdio" after that

diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index df222de..b4b7e6e 100644 (file)
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: units.c,v 1.20 2013/11/27 00:13:24 deraadt Exp $      */
+/*     $OpenBSD: units.c,v 1.21 2015/10/06 13:29:56 deraadt Exp $      */
 /*     $NetBSD: units.c,v 1.6 1996/04/06 06:01:03 thorpej Exp $        */
 
 /*
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <err.h>
 
 #define UNITSFILE "/usr/share/misc/units.lib"
 
@@ -631,6 +632,9 @@ main(int argc, char **argv)
        extern char *optarg;
        extern int optind;
 
+       if (tame("stdio rpath", NULL) == -1)
+               err(1, "tame");
+
        while ((optchar = getopt(argc, argv, "vqf:")) != -1) {
                switch (optchar) {
                case 'f':
@@ -660,6 +664,9 @@ main(int argc, char **argv)
 
        readunits(userfile);
 
+       if (tame("stdio", NULL) == -1)
+               err(1, "tame");
+
        if (argc == 3) {
                strlcpy(havestr, argv[0], sizeof(havestr));
                strlcat(havestr, " ", sizeof(havestr));