From: Wouter Wijngaards Date: Tue, 1 Dec 2015 08:54:53 +0000 (+0000) Subject: - Fixup 724 fix for fname_after_chroot() calls. X-Git-Tag: release-1.5.7rc1~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=128370ac147f41859e10e1ca792cd6580f52abf9;p=thirdparty%2Funbound.git - Fixup 724 fix for fname_after_chroot() calls. git-svn-id: file:///svn/unbound/trunk@3557 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index b8adac888..2f834f196 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +1 December 2015: Wouter + - Fixup 724 fix for fname_after_chroot() calls. + 30 November 2015: Ralph - Implemented qname minimisation diff --git a/winrc/win_svc.c b/winrc/win_svc.c index 24a4ce7eb..09b78adbc 100644 --- a/winrc/win_svc.c +++ b/winrc/win_svc.c @@ -346,6 +346,12 @@ service_init(int r, struct daemon** d, struct config_file** c) (strrchr(dirbuf, '\\'))[0] = 0; } else log_err("GetModuleFileName had no path"); dir = dirbuf; + if(dirbuf[0]) { + /* adjust cfg->directory for the + * fname_after_chroot calls later to work */ + free(cfg->directory); + cfg->directory = memdup(dir, strlen(dir)+1); + } } if(chdir(dir)) { log_err("could not chdir to %s: %s",