From 4029d3d4f33f91f6bd80d3054e203693927bd105 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sun, 26 Apr 2020 14:49:43 +0200 Subject: [PATCH] proxy.dropPrivilege() doesn't return on success --- dnscrypt-proxy/config.go | 1 + dnscrypt-proxy/privilege_darwin.go | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dnscrypt-proxy/config.go b/dnscrypt-proxy/config.go index c1c01148..0d85865a 100644 --- a/dnscrypt-proxy/config.go +++ b/dnscrypt-proxy/config.go @@ -561,6 +561,7 @@ func ConfigLoad(proxy *Proxy, flags *ConfigFlags) error { // if 'userName' is set and we are the parent process drop privilege and exit if len(proxy.userName) > 0 && !proxy.child { proxy.dropPrivilege(proxy.userName, FileDescriptors) + dlog.Fatal("Dropping privileges is not supporting on this operating system. Unset `user_name` in the configuration file.") } if err := proxy.SystemDListeners(); err != nil { dlog.Fatal(err) diff --git a/dnscrypt-proxy/privilege_darwin.go b/dnscrypt-proxy/privilege_darwin.go index 2279e658..700f734e 100644 --- a/dnscrypt-proxy/privilege_darwin.go +++ b/dnscrypt-proxy/privilege_darwin.go @@ -2,10 +2,7 @@ package main import ( "os" - - "github.com/jedisct1/dlog" ) func (proxy *Proxy) dropPrivilege(userStr string, fds []*os.File) { - dlog.Warn("Dropping privileges doesn't work reliably on MacOS") }