tazpanel rev 507
nss support
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Jul 12 16:19:16 2015 +0200 (2015-07-12) |
parents | 14fdd304f33f |
children | e87d432b202d |
files | index.cgi lib/libtazpanel network.cgi po/fr.po settings.cgi |
line diff
1.1 --- a/index.cgi Sun Jul 12 13:51:30 2015 +0200 1.2 +++ b/index.cgi Sun Jul 12 16:19:16 2015 +0200 1.3 @@ -225,7 +225,7 @@ 1.4 header; xhtml_header "$(_ 'Terminal')" 1.5 1.6 user="$REMOTE_USER" 1.7 - HOME="$(awk -F: -vu=$user '$1==u{print $6}' /etc/passwd)" 1.8 + HOME="$(getdb passwd | awk -F: -vu=$user '$1==u{print $6}')" 1.9 historyfile="$HOME/.ash_history" 1.10 1.11 cmd=$(GET cmd) 1.12 @@ -358,7 +358,7 @@ 1.13 *\ rmhistory\ *) 1.14 # Manage shell commandline history 1.15 user="$REMOTE_USER" 1.16 - HOME="$(awk -F: -vu="$user" '$1==u{print $6}' /etc/passwd)" 1.17 + HOME="$(getdb passwd | awk -F: -vu="$user" '$1==u{print $6}')" 1.18 historyfile="$HOME/.ash_history" 1.19 1.20 # Return sed command for removing history lines ('8d12d' to remove 8 and 12 lines)
2.1 --- a/lib/libtazpanel Sun Jul 12 13:51:30 2015 +0200 2.2 +++ b/lib/libtazpanel Sun Jul 12 16:19:16 2015 +0200 2.3 @@ -368,3 +368,10 @@ 2.4 xhtml_footer; exit 0 2.5 fi 2.6 } 2.7 + 2.8 +# Get system database. NSS compatible. 2.9 + 2.10 +getdb() { 2.11 + getent $1 2>/dev/null || cat /etc/$1 2.12 +} 2.13 +
3.1 --- a/network.cgi Sun Jul 12 13:51:30 2015 +0200 3.2 +++ b/network.cgi Sun Jul 12 16:19:16 2015 +0200 3.3 @@ -673,7 +673,7 @@ 3.4 cat <<EOT 3.5 </header> 3.6 <footer> 3.7 - <pre>$(cat '/etc/hosts')</pre> 3.8 + <pre>$(getdb hosts)</pre> 3.9 </footer> 3.10 </section> 3.11
4.1 --- a/po/fr.po Sun Jul 12 13:51:30 2015 +0200 4.2 +++ b/po/fr.po Sun Jul 12 16:19:16 2015 +0200 4.3 @@ -1169,7 +1169,7 @@ 4.4 4.5 #: settings.cgi:475 settings.cgi:497 4.6 msgid "Small quick tweaks for user %s" 4.7 -msgstr "Ajustements pour l'utilisateur %s" 4.8 +msgstr "Réglages pour l'utilisateur %s" 4.9 4.10 #: settings.cgi:500 4.11 #, fuzzy 4.12 @@ -1182,7 +1182,7 @@ 4.13 4.14 #: settings.cgi:515 4.15 msgid "Colored" 4.16 -msgstr "Multicolor" 4.17 +msgstr "Multicolore" 4.18 4.19 #: settings.cgi:524 settings.cgi:572 4.20 #, fuzzy 4.21 @@ -1194,7 +1194,7 @@ 4.22 "To take effect: log out and log in to system or execute command in the " 4.23 "terminal:" 4.24 msgstr "" 4.25 -"Pour prendre effet, reconnectez vous ou exécutez une commande dans le " 4.26 +"Pour prendre effet, reconnectez vous ou exécutez cette commande dans le " 4.27 "terminal :" 4.28 4.29 #: settings.cgi:533
5.1 --- a/settings.cgi Sun Jul 12 13:51:30 2015 +0200 5.2 +++ b/settings.cgi Sun Jul 12 16:19:16 2015 +0200 5.3 @@ -16,13 +16,6 @@ 5.4 TITLE=$(_ 'System settings') 5.5 5.6 5.7 -# Get system database. LDAP compatible. 5.8 - 5.9 -getdb() { 5.10 - getent $1 2>/dev/null || cat /etc/$1 5.11 -} 5.12 - 5.13 - 5.14 listdb() { 5.15 for item in $(getdb $1 | cut -d: -f1); do 5.16 echo "<option>$item</option>\n" 5.17 @@ -124,8 +117,8 @@ 5.18 5.19 5.20 *\ tweak\ *) 5.21 - HOME="$(awk -F: -vu=$REMOTE_USER '$1==u{print $6}' /etc/passwd)" 5.22 - [ -z "$HOME" ] && exit 0 5.23 + HOME="$(getdb passwd | awk -F: -vu=$REMOTE_USER '$1==u{print $6}')" 5.24 + [ -d "$HOME" ] && exit 0 5.25 5.26 dd="$HOME/.local/share/desktop-directories"; sd="$dd/SliTazMenu.directory" 5.27 5.28 @@ -311,7 +304,7 @@ 5.29 for login in $(getdb passwd | cut -d: -f1); do 5.30 if [ -d "/home/$login" ]; then 5.31 blocked=''; usericon='user' 5.32 - if grep -qs "^$login:!" /etc/shadow; then 5.33 + if getdb shadow | grep -qs "^$login:!"; then 5.34 blocked='class="color31"' 5.35 usericon="lock" 5.36 fi 5.37 @@ -474,7 +467,7 @@ 5.38 user="$REMOTE_USER"; host="$(hostname)" 5.39 xhtml_header "$(_ 'Small quick tweaks for user %s' "$user")" 5.40 5.41 - HOME="$(awk -F: -vu=$user '$1==u{print $6}' /etc/passwd)" 5.42 + HOME="$(getdb passwd | awk -F: -vu=$user '$1==u{print $6}')" 5.43 font="${TERM_FONT:-monospace}"; palette=$(echo $TERM_PALETTE | tr A-Z a-z) 5.44 case $user in 5.45 root) color=31; ind="#";;