prepenv can take a const rule

diff --git a/usr.bin/doas/doas.h b/usr.bin/doas/doas.h
index ba54c3f..cbeb339 100644 (file)
--- a/usr.bin/doas/doas.h
+++ b/usr.bin/doas/doas.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: doas.h,v 1.12 2016/10/05 17:40:25 tedu Exp $ */
+/* $OpenBSD: doas.h,v 1.13 2017/04/06 21:12:06 tedu Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
@@ -29,7 +29,7 @@ extern struct rule **rules;
 extern int nrules;
 extern int parse_errors;
 
-char **prepenv(struct rule *);
+char **prepenv(const struct rule *);
 
 #define PERMIT 1
 #define DENY   2

diff --git a/usr.bin/doas/env.c b/usr.bin/doas/env.c
index fd671b0..957883c 100644 (file)
--- a/usr.bin/doas/env.c
+++ b/usr.bin/doas/env.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: env.c,v 1.5 2016/09/15 00:58:23 deraadt Exp $ */
+/* $OpenBSD: env.c,v 1.6 2017/04/06 21:12:06 tedu Exp $ */
 /*
  * Copyright (c) 2016 Ted Unangst <tedu@openbsd.org>
  *
@@ -69,7 +69,7 @@ freenode(struct envnode *node)
 }
 
 static struct env *
-createenv(struct rule *rule)
+createenv(const struct rule *rule)
 {
        struct env *env;
        u_int i;
@@ -186,7 +186,7 @@ fillenv(struct env *env, const char **envlist)
 }
 
 char **
-prepenv(struct rule *rule)
+prepenv(const struct rule *rule)
 {
        static const char *safeset[] = {
                "DISPLAY", "HOME", "LOGNAME", "MAIL",