shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 20:25:38 +03:00
Code

util: restore get_process_capeff behaviour

Browse Source 
69ab8088 unified parsing of status files and removed the logic of
skipping extra '0's when getting the effective capabilities. Restore
that logic, so that the same capabilities are always mapped to the
same strings in the journal.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-09-17 18:34:47 -05:00
parent 1dc2ced464
commit 0a7b53bdd2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/shared/fileio.c
View File

@ -650,9 +650,9 @@ int executable_is_script(const char *path, char **interpreter) {
}
/**
* Retrieve one field from a file like /proc/self/status.
* pattern should start with '\n' and end with ':'. Whitespace
* after ':' will be skipped. field must be freed afterwards.
* Retrieve one field from a file like /proc/self/status. pattern
* should start with '\n' and end with a ':'. Whitespace and zeros
* after the ':' will be skipped. field must be freed afterwards.
*/
int get_status_field(const char *filename, const char *pattern, char **field) {
_cleanup_free_ char *status = NULL;
@ -672,7 +672,12 @@ int get_status_field(const char *filename, const char *pattern, char **field) {
return -ENOENT;
t += strlen(pattern);
t += strspn(t, WHITESPACE);
/* Also skip zeros, because when this is used for capabilities,
* we don't want the zeros. This way the same cabality set
* always maps to the same string, irrespective of the total
* capability set size. For other numbers it shouldn't matter.
*/
t += strspn(t, WHITESPACE "0");
len = strcspn(t, WHITESPACE);