Clean up the dump format: report addresses of clients, and fall back one

tab.  The old dump format was written for when we grouped clients by host
manager.

2 files changed, 3 insertions, 3 deletions

diff --git a/server/client.c b/server/client.c
index 2dca538..2c41b77 100644
--- a/server/client.c
+++ b/server/client.c
@@ -187,8 +187,8 @@ client_dump_clients(fp)
 
     for (i = 0; i < HASHSIZE; i++) {
 	for (client = client_bucket[i]; client; client = client->next) {
-	    fprintf(fp, "\t%d (%s):\n", ntohs(client->addr.sin_port),
-		    client->principal->string);
+	    fprintf(fp, "%s/%d (%s):\n", inet_ntoa(client->addr.sin_addr),
+		    ntohs(client->addr.sin_port), client->principal->string);
 	    subscr_dump_subs(fp, client->subs);
 	}
     }
diff --git a/server/subscr.c b/server/subscr.c
index b0cda3d..43f406d 100644
--- a/server/subscr.c
+++ b/server/subscr.c
@@ -1006,7 +1006,7 @@ subscr_dump_subs(fp, subs)
 	return;
 
     for (; subs; subs = subs->next) {
-	fputs("\t\t'", fp);
+	fputs("\t'", fp);
 	dump_quote(subs->dest.classname->string, fp);
 	fputs("' '", fp);
 	dump_quote(subs->dest.inst->string, fp);