diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-18 15:58:50 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-18 15:58:50 +0000 |
| commit | 48d2267d2d05bf4acaa2ae4e00e3d9b600cce235 (patch) | |
| tree | b91e3d85242f15336883bd197abbe86cd66fdfc8 /res/res_config_ldap.c | |
| parent | 99e420ecd8ad845f253266482101298583994c00 (diff) | |
Merged revisions 109447 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r109447 | twilson | 2008-03-18 10:43:34 -0500 (Tue, 18 Mar 2008) | 3 lines
Go through and fix a bunch of places where character strings were being interpreted as format strings. Most of these changes are solely to make compiling with -Wsecurity and -Wformat=2 happy, and were not
actual problems, per se. I also added format attributes to any printf wrapper functions I found that didn't have them. -Wsecurity and -Wmissing-format-attribute added to --enable-dev-mode.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@109459 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_config_ldap.c')
| -rw-r--r-- | res/res_config_ldap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c index b76ad8ae7..028902adb 100644 --- a/res/res_config_ldap.c +++ b/res/res_config_ldap.c @@ -766,10 +766,10 @@ static struct ast_variable **realtime_ldap_base_ap(unsigned int *entries_count_p ast_str_append(&filter, 0, "(&"); if (table_config && table_config->additional_filter) - ast_str_append(&filter, 0, table_config->additional_filter); + ast_str_append(&filter, 0, "%s", table_config->additional_filter); if (table_config != base_table_config && base_table_config && base_table_config->additional_filter) { - ast_str_append(&filter, 0, base_table_config->additional_filter); + ast_str_append(&filter, 0, "%s", base_table_config->additional_filter); } /* Create the first part of the query using the first parameter/value pairs we just extracted */ @@ -1171,11 +1171,11 @@ static int update_ldap(const char *basedn, const char *table_name, const char *a /* Create the filter with the table additional filter and the parameter/value pairs we were given */ ast_str_append(&filter, 0, "(&"); if (table_config && table_config->additional_filter) { - ast_str_append(&filter, 0, table_config->additional_filter); + ast_str_append(&filter, 0, "%s", table_config->additional_filter); } if (table_config != base_table_config && base_table_config && base_table_config->additional_filter) { - ast_str_append(&filter, 0, base_table_config->additional_filter); + ast_str_append(&filter, 0, "%s", base_table_config->additional_filter); } append_var_and_value_to_filter(&filter, table_config, attribute, lookup); ast_str_append(&filter, 0, ")"); |