arsv
diff --git a/‎configure‎
Lines changed: 2 additions & 5 deletions b/‎configure‎
Lines changed: 2 additions & 5 deletions
diff --git a/‎lib/nlusctl/addr_bind.c‎
Lines changed: 8 additions & 21 deletions b/‎lib/nlusctl/addr_bind.c‎
Lines changed: 8 additions & 21 deletions
@@ -6,11 +6,10 @@ uselds=yes   # use custom ld script if available for the target
 
 # Configurable global paths for config.h
 
-BASE_BIN="/base/bin"
 BASE_ETC="/base/etc"     # config files
-BASE_VAR="/var/base"     # saved state
+BASE_VAR="/base/var"     # saved state
 INIT_ETC="/etc"          # config files in initrd mode
-RUN_CTRL="/run/ctrl"     # control sockets
+RUN_CTRL="/base/run"     # control sockets
 
 HERE=""  # gets prepended to misc global paths, HERE "/run" -> "./run"
 
@@ -193,7 +192,6 @@ fi
 chmod a+x mini-cc
 
 cat > config.h <<END
-#define BASE_BIN "$BASE_BIN"
 #define BASE_ETC "$BASE_ETC"
 #define BASE_VAR "$BASE_VAR"
 #define INIT_ETC "$INIT_ETC"
@@ -212,7 +210,6 @@ echo "  STRIP = $strip"
 echo "  CFLAGS = $cflags"
 test -n "$qemu" && echo "  QEMU = $qemu"
 echo
-echo "  BASE_BIN = $BASE_BIN"
 echo "  BASE_ETC = $BASE_ETC"
 echo "  BASE_VAR = $BASE_VAR"
 echo "  INIT_ETC = $INIT_ETC"
 
@@ -19,29 +19,19 @@
    If at some point sticky sockets become an option, this function should be
    removed. But that is not expected to happen soon, so for now, it's here. */
 
-/* Regarding umask use: in Linux, file permissions on local sockets do matter,
-   but handling them is quite difficult, and considering the planned security
-   model for this project, most likely pointless. It is pretty much decided
-   that permissions will be set (statically) on the directory instead. To make
-   that work, we force 0777 on sockets here, otherwise the missing bits would
-   change effective permissions.
+/* Regarding socket permissions: by default it's uid/gid/~umask of the
+   process, just like any other files, but actual usage will likely require
+   different permissions *and* different gid. It is possible to chmod it here
+   (for instance by temporarily setting particular umask) but there's no good
+   way to change gid, so it will likely require external efforts.
 
-   There are no other ways of passing initial socket permissions in Linux
-   afaik. In pretty much all cases, current umask will NOT be 0000, in fact
-   using 0000 outside of this code is a pretty bad idea for most services.
-
-   Note in BSD things work exactly like that, without any umask calls, because
-   they just ignore file permissions on sockets. */
+   If not done here, it's the same problem as with device access, so whatever
+   will get implemented with devices might also apply to the sockets. */
 
 int uc_listen(int fd, const char* path, int backlog)
 {
-	int ret, mask = 0000;
 	struct sockaddr_un addr;
-
-	if((ret = sys_umask(mask)) < 0)
-		goto err;
-
-	mask = ret;
+	int ret;
 
 	if((ret = uc_address(&addr, path)) < 0)
 		goto err;
@@ -57,9 +47,6 @@ int uc_listen(int fd, const char* path, int backlog)
 	if((ret = sys_bind(fd, &addr, sizeof(addr))) < 0)
 		goto err;
 got:
-	if((ret = sys_umask(mask)) < 0)
-		goto err;
-
 	ret = sys_listen(fd, backlog);
 err:
 	return ret;