diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-03-14 14:44:09 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-03-14 14:44:09 -0700 |
| commit | 2c3eea0064d63ddc71abf40ec7f4284d0989895e (patch) | |
| tree | 987eb6cc94184bd6fcadbe28df78184ae290331e /etc | |
| parent | 71eec2a2a07055dc038019bf57627af85973c257 (diff) | |
| parent | b5864fdc4462d1f329ebe852754c7877846d8bfa (diff) | |
| download | vyatta-cfg-2c3eea0064d63ddc71abf40ec7f4284d0989895e.tar.gz vyatta-cfg-2c3eea0064d63ddc71abf40ec7f4284d0989895e.zip | |
Merge branch 'glendale' into hollywood
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/bash_completion.d/20vyatta-cfg | 10 | ||||
| -rw-r--r-- | etc/default/vyatta-cfg | 2 | ||||
| -rw-r--r-- | etc/shell/level/users/allowed-op | 1 | ||||
| -rw-r--r-- | etc/shell/level/users/allowed-pipe | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg index 463b383..4ad86ce 100755 --- a/etc/bash_completion.d/20vyatta-cfg +++ b/etc/bash_completion.d/20vyatta-cfg @@ -440,8 +440,14 @@ vyatta_parse_tmpl () vyatta_cfg_comp_help=$(vyatta_parse_tmpl_comp_fields $1 "comp_help") if (( ${#vyatta_cfg_allowed[@]} == 0 )); then - local ares=$(eval "$acmd") - eval "vyatta_cfg_allowed=( $ares )" + local -a ares=( $(eval "$acmd") ) + for (( i=0 ; i<${#ares[@]} ; i++ )); do + if [[ "${ares[i]}" != \<*\> ]]; then + vyatta_cfg_allowed+=( "${ares[i]}" ) + else + vyatta_cfg_allowed+=( "" ) + fi + done fi if [ -z "$vyatta_cfg_help" ]; then vyatta_cfg_help='<No help text available>' diff --git a/etc/default/vyatta-cfg b/etc/default/vyatta-cfg index ef02233..7d189d8 100644 --- a/etc/default/vyatta-cfg +++ b/etc/default/vyatta-cfg @@ -43,6 +43,8 @@ if [ $is_admin == 1 ]; then else # no need to check is_users since there are only 2 levels for now declare -x -r VYATTA_USER_LEVEL_DIR=${vyatta_sysconfdir}/shell/level/users + declare -x -r LESSSECURE=1 + alias more=less fi } 2>/dev/null || : diff --git a/etc/shell/level/users/allowed-op b/etc/shell/level/users/allowed-op index 498d120..4c8d16f 100644 --- a/etc/shell/level/users/allowed-op +++ b/etc/shell/level/users/allowed-op @@ -8,7 +8,6 @@ reboot set show telnet -terminal traceroute undebug vpn diff --git a/etc/shell/level/users/allowed-pipe b/etc/shell/level/users/allowed-pipe index 3204ef3..2d92acc 100644 --- a/etc/shell/level/users/allowed-pipe +++ b/etc/shell/level/users/allowed-pipe @@ -1,4 +1,4 @@ -more +less 1 no-more 1 |