aboutsummaryrefslogtreecommitdiff
path: root/pam_cap/test_pam_cap.c
diff options
context:
space:
mode:
authorAndrew G. Morgan <morgan@kernel.org>2019-12-23 22:25:46 -0800
committerAndrew G. Morgan <morgan@kernel.org>2019-12-23 22:25:46 -0800
commitd45a3d4812598fc056499fa4622be4af58076bd5 (patch)
treefa1ffae514e201500eb1269ce9c84f261a488d9e /pam_cap/test_pam_cap.c
parentafef3ef1c62613e1cac12a2bbec6017f7d5e033e (diff)
downloadlibcap-d45a3d4812598fc056499fa4622be4af58076bd5.tar.gz
Ensure that gcc -std=c89 build works.
We're not using it, but it seems like a small price to pay for having targets I'm not building regularly continue to build. Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
Diffstat (limited to 'pam_cap/test_pam_cap.c')
-rw-r--r--pam_cap/test_pam_cap.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/pam_cap/test_pam_cap.c b/pam_cap/test_pam_cap.c
index 2f519f1..452a27f 100644
--- a/pam_cap/test_pam_cap.c
+++ b/pam_cap/test_pam_cap.c
@@ -17,15 +17,15 @@ const char *test_users[] = {
};
#define n_users sizeof(test_users)/sizeof(*test_users)
-// Note about memberships:
-//
-// user gid suppl groups
-// root root
-// alpha one two
-// beta two three four
-// gamma three four five six
-// delta four five six seven [eight]
-//
+/* Note about memberships:
+ *
+ * user gid suppl groups
+ * root root
+ * alpha one two
+ * beta two three four
+ * gamma three four five six
+ * delta four five six seven [eight]
+ */
static char *test_user;
@@ -76,7 +76,8 @@ struct group *getgrgid(gid_t gid) {
static struct passwd pw;
struct passwd *getpwnam(const char *name) {
- for (int i = 0; i < n_users; i++) {
+ int i;
+ for (i = 0; i < n_users; i++) {
if (strcmp(name, test_users[i]) == 0) {
pw.pw_gid = i;
return &pw;
@@ -99,7 +100,8 @@ struct passwd *getpwnam(const char *name) {
static void load_vectors(unsigned long int bits[3]) {
memset(bits, 0, 3*sizeof(unsigned long int));
cap_t prev = cap_get_proc();
- for (int i = 0; i < 64; i++) {
+ int i;
+ for (i = 0; i < 64; i++) {
unsigned long int mask = (1ULL << i);
int v = cap_get_bound(i);
if (v < 0) {
@@ -160,7 +162,7 @@ int main(int argc, char *argv[]) {
exit(1);
}
- // Now it is time to execute the credential setting
+ /* Now it is time to execute the credential setting */
load_vectors(before);
status = pam_sm_setcred(NULL, PAM_ESTABLISH_CRED, argc-4,