isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quiet gcc warnings.

Browse Source
This commit is contained in:
Todd C. Miller
2011-05-28 15:27:14 -04:00
parent 97214c4485
commit ab3b3eb83b
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/sudoers/ldap.c
View File

@@ -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);
}

8
plugins/sudoers/parse.c
View File

@@ -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++;
}