# HG changeset patch # User Pascal Bellard # Date 1436710756 -7200 # Node ID 0e464ccf165e5b81539b5a2ec3ef038fa6cf9a8d # Parent 14fdd304f33f8561cee3ac951abe1acb01034f9f nss support diff -r 14fdd304f33f -r 0e464ccf165e index.cgi --- a/index.cgi Sun Jul 12 13:51:30 2015 +0200 +++ b/index.cgi Sun Jul 12 16:19:16 2015 +0200 @@ -225,7 +225,7 @@ header; xhtml_header "$(_ 'Terminal')" user="$REMOTE_USER" - HOME="$(awk -F: -vu=$user '$1==u{print $6}' /etc/passwd)" + HOME="$(getdb passwd | awk -F: -vu=$user '$1==u{print $6}')" historyfile="$HOME/.ash_history" cmd=$(GET cmd) @@ -358,7 +358,7 @@ *\ rmhistory\ *) # Manage shell commandline history user="$REMOTE_USER" - HOME="$(awk -F: -vu="$user" '$1==u{print $6}' /etc/passwd)" + HOME="$(getdb passwd | awk -F: -vu="$user" '$1==u{print $6}')" historyfile="$HOME/.ash_history" # Return sed command for removing history lines ('8d12d' to remove 8 and 12 lines) diff -r 14fdd304f33f -r 0e464ccf165e lib/libtazpanel --- a/lib/libtazpanel Sun Jul 12 13:51:30 2015 +0200 +++ b/lib/libtazpanel Sun Jul 12 16:19:16 2015 +0200 @@ -368,3 +368,10 @@ xhtml_footer; exit 0 fi } + +# Get system database. NSS compatible. + +getdb() { + getent $1 2>/dev/null || cat /etc/$1 +} + diff -r 14fdd304f33f -r 0e464ccf165e network.cgi --- a/network.cgi Sun Jul 12 13:51:30 2015 +0200 +++ b/network.cgi Sun Jul 12 16:19:16 2015 +0200 @@ -673,7 +673,7 @@ cat <
-
$(cat '/etc/hosts')
+
$(getdb hosts)
diff -r 14fdd304f33f -r 0e464ccf165e po/fr.po --- a/po/fr.po Sun Jul 12 13:51:30 2015 +0200 +++ b/po/fr.po Sun Jul 12 16:19:16 2015 +0200 @@ -1169,7 +1169,7 @@ #: settings.cgi:475 settings.cgi:497 msgid "Small quick tweaks for user %s" -msgstr "Ajustements pour l'utilisateur %s" +msgstr "Réglages pour l'utilisateur %s" #: settings.cgi:500 #, fuzzy @@ -1182,7 +1182,7 @@ #: settings.cgi:515 msgid "Colored" -msgstr "Multicolor" +msgstr "Multicolore" #: settings.cgi:524 settings.cgi:572 #, fuzzy @@ -1194,7 +1194,7 @@ "To take effect: log out and log in to system or execute command in the " "terminal:" msgstr "" -"Pour prendre effet, reconnectez vous ou exécutez une commande dans le " +"Pour prendre effet, reconnectez vous ou exécutez cette commande dans le " "terminal :" #: settings.cgi:533 diff -r 14fdd304f33f -r 0e464ccf165e settings.cgi --- a/settings.cgi Sun Jul 12 13:51:30 2015 +0200 +++ b/settings.cgi Sun Jul 12 16:19:16 2015 +0200 @@ -16,13 +16,6 @@ TITLE=$(_ 'System settings') -# Get system database. LDAP compatible. - -getdb() { - getent $1 2>/dev/null || cat /etc/$1 -} - - listdb() { for item in $(getdb $1 | cut -d: -f1); do echo "\n" @@ -124,8 +117,8 @@ *\ tweak\ *) - HOME="$(awk -F: -vu=$REMOTE_USER '$1==u{print $6}' /etc/passwd)" - [ -z "$HOME" ] && exit 0 + HOME="$(getdb passwd | awk -F: -vu=$REMOTE_USER '$1==u{print $6}')" + [ -d "$HOME" ] && exit 0 dd="$HOME/.local/share/desktop-directories"; sd="$dd/SliTazMenu.directory" @@ -311,7 +304,7 @@ for login in $(getdb passwd | cut -d: -f1); do if [ -d "/home/$login" ]; then blocked=''; usericon='user' - if grep -qs "^$login:!" /etc/shadow; then + if getdb shadow | grep -qs "^$login:!"; then blocked='class="color31"' usericon="lock" fi @@ -474,7 +467,7 @@ user="$REMOTE_USER"; host="$(hostname)" xhtml_header "$(_ 'Small quick tweaks for user %s' "$user")" - HOME="$(awk -F: -vu=$user '$1==u{print $6}' /etc/passwd)" + HOME="$(getdb passwd | awk -F: -vu=$user '$1==u{print $6}')" font="${TERM_FONT:-monospace}"; palette=$(echo $TERM_PALETTE | tr A-Z a-z) case $user in root) color=31; ind="#";;