svc/conntrack.in (straddr): Handle `None' as a packed address.

[tripe] / server / admin.c

diff --git a/server/admin.c b/server/admin.c
index 16ab8a35ac520319343aebbb3da13af602cfb1d5..25581f656479b7f9cc680c1d7782e559502a645d 100644 (file)
--- a/server/admin.c
+++ b/server/admin.c
@@ -1731,18 +1731,33 @@ static void acmd_algs(admin *a, unsigned ac, char *av[])
         "hash-sz=%lu", (unsigned long)algs->h->hashsz,
         A_END);
   a_info(a,
-        "cipher=%s", algs->c->name,
-        "cipher-keysz=%lu", (unsigned long)algs->cksz,
-        "cipher-blksz=%lu", (unsigned long)algs->c->blksz,
+        "bulk-transform=%s", algs->bulk->name,
+        "bulk-overhead=%lu", (unsigned long)algs->bulk->overhead(algs),
         A_END);
+  if (algs->c) {
+    a_info(a,
+          "cipher=%s", algs->c->name,
+          "cipher-keysz=%lu", (unsigned long)algs->cksz,
+          "cipher-blksz=%lu", (unsigned long)algs->c->blksz,
+          A_END);
+  }
   a_info(a,
         "cipher-data-limit=%lu", (unsigned long)algs->expsz,
         A_END);
-  a_info(a,
-        "mac=%s", algs->m->name,
-        "mac-keysz=%lu", (unsigned long)algs->mksz,
-        "mac-tagsz=%lu", (unsigned long)algs->tagsz,
-        A_END);
+  if (algs->m) {
+    a_info(a,
+          "mac=%s", algs->m->name,
+          "mac-keysz=%lu", (unsigned long)algs->mksz,
+          "mac-tagsz=%lu", (unsigned long)algs->tagsz,
+          A_END);
+  }
+  if (algs->b) {
+    a_info(a,
+          "blkc=%.*s", strlen(algs->b->name) - 4, algs->b->name,
+          "blkc-keysz=%lu", (unsigned long)algs->bksz,
+          "blkc-blksz=%lu", (unsigned long)algs->b->blksz,
+          A_END);
+  }
   a_ok(a);
 }