Intégration de la branche release-1.3.0

This commit is contained in:
Jephté Clain 2015-04-24 12:33:31 +04:00
commit 05016e76ad
4 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,8 @@
## Version 1.3.0 du 24/04/2015-12:32
bdc6e9b Intégration de la branche localhost
94b2b48 reconnaitre la valeur spéciale localhost pour check_hostname()
## Version 1.2.4 du 20/04/2015-17:55 ## Version 1.2.4 du 20/04/2015-17:55
988e045 bug 988e045 bug

View File

@ -1 +1 @@
1.2.4 1.3.0

View File

@ -1 +1 @@
008002003 008003000

View File

@ -1728,11 +1728,13 @@ function ensure_user() {
} }
function check_hostname() { function check_hostname() {
# Vérifier si le hostname courant est l'un des hôtes $1..* # Vérifier si le hostname courant est l'un des hôtes $1..*
# localhost matche toujours
local userhost user host path local userhost user host path
for userhost in "$@"; do for userhost in "$@"; do
splitfsep "$userhost" : userhost path splitfsep "$userhost" : userhost path
splituserhost "$userhost" user host splituserhost "$userhost" user host
[ "$MYHOSTNAME" == "${host%%.*}" ] && return 0 host="${host%%.*}"
[ "$host" == localhost -o "$host" == "$MYHOSTNAME" ] && return 0
done done
return 1 return 1
} }