Move the RB_ code from doas.h to env.c, and limit the environment interface to a...

[opendoas.git] / doas.h

diff --git a/doas.h b/doas.h
index 88b2223462e3cede9f1dfc2e5f8c06a884e11e14..2f95310d6e5e30a8a1d5fe1501458dce6bc0733e 100644 (file)
--- a/doas.h
+++ b/doas.h
@@ -1,20 +1,4 @@
-/* $OpenBSD: doas.h,v 1.3 2015/07/21 11:04:06 zhuk Exp $ */
-
-#include <sys/tree.h>
-
-struct envnode {
-       RB_ENTRY(envnode) node;
-       const char *key;
-       const char *value;
-};
-
-struct env {
-       RB_HEAD(envtree, envnode) root;
-       u_int count;
-};
-
-RB_PROTOTYPE(envtree, envnode, node, envcmp)
-
+/* $OpenBSD$ */
 struct rule {
        int action;
        int options;
@@ -31,9 +15,7 @@ extern int parse_errors;
 
 size_t arraylen(const char **);
 
-struct env *createenv(char **);
-struct env *filterenv(struct env *, struct rule *);
-char **flattenenv(struct env *);
+char **prepenv(struct rule *);
 
 #define PERMIT 1
 #define DENY   2