Only remove socket files with ``set server open''.

Only show the mask in ``show bundle'' when it's been specified.
Complain about unexpected arguments after ``set server {none,open,closed}''
Log re-open failures as warnings rather than phase messages.
Fix some markup for the ``set server'' man page description.

1 files changed, 6 insertions, 5 deletions

diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index 1005ed2..9aea891 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -1183,11 +1183,12 @@ bundle_ShowStatus(struct cmdargs const *arg)
   prompt_Printf(arg->prompt, " Auth name:         %s\n",
                 arg->bundle->cfg.auth.name);
   prompt_Printf(arg->prompt, " Diagnostic socket: ");
-  if (*server.cfg.sockname != '\0')
-    prompt_Printf(arg->prompt, "%s, mask 0%03o%s\n",
-                  server.cfg.sockname, (int)server.cfg.mask,
-                  server.fd == -1 ? " (not open)" : "");
-  else if (server.cfg.port != 0)
+  if (*server.cfg.sockname != '\0') {
+    prompt_Printf(arg->prompt, "%s", server.cfg.sockname);
+    if (server.cfg.mask != (mode_t)-1)
+      prompt_Printf(arg->prompt, ", mask 0%03o", (int)server.cfg.mask);
+    prompt_Printf(arg->prompt, "%s\n", server.fd == -1 ? " (not open)" : "");
+  } else if (server.cfg.port != 0)
     prompt_Printf(arg->prompt, "TCP port %d%s\n", server.cfg.port,
                   server.fd == -1 ? " (not open)" : "");
   else