server/tripe.h: Allow `break' from FOREACH_PEER.

[tripe] / server / admin.c

diff --git a/server/admin.c b/server/admin.c
index 7aa1678d33143cb90b21d1dafc06f08e00e36330..8eb5ec3ca5a16d3565739ffdea48ff553c75e13f 100644 (file)
--- a/server/admin.c
+++ b/server/admin.c
@@ -2213,13 +2213,14 @@ 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;
@@ -2275,11 +2276,13 @@ 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);