diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2007-10-25 23:12:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2007-10-25 23:12:23 -0400 |
| commit | 1e1e1f504609f97cad70d5dca964f8fb3cdfecaa (patch) | |
| tree | 65768346a1d7f35fb3d39322ac4e58fd68b1aa94 | |
| parent | 11968615dfad0a9564d66d801aa2921a7613602b (diff) | |
* ikiwiki-mass-rebuild: Patch from HenrikBrixAndersen to fix order
* ikiwiki-mass-rebuild: Don't clear PATH from the environment.
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | doc/bugs/ikiwiki-mass-rebuild_fails_to_drop_privileges_and_execute_ikiwiki.mdwn | 2 | ||||
| -rwxr-xr-x | ikiwiki-mass-rebuild | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 8cca88780..428339e70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,10 +16,11 @@ ikiwiki (2.11) UNRELEASED; urgency=low * Add handling of feeds for nested inlines, as well as support for a single page containing two different feeds. * Also fixed some places in inline that failed to use destpage correctly. - * ikiwiki-mass-rebuild: Patch from HenrikBrixAndersen to fix order + * ikiwiki-mass-rebuild: Patch from HenrikBrixAndersen to fix order of permissions dropping code to work on FreeBSD. + * ikiwiki-mass-rebuild: Don't clear PATH from the environment. - -- Joey Hess <joeyh@debian.org> Thu, 25 Oct 2007 07:52:43 -0400 + -- Joey Hess <joeyh@debian.org> Thu, 25 Oct 2007 23:11:13 -0400 ikiwiki (2.10) unstable; urgency=low diff --git a/doc/bugs/ikiwiki-mass-rebuild_fails_to_drop_privileges_and_execute_ikiwiki.mdwn b/doc/bugs/ikiwiki-mass-rebuild_fails_to_drop_privileges_and_execute_ikiwiki.mdwn index 9bf6134bf..2eaca7632 100644 --- a/doc/bugs/ikiwiki-mass-rebuild_fails_to_drop_privileges_and_execute_ikiwiki.mdwn +++ b/doc/bugs/ikiwiki-mass-rebuild_fails_to_drop_privileges_and_execute_ikiwiki.mdwn @@ -6,6 +6,8 @@ The solution is to set the effective UID after setting the real UID, and to set > > It doesn't - it needs to be set. The line with `%ENV=();` clears the environment, thus no `$PATH` is set. --[[HenrikBrixAndersen]] +> > > I guess it shouldn't clear it then. Both [[done]] --[[Joey]] + Proposed patch: --- ikiwiki-mass-rebuild.orig 2007-08-15 22:21:59.000000000 +0200 diff --git a/ikiwiki-mass-rebuild b/ikiwiki-mass-rebuild index fa8bd913d..1ec90b3c0 100755 --- a/ikiwiki-mass-rebuild +++ b/ikiwiki-mass-rebuild @@ -27,8 +27,10 @@ sub processline { if ($< != $uuid || $> != $uuid || $( != $ugid || $) ne "$ugid $ugid") { die "failed to drop permissions to $user"; } - %ENV=(); - $ENV{HOME}=(getpwnam($user))[7]; + %ENV=( + PATH => $ENV{PATH}, + HOME => (getpwnam($user))[7], + ); exec("ikiwiki", "-setup", $setup, @ARGV); die "failed to run ikiwiki: $!"; } |