X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fsysusers%2Fsysusers.c;fp=src%2Fsysusers%2Fsysusers.c;h=e47bcb4dca53853d68f55124e72ecfb7705302cf;hb=63c372cb9df3bee01e3bf8cd7f96f336bddda846;hp=f25ece06748c7d932240e14458510b8fb9b82969;hpb=44de0efc6e406515fc1cf8b95d9655d0d7f7ffff;p=elogind.git diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index f25ece067..e47bcb4dc 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -81,7 +81,7 @@ static uid_t search_uid = UID_INVALID; static UidRange *uid_range = NULL; static unsigned n_uid_range = 0; -#define fix_root(x) (arg_root ? strappenda(arg_root, x) : x) +#define fix_root(x) (arg_root ? strjoina(arg_root, x) : x) static int load_user_database(void) { _cleanup_fclose_ FILE *f = NULL; @@ -217,7 +217,7 @@ static int make_backup(const char *target, const char *x) { /* Don't fail on chmod() or chown(). If it stays owned by us * and/or unreadable by others, then it isn't too bad... */ - backup = strappenda(x, "-"); + backup = strjoina(x, "-"); /* Copy over the access mask */ if (fchmod(fileno(dst), st.st_mode & 07777) < 0)