Turn on auditing for Vyatta bash

The original patch turned on auditing iff shell was named aubash
and user was root.  We change that to be always on if shell if vbash.

2 files changed, 2 insertions, 2 deletions

diff --git a/config-bot.h b/config-bot.h
index a4f95cf..d78efef 100644
--- a/config-bot.h
+++ b/config-bot.h
@@ -99,7 +99,7 @@
 
 /* If the shell is called by this name, it will become audited. */
 #if defined (AUDIT_SHELL)
-#  define AUDIT_SHELL_NAME "aubash"
+#  define AUDIT_SHELL_NAME "vbash"
 #endif
 
 /***********************************************************/
diff --git a/eval.c b/eval.c
index e493643..a9937a8 100644
--- a/eval.c
+++ b/eval.c
@@ -187,7 +187,7 @@ reader_loop ()
 	      executing = 1;
 	      stdin_redir = 0;
 #if defined (AUDIT_SHELL)
-              if (audited && interactive_shell && getuid () == 0)
+              if (audited && interactive_shell)
                 {
                   if (audit_start () < 0)
                     {