X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/e55761b186abf435d15e9e9229df76f0b6cd9a59..799e58b96ef4948629d5e1b5401f537d74082ab7:/server/admin.c

diff --git a/server/admin.c b/server/admin.c
index 228cce15..e8920547 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -313,6 +313,26 @@ void a_vformat(dstr *d, const char *fmt, va_list ap)
   dstr_destroy(&dd);
 }
 
+/* --- @a_format@ --- *
+ *
+ * Arguments:	@dstr *d@ = where to leave the formatted message
+ *		@const char *fmt@ = pointer to format string
+ *
+ * Returns:	---
+ *
+ * Use:		Writes a tokenized message into a string, for later
+ *		presentation.
+ */
+
+void a_format(dstr *d, const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start(ap, fmt);
+  a_vformat(d, fmt, ap);
+  va_end(ap);
+}
+
 /* --- @a_write@, @a_vwrite@ --- *
  *
  * Arguments:	@admin *a@ = admin connection to write to
@@ -1232,7 +1252,7 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
   add->peer.tag = 0;
   add->peer.t_ka = 0;
   add->peer.tops = tun_default;
-  add->peer.kxf = 0;
+  add->peer.f = 0;
 
   /* --- Parse options --- */
 
@@ -1252,12 +1272,13 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
       }
     })
     OPTTIME("-keepalive", t, { add->peer.t_ka = t; })
-    OPT("-cork", { add->peer.kxf |= KXF_CORK; })
+    OPT("-cork", { add->peer.f |= KXF_CORK; })
     OPTARG("-key", arg, {
       if (add->peer.tag)
 	xfree(add->peer.tag);
       add->peer.tag = xstrdup(arg);
     })
+    OPT("-mobile", { add->peer.f |= PSF_MOBILE; })
   });
 
   /* --- Make sure someone's not got there already --- */
@@ -2213,19 +2234,21 @@ void a_daemon(void) { flags |= F_DAEMON; }
  * Arguments:	@const char *name@ = socket name to create
  *		@uid_t u@ = user to own the socket
  *		@gid_t g@ = group to own the socket
+ *		@mode_t m@ = permissions to set on the socket
  *
  * Returns:	---
  *
  * Use:		Creates the admin listening socket.
  */
 
-void a_init(const char *name, uid_t u, gid_t g)
+void a_init(const char *name, uid_t u, gid_t g, mode_t m)
 {
   int fd;
   int n = 5;
   struct sockaddr_un sun;
   struct sigaction sa;
   size_t sz;
+  mode_t omask;
 
   /* --- Create services table --- */
 
@@ -2243,7 +2266,7 @@ void a_init(const char *name, uid_t u, gid_t g)
 
   /* --- Attempt to bind to the socket --- */
 
-  umask(0077);
+  omask = umask(0077);
 again:
   if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
     die(EXIT_FAILURE, "couldn't create socket: %s", strerror(errno));
@@ -2274,12 +2297,15 @@ again:
     close(fd);
     goto again;
   }
-  chmod(sun.sun_path, 0600);
   if (chown(sun.sun_path, u, g)) {
-    T( trace(T_ADMIN,
-	     "admin: failed to give away socket: %s",
-	     strerror(errno)); )
+    die(EXIT_FAILURE, "failed to set socket owner: %s",
+	strerror(errno));
+  }
+  if (chmod(sun.sun_path, m)) {
+    die(EXIT_FAILURE, "failed to set socket permissions: %s",
+	strerror(errno));
   }
+  umask(omask);
   fdflags(fd, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
   if (listen(fd, 5))
     die(EXIT_FAILURE, "couldn't listen on socket: %s", strerror(errno));