starlingx/integ
Code Issues Proposed changes

integ: Convert wrsroot -> sysadmin

Browse Source 
This also changes the group wrs_protected to sys_protected
to de-brand the user and group names.

Depends-On: I887464a20fc17d66529caea03be2b445156f9426
Change-Id: Ic2ea06d3ac15c31854a604af5f4cecf9094fcaea
Story: 2004716
Task: 28748
Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
Saul Wold
2019-05-09 12:58:20 -07:00
parent 6ccb588bf8
commit 83c6575d51
16 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
security/python-keyring/python-keyring/chmod_keyringlock2.patch
View File

@@ -30,7 +30,7 @@ Index: keyring-5.3/keyring/backends/file.py
+ if oct(stat.S_IMODE(os.stat(lockdir + "/" + lockfile).st_mode)) != '0770':
+ # Must have the lock file with the correct group and permissisions g+rw
+ os.chmod(lockdir + "/" + lockfile, stat.S_IRWXG | stat.S_IRWXU)
+ groupinfo = grp.getgrnam('wrs_protected')
+ groupinfo = grp.getgrnam('sys_protected')
+ os.chown(lockdir + "/" + lockfile,-1,groupinfo.gr_gid)

2
security/python-keyring/python-keyring/fix_keyring_lockfile_location.patch
View File

@@ -82,7 +82,7 @@ Index: keyring-5.3/keyring/backends/file.py
- if os.geteuid() == 0 and (not os.path.exists(lockfile)):
- from pwd import getpwnam
- import stat
- nonrootuser = "wrsroot"
- nonrootuser = "sysadmin"
- with open(lockfile, 'w'):
- pass
- # must have the lock file with the correct group permissisions g+rw

2
security/python-keyring/python-keyring/use_new_lock.patch
View File

@@ -180,7 +180,7 @@ Index: keyring-5.3/keyring/backends/file.py
+ if os.geteuid() == 0 and (not os.path.exists(lockfile)):
+ from pwd import getpwnam
+ import stat
+ nonrootuser = "wrsroot"
+ nonrootuser = "sysadmin"
+ with open(lockfile, 'w'):
+ pass
+ # must have the lock file with the correct group permissisions g+rw