mirror of
https://github.com/openbsd/ports.git
synced 2026-06-18 07:24:23 +02:00
03173db5df
OK: sthen@
28 lines
866 B
Plaintext
28 lines
866 B
Plaintext
Re-instate the chroot by default code.
|
|
|
|
Index: conv.c
|
|
--- conv.c.orig
|
|
+++ conv.c
|
|
@@ -289,7 +289,9 @@ daemonize_finish(void)
|
|
* For security, chroot (optionally) and drop privileges.
|
|
* Pass a NULL chroot_dir to disable chroot() behaviour.
|
|
*/
|
|
-void privdrop(const char *chroot_dir, const char *privdrop_user) {
|
|
+void
|
|
+privdrop(const char *chroot_dir, const char *privdrop_user)
|
|
+{
|
|
struct passwd *pw;
|
|
|
|
errno = 0;
|
|
@@ -301,9 +303,7 @@ void privdrop(const char *chroot_dir, const char *priv
|
|
else
|
|
err(1, "getpwnam(\"%s\") failed", privdrop_user);
|
|
}
|
|
- if (chroot_dir == NULL) {
|
|
- verbosef("no --chroot dir specified, darkstat will not chroot()");
|
|
- } else {
|
|
+ if (chroot_dir != NULL) {
|
|
/* Read /etc/localtime before we chroot. This works on FreeBSD but not
|
|
* on Linux / with glibc (as of 2.22) */
|
|
tzset();
|