picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #14622 from poettering/uid-ref-fixlets

Browse source 
trivial uid ref counting clean-ups
This commit is contained in:
Lennart Poettering 2020-01-21 15:08:02 +01:00 committed by GitHub
parent d3e5639ebb b90cf10245
commit e704a09409
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/manager.c
View file

@ -4480,7 +4480,7 @@ static void manager_deserialize_uid_refs_one_internal(
r = parse_uid(value, &uid);
if (r < 0 || uid == 0) {
log_debug("Unable to parse UID reference serialization");
log_debug("Unable to parse UID reference serialization: " UID_FMT, uid);
return;
}

22
src/core/unit.c
View file

@ -5066,14 +5066,21 @@ static void unit_unref_uid_internal(
*ref_uid = UID_INVALID;
}
void unit_unref_uid(Unit *u, bool destroy_now) {
static void unit_unref_uid(Unit *u, bool destroy_now) {
unit_unref_uid_internal(u, &u->ref_uid, destroy_now, manager_unref_uid);
}
void unit_unref_gid(Unit *u, bool destroy_now) {
static void unit_unref_gid(Unit *u, bool destroy_now) {
unit_unref_uid_internal(u, (uid_t*) &u->ref_gid, destroy_now, manager_unref_gid);
}
void unit_unref_uid_gid(Unit *u, bool destroy_now) {
assert(u);
unit_unref_uid(u, destroy_now);
unit_unref_gid(u, destroy_now);
}
static int unit_ref_uid_internal(
Unit *u,
uid_t *ref_uid,
@ -5112,11 +5119,11 @@ static int unit_ref_uid_internal(
return 1;
}
int unit_ref_uid(Unit *u, uid_t uid, bool clean_ipc) {
static int unit_ref_uid(Unit *u, uid_t uid, bool clean_ipc) {
return unit_ref_uid_internal(u, &u->ref_uid, uid, clean_ipc, manager_ref_uid);
}
int unit_ref_gid(Unit *u, gid_t gid, bool clean_ipc) {
static int unit_ref_gid(Unit *u, gid_t gid, bool clean_ipc) {
return unit_ref_uid_internal(u, (uid_t*) &u->ref_gid, (uid_t) gid, clean_ipc, manager_ref_gid);
}
@ -5161,13 +5168,6 @@ int unit_ref_uid_gid(Unit *u, uid_t uid, gid_t gid) {
return r;
}
void unit_unref_uid_gid(Unit *u, bool destroy_now) {
assert(u);
unit_unref_uid(u, destroy_now);
unit_unref_gid(u, destroy_now);
}
void unit_notify_user_lookup(Unit *u, uid_t uid, gid_t gid) {
int r;

6
src/core/unit.h
View file

@ -815,12 +815,6 @@ int unit_fail_if_noncanonical(Unit *u, const char* where);
int unit_test_start_limit(Unit *u);
void unit_unref_uid(Unit *u, bool destroy_now);
int unit_ref_uid(Unit *u, uid_t uid, bool clean_ipc);
void unit_unref_gid(Unit *u, bool destroy_now);
int unit_ref_gid(Unit *u, gid_t gid, bool clean_ipc);
int unit_ref_uid_gid(Unit *u, uid_t uid, gid_t gid);
void unit_unref_uid_gid(Unit *u, bool destroy_now);