Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: service: do not use users from configuration if non-root ......................................................................
packaging: service: do not use users from configuration if non-root Change-Id: Ic28aaae513b1dcde2d18cbae12f8ac35a341b466 Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/fedora/engine-service.py.in 1 file changed, 16 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/13033/1 diff --git a/packaging/fedora/engine-service.py.in b/packaging/fedora/engine-service.py.in index 2cd27c8..3db9812 100644 --- a/packaging/fedora/engine-service.py.in +++ b/packaging/fedora/engine-service.py.in @@ -200,25 +200,27 @@ # Get the id of the engine user: global engineUid - engineUser = engineConfig.getString("ENGINE_USER") - if engineUser: - try: - engineUid = pwd.getpwnam(engineUser).pw_uid - except: - raise Exception("The engine user \"%s\" doesn't exist." % engineUser) + if os.geteuid() == 0: + engineUser = engineConfig.getString("ENGINE_USER") + if engineUser: + try: + engineUid = pwd.getpwnam(engineUser).pw_uid + except: + raise Exception("The engine user \"%s\" doesn't exist." % engineUser) else: - engineUid = os.getuid() + engineUid = os.geteuid() # Get id of the engine group: global engineGid - engineGroup = engineConfig.getString("ENGINE_GROUP") - if engineGroup: - try: - engineGid = grp.getgrnam(engineGroup).gr_gid - except: - raise Exception("The engine group \"%s\" doesn't exist." % engineGroup) + if os.geteuid() == 0: + engineGroup = engineConfig.getString("ENGINE_GROUP") + if engineGroup: + try: + engineGid = grp.getgrnam(engineGroup).gr_gid + except: + raise Exception("The engine group \"%s\" doesn't exist." % engineGroup) else: - engineGid = os.getgid() + engineGid = os.getegid() # Java home directory: global javaHomeDir -- To view, visit http://gerrit.ovirt.org/13033 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic28aaae513b1dcde2d18cbae12f8ac35a341b466 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
