diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-12-11 19:11:23 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-12-11 19:11:23 +0000 |
| commit | 1a7a0c79040d9efa654c151d8a057f34eb9be585 (patch) | |
| tree | 8874b1684780bba3713fdb59d85fdea7b5a1086a /src/conn-tools/s6-ipcserver.c | |
| parent | 6ee2e470aa4c66b3477449e7f48343b706c70ddc (diff) | |
| download | s6-1a7a0c79040d9efa654c151d8a057f34eb9be585.tar.xz | |
Add "-a perms" option to s6-ipcserver(-socketbinder)
Diffstat (limited to 'src/conn-tools/s6-ipcserver.c')
| -rw-r--r-- | src/conn-tools/s6-ipcserver.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/conn-tools/s6-ipcserver.c b/src/conn-tools/s6-ipcserver.c index f259c15..03f6eb9 100644 --- a/src/conn-tools/s6-ipcserver.c +++ b/src/conn-tools/s6-ipcserver.c @@ -8,7 +8,7 @@ #include <skalibs/djbunix.h> #include <s6/config.h> -#define USAGE "s6-ipcserver [ -q | -Q | -v ] [ -d | -D ] [ -P | -p ] [ -1 ] [ -c maxconn ] [ -C localmaxconn ] [ -b backlog ] [ -G gid,gid,... ] [ -g gid ] [ -u uid ] [ -U ] path prog..." +#define USAGE "s6-ipcserver [ -q | -Q | -v ] [ -d | -D ] [ -P | -p ] [ -1 ] [ -c maxconn ] [ -C localmaxconn ] [ -b backlog ] [ -a socketperms ] [ -G gid,gid,... ] [ -g gid ] [ -u uid ] [ -U ] path prog..." #define dieusage() strerr_dieusage(100, USAGE) int main (int argc, char const *const *argv, char const *const *envp) @@ -25,12 +25,13 @@ int main (int argc, char const *const *argv, char const *const *envp) unsigned int maxconn = 0 ; unsigned int localmaxconn = 0 ; unsigned int backlog = (unsigned int)-1 ; + unsigned int socketperms = 0777 ; PROG = "s6-ipcserver" ; { subgetopt_t l = SUBGETOPT_ZERO ; for (;;) { - int opt = subgetopt_r(argc, argv, "qQvDd1UPpc:C:b:u:g:G:", &l) ; + int opt = subgetopt_r(argc, argv, "qQvDd1UPpc:C:b:a:u:g:G:", &l) ; if (opt == -1) break ; switch (opt) { @@ -44,6 +45,7 @@ int main (int argc, char const *const *argv, char const *const *envp) case 'c' : if (!uint0_scan(l.arg, &maxconn)) dieusage() ; if (!maxconn) maxconn = 1 ; break ; case 'C' : if (!uint0_scan(l.arg, &localmaxconn)) dieusage() ; if (!localmaxconn) localmaxconn = 1 ; break ; case 'b' : if (!uint0_scan(l.arg, &backlog)) dieusage() ; break ; + case 'a' : if (!uint0_oscan(l.arg, &socketperms)) dieusage() ; break ; case 'u' : if (!uid0_scan(l.arg, &uid)) dieusage() ; break ; case 'g' : if (!gid0_scan(l.arg, &gid)) dieusage() ; break ; case 'G' : if (!gid_scanlist(gids, NGROUPS_MAX, l.arg, &gidn) && *l.arg) dieusage() ; break ; @@ -59,8 +61,8 @@ int main (int argc, char const *const *argv, char const *const *envp) { size_t pos = 0 ; unsigned int m = 0 ; - char fmt[UINT_FMT * 3 + UID_FMT + GID_FMT * (NGROUPS_MAX+1)] ; - char const *newargv[24 + argc] ; + char fmt[UINT_FMT * 3 + 5 + UID_FMT + GID_FMT * (NGROUPS_MAX+1)] ; + char const *newargv[26 + argc] ; newargv[m++] = S6_BINPREFIX "s6-ipcserver-socketbinder" ; if (!flagreuse) newargv[m++] = "-D" ; if (backlog != (unsigned int)-1) @@ -71,6 +73,14 @@ int main (int argc, char const *const *argv, char const *const *envp) pos += uint_fmt(fmt + pos, backlog) ; fmt[pos++] = 0 ; } + if (socketperms != 0777) + { + newargv[m++] = "-a" ; + newargv[m++] = fmt + pos ; + fmt[pos++] = '0' ; + pos += uint_ofmt(fmt + pos, socketperms & 0777) ; + fmt[pos++] = 0 ; + } newargv[m++] = "--" ; newargv[m++] = *argv++ ; if (flagU || uid || gid || gidn != (size_t)-1) |