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

debug_decl and debug_decl_vars now require a semicolon at the end.

Browse Source
This commit is contained in:
Todd C. Miller
2019-12-22 08:48:16 -07:00
parent 5dcc28180e
commit 486ee2b71f
140 changed files with 1038 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/sudoers/ldap_conf.c
View File

@@ -197,7 +197,7 @@ sudo_ldap_conf_add_ports(void)
char *host, *last, *port, defport[13];
char hostbuf[LINE_MAX * 2];
int len;
debug_decl(sudo_ldap_conf_add_ports, SUDOERS_DEBUG_LDAP)
debug_decl(sudo_ldap_conf_add_ports, SUDOERS_DEBUG_LDAP);
hostbuf[0] = '\0';
len = snprintf(defport, sizeof(defport), ":%d", ldap_conf.port);
@@ -243,7 +243,7 @@ sudo_ldap_parse_uri(const struct ldap_config_str_list *uri_list)
char *buf, hostbuf[LINE_MAX];
int nldap = 0, nldaps = 0;
int ret = -1;
debug_decl(sudo_ldap_parse_uri, SUDOERS_DEBUG_LDAP)
debug_decl(sudo_ldap_parse_uri, SUDOERS_DEBUG_LDAP);
hostbuf[0] = '\0';
STAILQ_FOREACH(entry, uri_list, entries) {
@@ -328,7 +328,7 @@ sudo_ldap_decode_secret(const char *secret)
{
unsigned char *result = NULL;
size_t len, reslen;
debug_decl(sudo_ldap_decode_secret, SUDOERS_DEBUG_LDAP)
debug_decl(sudo_ldap_decode_secret, SUDOERS_DEBUG_LDAP);
if (strncasecmp(secret, "base64:", sizeof("base64:") - 1) == 0) {
/*
@@ -360,7 +360,7 @@ sudo_ldap_read_secret(const char *path)
char *line = NULL;
size_t linesize = 0;
ssize_t len;
debug_decl(sudo_ldap_read_secret, SUDOERS_DEBUG_LDAP)
debug_decl(sudo_ldap_read_secret, SUDOERS_DEBUG_LDAP);
if ((fp = fopen(path_ldap_secret, "r")) != NULL) {
len = getdelim(&line, &linesize, '\n', fp);
@@ -396,7 +396,7 @@ sudo_ldap_parse_keyword(const char *keyword, const char *value,
{
struct ldap_config_table *cur;
const char *errstr;
debug_decl(sudo_ldap_parse_keyword, SUDOERS_DEBUG_LDAP)
debug_decl(sudo_ldap_parse_keyword, SUDOERS_DEBUG_LDAP);
/* Look up keyword in config tables */
for (cur = table; cur->conf_str != NULL; cur++) {
@@ -478,7 +478,7 @@ const char *
sudo_krb5_ccname_path(const char *old_ccname)
{
const char *ccname = old_ccname;
debug_decl(sudo_krb5_ccname_path, SUDOERS_DEBUG_LDAP)
debug_decl(sudo_krb5_ccname_path, SUDOERS_DEBUG_LDAP);
/* Strip off leading FILE: or WRFILE: prefix. */
switch (ccname[0]) {
@@ -505,7 +505,7 @@ sudo_check_krb5_ccname(const char *ccname)
{
int fd = -1;
const char *ccname_path;
debug_decl(sudo_check_krb5_ccname, SUDOERS_DEBUG_LDAP)
debug_decl(sudo_check_krb5_ccname, SUDOERS_DEBUG_LDAP);
/* Strip off prefix to get path name. */
ccname_path = sudo_krb5_ccname_path(ccname);
@@ -535,7 +535,7 @@ sudo_ldap_read_config(void)
struct ldap_config_str *conf_str;
size_t linesize = 0;
FILE *fp;
debug_decl(sudo_ldap_read_config, SUDOERS_DEBUG_LDAP)
debug_decl(sudo_ldap_read_config, SUDOERS_DEBUG_LDAP);
/* defaults */
ldap_conf.version = 3;
@@ -815,7 +815,7 @@ sudo_ldap_set_options_table(LDAP *ld, struct ldap_config_table *table)
struct ldap_config_table *cur;
int ival, rc, errors = 0;
char *sval;
debug_decl(sudo_ldap_set_options_table, SUDOERS_DEBUG_LDAP)
debug_decl(sudo_ldap_set_options_table, SUDOERS_DEBUG_LDAP);
for (cur = table; cur->conf_str != NULL; cur++) {
if (cur->opt_val == -1)
@@ -860,7 +860,7 @@ int
sudo_ldap_set_options_global(void)
{
int ret;
debug_decl(sudo_ldap_set_options_global, SUDOERS_DEBUG_LDAP)
debug_decl(sudo_ldap_set_options_global, SUDOERS_DEBUG_LDAP);
/* Set ber options */
#ifdef LBER_OPT_DEBUG_LEVEL
@@ -881,7 +881,7 @@ int
sudo_ldap_set_options_conn(LDAP *ld)
{
int rc;
debug_decl(sudo_ldap_set_options_conn, SUDOERS_DEBUG_LDAP)
debug_decl(sudo_ldap_set_options_conn, SUDOERS_DEBUG_LDAP);
/* Parse per-connection LDAP options table. */
rc = sudo_ldap_set_options_table(ld, ldap_conf_conn);