diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php index aa6ac616..1ffa29c4 100644 --- a/bureau/class/m_dom.php +++ b/bureau/class/m_dom.php @@ -467,6 +467,7 @@ class m_dom { if (preg_match('#^whois:#', $ligne)) { $serveur=preg_replace('/whois:\ */','',$ligne,1); } } } + $serveur=str_replace(array(" ","\n"),"",$serveur); $egal=""; switch($ext) { diff --git a/src/update_domains.sh b/src/update_domains.sh index 0a3e2e33..a5bc1044 100644 --- a/src/update_domains.sh +++ b/src/update_domains.sh @@ -135,10 +135,11 @@ if [ ! -z "$(cat "$RELOAD_WEB")" ] ; then fi # we assume we run apache and bind on the master -/usr/bin/alternc_reload $( cat "$RELOAD_ZONES") || true +tempo=$(cat "$RELOAD_ZONES"|tr '\n' ' ') +/usr/bin/alternc_reload $tempo || true for slave in $ALTERNC_SLAVES; do if [ "$slave" != "localhost" ]; then - ssh alternc@$slave alternc_reload $(cat "$RELOAD_ZONES") || true + ssh alternc@$slave alternc_reload $tempo || true fi done @@ -146,4 +147,3 @@ rm -f "$LOCK_FILE" "$RELOAD_ZONES" "$RELOAD_WEB" exit 0 -