From ab3b3eb83b7e20e1f1a49b96c57118a012c67d74 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Sat, 28 May 2011 15:27:14 -0400
Subject: [PATCH] Quiet gcc warnings.
---
plugins/sudoers/ldap.c | 19 +++++++------------
plugins/sudoers/parse.c | 8 ++++----
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c
index 4cf79a721..46c0ee927 100644
--- a/plugins/sudoers/ldap.c
+++ b/plugins/sudoers/ldap.c
@@ -1492,24 +1492,19 @@ sudo_ldap_display_entry_short(LDAP *ld, LDAPMessage *entry, struct lbuf *lbuf)
/* get the Option Values from the entry */
bv = ldap_get_values_len(ld, entry, "sudoOption");
if (bv != NULL) {
- char *cp, *tag;
-
for (p = bv; *p != NULL; p++) {
- cp = (*p)->bv_val;
+ char *cp = (*p)->bv_val;
if (*cp == '!')
cp++;
- tag = NULL;
if (strcmp(cp, "authenticate") == 0)
- tag = (*p)->bv_val[0] == '!' ?
- "NOPASSWD: " : "PASSWD: ";
+ lbuf_append(lbuf, (*p)->bv_val[0] == '!' ?
+ "NOPASSWD: " : "PASSWD: ");
else if (strcmp(cp, "noexec") == 0)
- tag = (*p)->bv_val[0] == '!' ?
- "EXEC: " : "NOEXEC: ";
+ lbuf_append(lbuf, (*p)->bv_val[0] == '!' ?
+ "EXEC: " : "NOEXEC: ");
else if (strcmp(cp, "setenv") == 0)
- tag = (*p)->bv_val[0] == '!' ?
- "NOSETENV: " : "SETENV: ";
- if (tag != NULL)
- lbuf_append(lbuf, tag);
+ lbuf_append(lbuf, (*p)->bv_val[0] == '!' ?
+ "NOSETENV: " : "SETENV: ");
}
ldap_value_free_len(bv);
}
diff --git a/plugins/sudoers/parse.c b/plugins/sudoers/parse.c
index 00693e5a6..1895d7aef 100644
--- a/plugins/sudoers/parse.c
+++ b/plugins/sudoers/parse.c
@@ -457,10 +457,9 @@ sudo_file_display_defaults(struct sudo_nss *nss, struct passwd *pw,
case DEFAULTS_CMND:
continue;
}
- lbuf_append(lbuf, prefix);
if (d->val != NULL) {
- lbuf_append(lbuf, "%s%s", d->var, d->op == '+' ? "+=" :
- d->op == '-' ? "-=" : "=");
+ lbuf_append(lbuf, "%s%s%s", prefix, d->var,
+ d->op == '+' ? "+=" : d->op == '-' ? "-=" : "=");
if (strpbrk(d->val, " \t") != NULL) {
lbuf_append(lbuf, "\"");
lbuf_append_quoted(lbuf, "\"", "%s", d->val);
@@ -468,7 +467,8 @@ sudo_file_display_defaults(struct sudo_nss *nss, struct passwd *pw,
} else
lbuf_append_quoted(lbuf, SUDOERS_QUOTED, "%s", d->val);
} else
- lbuf_append(lbuf, "%s%s", d->op == FALSE ? "!" : "", d->var);
+ lbuf_append(lbuf, "%s%s%s", prefix,
+ d->op == FALSE ? "!" : "", d->var);
prefix = ", ";
nfound++;
}
--
2.40.0