diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2016-11-26 10:04:40 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2016-11-26 10:04:40 +0000 |
| commit | 08e88c5efc65a6f49da40aa002bc5f4b0ebee49d (patch) | |
| tree | 21a3feb40eb54e5f5152cc8605f4c5e07e85052b /src/conn-tools/s6-tlsd.c | |
| parent | 9e6464c5f9d82158d81c027207594b5e12a94ca5 (diff) | |
| download | s6-networking-08e88c5efc65a6f49da40aa002bc5f4b0ebee49d.tar.xz | |
Add -z option to s6-tlsc/s6-tlsd to clean TLS env vars before spawning (default)
Diffstat (limited to 'src/conn-tools/s6-tlsd.c')
| -rw-r--r-- | src/conn-tools/s6-tlsd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/conn-tools/s6-tlsd.c b/src/conn-tools/s6-tlsd.c index 6a6d4ef..a4a1d4c 100644 --- a/src/conn-tools/s6-tlsd.c +++ b/src/conn-tools/s6-tlsd.c @@ -30,7 +30,7 @@ #endif -#define USAGE "s6-tlsd [ -S | -s ] [ -Y | -y ] [ -v verbosity ] [ -K timeout ] prog..." +#define USAGE "s6-tlsd [ -S | -s ] [ -Y | -y ] [ -v verbosity ] [ -K timeout ] [ -Z | -z ] prog..." #define dieusage() strerr_dieusage(100, USAGE) int main (int argc, char const *const *argv, char const *const *envp) @@ -39,7 +39,7 @@ int main (int argc, char const *const *argv, char const *const *envp) unsigned int verbosity = 1 ; uid_t uid = 0 ; gid_t gid = 0 ; - uint32_t preoptions = 0 ; + uint32_t preoptions = 2 ; uint32_t options = 1 ; PROG = "s6-tlsd" ; @@ -48,7 +48,7 @@ int main (int argc, char const *const *argv, char const *const *envp) unsigned int t = 0 ; for (;;) { - register int opt = subgetopt_r(argc, argv, "SsYyv:K:", &l) ; + register int opt = subgetopt_r(argc, argv, "SsYyv:K:Zz", &l) ; if (opt == -1) break ; switch (opt) { @@ -58,6 +58,8 @@ int main (int argc, char const *const *argv, char const *const *envp) case 'y' : preoptions |= 1 ; break ; case 'v' : if (!uint0_scan(l.arg, &verbosity)) dieusage() ; break ; case 'K' : if (!uint0_scan(l.arg, &t)) dieusage() ; break ; + case 'Z' : preoptions &= ~(uint32_t)2 ; break ; + case 'z' : preoptions |= 2 ; break ; default : dieusage() ; } } |