Merge branch 'maint'

lib/kernel/test/inet_res_SUITE_data/run-named

@@ -47,7 +47,6 @@ CONF_FILE=named.conf
 INC_FILE=named_inc.conf
 PID_FILE=named.pid
 LOG_FILE=named.log
-EXIT_FILE=named.exit
 
 error () {
     r=$?
@@ -150,27 +149,27 @@ cat >>"$CONF_FILE" <<-CONF_FILE
 ( cd "$SRCDIR" && ls -1 ) | while read f; do
     cp -fp "$SRCDIR/$f" .
 done
-rm -f "$EXIT_FILE"
 
 # Start nameserver
 echo "Cwd: `pwd`"
 echo "Nameserver: $NAMED_VER"
 echo "Port: $2"
 echo "ZoneDir: $3"
 echo "Command: $NAMED $NAMED_FG -c $CONF_FILE"
-($NAMED $NAMED_FG -c "$CONF_FILE" >"$LOG_FILE" 2>&1 </dev/null; \
- echo "$?" >"$EXIT_FILE")&
+$NAMED $NAMED_FG -c "$CONF_FILE" >"$LOG_FILE" 2>&1 </dev/null &
 NAMED_PID=$!
+echo "Pid: $NAMED_PID"
 trap "kill -TERM $NAMED_PID >/dev/null 2>&1; wait $NAMED_PID >/dev/null 2>&1" \
     0 1 2 3 15
+
 sleep 5 # Give name server time to load its zone files
-if [ -f "$EXIT_FILE" ]; then
-    ERROR="`cat "$EXIT_FILE"`"
-    (exit "$ERROR")& error "$NAMED returned $ERROR on start"
-else
+
+if ps p $NAMED_PID; then
     echo "Running: Enter \`\`quit'' to terminate nameserver[$NAMED_PID]..."
     while read LINE; do
 	test :"$LINE" = :'quit' && break
     done
+else
+    wait $NAMED_PID; error "$NAMED failed to start"
 fi
 echo "Closing: Terminating nameserver..."