MAAS

Merge lp:~smoser/maas/revert-1151 into lp:maas/trunk

  1. revert-1151
  2. Merge into trunk
Proposed by Scott Moser on 2012-10-03
Status: Merged
Merge reported by: Scott Moser
Merged at revision: not available
Proposed branch: lp:~smoser/maas/revert-1151
Merge into: lp:maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/provisioningserver/start_cluster_controller.py (+1/-1)
To merge this branch: bzr merge lp:~smoser/maas/revert-1151
Reviewer Review Type Date Requested Status
John A Meinel Approve on 2012-10-03
Gavin Panella (community) 2012-10-03 Approve on 2012-10-03
Review via email: mp+127778@code.launchpad.net

Description of the Change

revert revno 1150 as it incorrectly reverted a fix in 1147

To post a comment you must log in.
Gavin Panella (allenap) :
review: Approve
John A Meinel (jameinel) :
review: Approve
MAAS Lander (maas-lander) wrote :

No commit message specified.

Gavin Panella (allenap) wrote :

https://code.launchpad.net/~allenap/maas/setuid-setgid-ordering/+merge/127801 supersedes this (though there's no harm in landing this earlier).

Scott Moser (smoser) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/start_cluster_controller.py'
2--- src/provisioningserver/start_cluster_controller.py 2012-10-03 13:41:23 +0000
3+++ src/provisioningserver/start_cluster_controller.py 2012-10-03 14:29:23 +0000
4@@ -139,8 +139,8 @@
5
6 # Change gid first, just in case changing the uid might deprive
7 # us of the privileges required to setgid.
8+ os.setgid(gid)
9 os.setuid(uid)
10- os.setgid(gid)
11
12 os.execvpe(command[0], command, env=env)
13