keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/passwd: Error if presented with an unknown check-passwd value

Browse Source 
Prep for sysusers work; let's cleanly reject things we don't know.

Closes: #935
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-08-22 13:52:15 -04:00 committed by Atomic Bot
parent 5f7d860a33
commit 4be8658f65
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libpriv/rpmostree-passwd-util.c
View File

@ -251,9 +251,11 @@ rpmostree_check_passwd_groups (gboolean passwd,
chk_type = _rpmostree_jsonutil_object_require_string_member (chk, "type", error);
if (!chk_type)
return FALSE;
if (g_str_equal (chk_type, "none"))
return TRUE; /* Note early return */
else if (g_str_equal (chk_type, "previous"))
; /* Handled below */
else if (g_str_equal (chk_type, "file"))
{
direct = _rpmostree_jsonutil_object_require_string_member (chk,
@ -331,6 +333,8 @@ rpmostree_check_passwd_groups (gboolean passwd,
g_ptr_array_add (old_ents, convent);
}
}
else
return glnx_throw (error, "Invalid %s type '%s'", json_conf_name, chk_type);
}
g_autoptr(GFile) old_path = NULL;