diff --git a/CHANGES.txt b/CHANGES.txt index e776dbf..f06196d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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 988e045 bug diff --git a/VERSION.txt b/VERSION.txt index e8ea05d..f0bb29e 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -1.2.4 +1.3.0 diff --git a/lib/ulib/.ulibver b/lib/ulib/.ulibver index 8253a0f..f23e110 100644 --- a/lib/ulib/.ulibver +++ b/lib/ulib/.ulibver @@ -1 +1 @@ -008002003 +008003000 diff --git a/lib/ulib/base b/lib/ulib/base index 40c523d..711cb8b 100644 --- a/lib/ulib/base +++ b/lib/ulib/base @@ -1728,11 +1728,13 @@ function ensure_user() { } function check_hostname() { # Vérifier si le hostname courant est l'un des hôtes $1..* +# localhost matche toujours local userhost user host path for userhost in "$@"; do splitfsep "$userhost" : userhost path splituserhost "$userhost" user host - [ "$MYHOSTNAME" == "${host%%.*}" ] && return 0 + host="${host%%.*}" + [ "$host" == localhost -o "$host" == "$MYHOSTNAME" ] && return 0 done return 1 }