29 lines
975 B
Plaintext
29 lines
975 B
Plaintext
$OpenBSD: patch-conv_c,v 1.2 2015/05/25 06:01:43 ajacoutot Exp $
|
|
|
|
Re-instate the chroot by default code.
|
|
|
|
--- conv.c.orig Sun May 24 03:40:25 2015
|
|
+++ conv.c Sun May 24 16:31:58 2015
|
|
@@ -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) {
|
|
tzset(); /* read /etc/localtime before we chroot */
|
|
if (chdir(chroot_dir) == -1)
|
|
err(1, "chdir(\"%s\") failed", chroot_dir);
|