From 43ad3ad7ea3dfc93d91e8bc3a47a03596705c93c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 20 Aug 2018 16:06:41 +0200 Subject: [PATCH] =?utf8?q?Rename=20USER=5FCREDS=5FSYNTHESIZE=5FFALLBACK=20?= =?utf8?q?to=20=E2=80=A6=5FPREFER=5FNSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/basic/user-util.c | 8 ++++---- src/basic/user-util.h | 6 +++--- src/run/run.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/basic/user-util.c b/src/basic/user-util.c index b618559..d410c90 100644 --- a/src/basic/user-util.c +++ b/src/basic/user-util.c @@ -168,14 +168,14 @@ int get_user_creds( assert(username); assert(*username); - if (!FLAGS_SET(flags, USER_CREDS_SYNTHESIZE_FALLBACK) || + if (!FLAGS_SET(flags, USER_CREDS_PREFER_NSS) || (!home && !shell)) { /* So here's the deal: normally, we'll try to synthesize all records we can synthesize, and override - * the user database with that. However, if the user specifies USER_CREDS_SYNTHESIZE_FALLBACK then the + * the user database with that. However, if the user specifies USER_CREDS_PREFER_NSS then the * user database will override the synthetic records instead — except if the user is only interested in * the UID and/or GID (but not the home directory, or the shell), in which case we'll always override - * the user database (i.e. the USER_CREDS_SYNTHESIZE_FALLBACK flag has no effect in this case). Why? + * the user database (i.e. the USER_CREDS_PREFER_NSS flag has no effect in this case). Why? * Simply because there are valid usecase where the user might change the home directory or the shell * of the relevant users, but changing the UID/GID mappings for them is something we explicitly don't * support. */ @@ -215,7 +215,7 @@ int get_user_creds( r = errno > 0 ? -errno : -ESRCH; /* If the user requested that we only synthesize as fallback, do so now */ - if (FLAGS_SET(flags, USER_CREDS_SYNTHESIZE_FALLBACK)) { + if (FLAGS_SET(flags, USER_CREDS_PREFER_NSS)) { if (synthesize_user_creds(username, uid, gid, home, shell, flags) >= 0) return 0; } diff --git a/src/basic/user-util.h b/src/basic/user-util.h index a18f4d6..b6de0e4 100644 --- a/src/basic/user-util.h +++ b/src/basic/user-util.h @@ -26,9 +26,9 @@ char* getlogname_malloc(void); char* getusername_malloc(void); typedef enum UserCredsFlags { - USER_CREDS_SYNTHESIZE_FALLBACK = 1 << 0, /* if set, only synthesize user records if database lacks them. Normally we bypass the userdb entirely for the records we can synthesize */ - USER_CREDS_ALLOW_MISSING = 1 << 1, /* if a numeric UID string is resolved, be OK if there's no record for it */ - USER_CREDS_CLEAN = 1 << 2, /* try to clean up shell and home fields with invalid data */ + USER_CREDS_PREFER_NSS = 1 << 0, /* if set, only synthesize user records if database lacks them. Normally we bypass the userdb entirely for the records we can synthesize */ + USER_CREDS_ALLOW_MISSING = 1 << 1, /* if a numeric UID string is resolved, be OK if there's no record for it */ + USER_CREDS_CLEAN = 1 << 2, /* try to clean up shell and home fields with invalid data */ } UserCredsFlags; int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const char **home, const char **shell, UserCredsFlags flags); diff --git a/src/run/run.c b/src/run/run.c index effbbb6..dfbb3e2 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -1245,7 +1245,7 @@ static int start_transient_scope( uid_t uid; gid_t gid; - r = get_user_creds(&arg_exec_user, &uid, &gid, &home, &shell, USER_CREDS_CLEAN|USER_CREDS_SYNTHESIZE_FALLBACK); + r = get_user_creds(&arg_exec_user, &uid, &gid, &home, &shell, USER_CREDS_CLEAN|USER_CREDS_PREFER_NSS); if (r < 0) return log_error_errno(r, "Failed to resolve user %s: %m", arg_exec_user); -- 2.7.4