Import on vendor branch two files that have been tweaked to unbreak

the build.  The openbsm folks are free to fix it in any other way they
see fit once they resurface.

Basically, make everything always be const char **, even though const
char ** usually should be 'const char * const *' in most cases.  This
makes the three different definitions consistant and allows world to
build.

2 files changed, 4 insertions, 4 deletions

diff --git a/contrib/openbsm/bsm/audit_record.h b/contrib/openbsm/bsm/audit_record.h
index 79d13c3..1382830 100644
--- a/contrib/openbsm/bsm/audit_record.h
+++ b/contrib/openbsm/bsm/audit_record.h
@@ -322,8 +322,8 @@ token_t	*au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
 token_t	*au_to_exec_args(char *args, int argc);
 token_t	*au_to_exec_env(char *envs, int envc);
 #else
-token_t	*au_to_exec_args(char **argv);
-token_t	*au_to_exec_env(char **envp);
+token_t	*au_to_exec_args(const char **argv);
+token_t	*au_to_exec_env(const char **envp);
 #endif
 token_t	*au_to_text(char *text);
 token_t	*au_to_kevent(struct kevent *kev);
diff --git a/contrib/openbsm/libbsm/bsm_token.c b/contrib/openbsm/libbsm/bsm_token.c
index f90cbc9..31985f3 100644
--- a/contrib/openbsm/libbsm/bsm_token.c
+++ b/contrib/openbsm/libbsm/bsm_token.c
@@ -1055,7 +1055,7 @@ au_to_me(void)
  * text					count null-terminated strings
  */
 token_t *
-au_to_exec_args(char **argv)
+au_to_exec_args(const char **argv)
 {
 	token_t *t;
 	u_char *dptr = NULL;
@@ -1096,7 +1096,7 @@ au_to_exec_args(char **argv)
  * text					count null-terminated strings
  */
 token_t *
-au_to_exec_env(char **envp)
+au_to_exec_env(const char **envp)
 {
 	token_t *t;
 	u_char *dptr = NULL;