Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -1774,17 +1774,18 @@
 ;;
 (define (get-lock-db sdat dbfile host port)
   (assert host "FATAL: get-lock-db called with host not set.")
   (assert port "FATAL: get-lock-db called with port not set.")
   (let* ((dbh (db:open-run-db dbfile db:initialize-db)) ;; open-run-db creates a standard db with schema used by all situations
-	 (res (db:get-iam-server-lock dbh dbfile host port)))
+	 (res (db:get-iam-server-lock dbh dbfile host port))
+	 (uconn (servdat-uconn sdat)))
     ;; res => list then already locked, check server is responsive
     ;;     => #t then sucessfully got the lock
     ;;     => #f reserved for future use as to indicate something went wrong
     (match res
       ((owner_pid owner_host owner_port event_time)
-       (if (server-ready? owner_host owner_port "abc")
+       (if (server-ready? uconn owner_host owner_port "abc")
 	   #f      ;; locked by someone else
 	   (begin  ;; locked by someone dead and gone
 	     (debug:print 0 *default-log-port* "WARNING: stale lock - have to steal it. This may fail.")
 	     (db:steal-lock-db dbh dbfile port))))
       (#t  #t) ;; placeholder so that we don't touch res if it is #t
@@ -2109,12 +2110,13 @@
     ;; main and run db servers have both got wait logic (could/should merge it)
     (if is-main
 	(rmt:wait-for-server pkts-dir dbname server-key)
 	(rmt:wait-for-stable-interface))
     ;; this is our forever loop
-    (let* ((iface             (servdat-host *server-info*))
-	   (port              (servdat-port *server-info*)))
+    (let* ((iface (servdat-host *server-info*))
+	   (port  (servdat-port *server-info*))
+	   (uconn (servdat-uconn *server-info*)))
       (let loop ((count          0)
 		 (bad-sync-count 0)
 		 (start-time     (current-milliseconds)))
 	(if (and (not is-main)
 		 (common:low-noise-print 60 "servdat-status"))
@@ -2121,11 +2123,11 @@
 	    (debug:print-info 0 *default-log-port* "servdat-status is " (servdat-status *server-info*)))
 
 	;; set up the database handle
 	(mutex-lock! *heartbeat-mutex*)
 	(if (not *dbstruct-db*) ;; no db opened yet, open the db and register with main if appropriate
-	    (let ((watchdog (bdat-watchdog *bdat*)))		 
+	    (let ((watchdog (bdat-watchdog *bdat*)))
 	      (debug:print 0 *default-log-port* "SERVER: dbprep")
 	      (db:setup dbname) ;; sets *dbstruct-db* as side effect
 	      (servdat-status-set! *server-info* 'db-opened)
 	      ;; IFF I'm not main, call into main and register self
 	      (if (not is-main)
@@ -2136,11 +2138,11 @@
 			(servdat-status-set! *server-info* 'have-interface-and-db)
 			;; now check that the db locker is alive, clear it out if not
 			(let* ((serv-info (rmt:get-server-info *toppath* dbname)))
 			  (match serv-info
 			    ((host port servkey pid ipaddr apath dbpath)
-			     (if (not (server-ready? host port servkey))
+			     (if (not (server-ready? uconn host port servkey))
 				 (begin
 				   (debug:print-info 0 *default-log-port* "Server registered but not alive. Removing and trying again.")
 				   (rmt:deregister-server remdat apath host port servkey dbpath) ;; servkey pid ipaddr apath dbpath)
 				   
 				   (loop (+ count 1) bad-sync-count start-time))))
@@ -2212,10 +2214,16 @@
 	    (shutdown-server-sequence (get-host-name) port)
 	    #;(debug:print-info 0 *default-log-port* "Sending 'quit to server, received: "
 			      (open-send-receive-nn (conc iface":"port)      ;; do this here and not in server-shutdown
 						    (sexpr->string 'quit)))
 	    )))))))
+
+(define (rmt:get-reasonable-hostname)
+  (let* ((inhost (or (args:get-arg "-server") "-")))
+    (if (equal? inhost "-")
+	(get-host-name)
+	inhost)))
 
 ;; Call this to start the actual server
 ;;
 ;; all routes though here end in exit ...
 ;;
@@ -2223,14 +2231,12 @@
 ;;
 (define (rmt:server-launch dbname)
   (debug:print-info 0 *default-log-port* "Entered rmt:server-launch")
   (let* ((th2 (make-thread (lambda ()
 			     (debug:print-info 0 *default-log-port* "Server run thread started")
-			     (rmt:run (if (args:get-arg "-server")
-					  (args:get-arg "-server")
-					  "-")
-				      )) "Server run"))
+			     (rmt:run (rmt:get-reasonable-hostname)))
+			   "Server run"))
 	 (th3 (make-thread (lambda ()
 			     (debug:print-info 0 *default-log-port* "Server monitor thread started")
 			     (rmt:keep-running dbname)
 			     "Keep running"))))
     (thread-start! th2)

ADDED   rununit.sh
Index: rununit.sh
==================================================================
--- /dev/null
+++ rununit.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+rm tests/*log tests/simplerun/logs/*
+
+script -c 'ck5 make unit'

Index: tests/simplerun/Makefile
==================================================================
--- tests/simplerun/Makefile
+++ tests/simplerun/Makefile
@@ -1,3 +1,5 @@
 
 cleanup :
-	killall mtest -v -9;rm -rf .meta .db
+	killall mtest -v -9 || true
+	rm -rf *.log *.bak NB* logs/* .meta .db
+

Index: ulex/ulex.scm
==================================================================
--- ulex/ulex.scm
+++ ulex/ulex.scm
@@ -402,12 +402,7 @@
 (define (get-all-ips)
   (map address-info-host
        (filter (lambda (x)
 		 (equal? (address-info-type x) "tcp"))
 	       (address-infos (get-host-name)))))
-
-;; (map ip->string (vector->list 
-;; 		   (hostinfo-addresses
-;; 		    (host-information (current-hostname))))))
-
 
 )