[Fedora-directory-commits] ldapserver/ldap/servers/plugins/dna dna.c, 1.15, 1.16
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/dna
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13701/ldapserver/ldap/servers/plugins/dna
Modified Files:
dna.c
Log Message:
Resolves: bug 454030
Bug Description: Need to address 64-bit compiler warnings - again
Reviewed by: nhosoi (Thanks!)
Fix Description: This patch cleans up most of the other remaining compiler warnings. I compiled the directory server code with these flags on RHEL5 x86_64: -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
I also enabled argument/format match checking for most of the commonly used varadic functions. Most of the problems I found fell into these categories:
1) Too many or not enough arguments e.g. most everything that uses or did use LDAPDebug had extra 0,0 arguments. If they had been switched to use slapi_log_error, I removed the extra arguments - for those places still using LDAPDebug, I introduced more macros to handle the number of arguments, since C macros cannot be varadic.
2) When using NSPR formatting functions, we have to use %llu or %lld for 64-bit values, even on 64-bit systems. However, for regular system formatting functions, we have to use %ld or %lu. I introduced two new macros NSPRIu64 and NSPRI64 to handle cases where we are passing explicit 64-bit values to NSPR formatting functions, so that we can use the regular PRIu64 and PRI64 macros for regular system formatting functions. I also made sure we used NSPRI* only with NSPR functions, and used PRI* only with system functions.
3) use %lu for size_t and %ld for time_t
I did find a few "real" errors, places that the code was doing something definitely not right:
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
This is why it's important to use this compiler checking, and why it's important to fix compiler warnings, if for no other reason than the sheer noise from so many warnings can mask real errors.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: dna.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/dna/dna.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dna.c 10 Nov 2008 16:01:05 -0000 1.15
+++ dna.c 5 Dec 2008 22:41:50 -0000 1.16
@@ -59,14 +59,6 @@
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
-/* NSPR uses the print macros a bit differently than ANSI C. We
- * need to use ll for a 64-bit integer, even when a long is 64-bit.
- */
-#undef PRIu64
-#define PRIu64 "llu"
-#undef PRI64
-#define PRI64 "ll"
-
#else
#error Need to define portable format macros such as PRIu64
#endif /* HAVE_INTTYPES_H */
@@ -703,7 +695,7 @@
}
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "----------> dn [%s]\n", entry->dn, 0, 0);
+ "----------> dn [%s]\n", entry->dn);
value = slapi_entry_attr_get_charptr(e, DNA_TYPE);
if (value) {
@@ -718,7 +710,7 @@
}
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "----------> %s [%s]\n", DNA_TYPE, entry->type, 0, 0);
+ "----------> %s [%s]\n", DNA_TYPE, entry->type);
value = slapi_entry_attr_get_charptr(e, DNA_NEXTVAL);
if (value) {
@@ -734,8 +726,7 @@
}
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "----------> %s [%" PRIu64 "]\n", DNA_NEXTVAL, entry->nextval, 0,
- 0);
+ "----------> %s [%" NSPRIu64 "]\n", DNA_NEXTVAL, entry->nextval);
value = slapi_entry_attr_get_charptr(e, DNA_PREFIX);
if (value && value[0]) {
@@ -749,7 +740,7 @@
}
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "----------> %s [%s]\n", DNA_PREFIX, entry->prefix, 0, 0);
+ "----------> %s [%s]\n", DNA_PREFIX, entry->prefix);
/* Set the default interval to 1 */
entry->interval = 1;
@@ -762,7 +753,7 @@
}
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "----------> %s [%" PRIu64 "]\n", DNA_INTERVAL, entry->interval, 0, 0);
+ "----------> %s [%" NSPRIu64 "]\n", DNA_INTERVAL, entry->interval);
#endif
value = slapi_entry_attr_get_charptr(e, DNA_GENERATE);
@@ -771,8 +762,7 @@
}
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "----------> %s [%s]\n", DNA_GENERATE, entry->generate,
- 0, 0);
+ "----------> %s [%s]\n", DNA_GENERATE, entry->generate);
value = slapi_entry_attr_get_charptr(e, DNA_FILTER);
if (value) {
@@ -794,7 +784,7 @@
}
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "----------> %s [%s]\n", DNA_FILTER, value, 0, 0);
+ "----------> %s [%s]\n", DNA_FILTER, value);
value = slapi_entry_attr_get_charptr(e, DNA_SCOPE);
if (value) {
@@ -811,7 +801,7 @@
}
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "----------> %s [%s]\n", DNA_SCOPE, entry->scope, 0, 0);
+ "----------> %s [%s]\n", DNA_SCOPE, entry->scope);
/* optional, if not specified set -1 which is converted to the max unisgnee
* value */
@@ -824,7 +814,7 @@
}
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "----------> %s [%llu]\n", DNA_MAXVAL, entry->maxval, 0, 0);
+ "----------> %s [%" NSPRIu64 "]\n", DNA_MAXVAL, entry->maxval);
value = slapi_entry_attr_get_charptr(e, DNA_SHARED_CFG_DN);
if (value) {
@@ -862,7 +852,7 @@
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
"----------> %s [%s]\n", DNA_SHARED_CFG_DN,
- entry->shared_cfg_base, 0, 0);
+ entry->shared_cfg_base);
}
value = slapi_entry_attr_get_charptr(e, DNA_THRESHOLD);
@@ -870,7 +860,7 @@
entry->threshold = strtoull(value, 0, 0);
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "----------> %s [%" PRIu64 "]\n", DNA_THRESHOLD, value, 0, 0);
+ "----------> %s [%" NSPRIu64 "]\n", DNA_THRESHOLD, value);
slapi_ch_free_string(&value);
} else {
@@ -878,7 +868,7 @@
}
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "----------> %s [%llu]\n", DNA_THRESHOLD, entry->threshold, 0, 0);
+ "----------> %s [%" NSPRIu64 "]\n", DNA_THRESHOLD, entry->threshold);
value = slapi_entry_attr_get_charptr(e, DNA_RANGE_REQUEST_TIMEOUT);
if (value) {
@@ -889,8 +879,8 @@
}
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "----------> %s [%llu]\n", DNA_RANGE_REQUEST_TIMEOUT,
- entry->timeout, 0, 0);
+ "----------> %s [%" NSPRIu64 "]\n", DNA_RANGE_REQUEST_TIMEOUT,
+ entry->timeout);
value = slapi_entry_attr_get_charptr(e, DNA_NEXT_RANGE);
if (value) {
@@ -995,7 +985,7 @@
slapi_log_error(SLAPI_LOG_CONFIG,
DNA_PLUGIN_SUBSYSTEM,
"store [%s] before [%s] \n", entry->scope,
- config_entry->scope, 0);
+ config_entry->scope);
entry_added = 1;
break;
}
@@ -1007,8 +997,7 @@
/* add to tail */
PR_INSERT_BEFORE(&(entry->list), list);
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "store [%s] at tail\n", entry->scope, 0,
- 0);
+ "store [%s] at tail\n", entry->scope);
entry_added = 1;
break;
}
@@ -1017,7 +1006,7 @@
/* first entry */
PR_INSERT_LINK(&(entry->list), dna_global_config);
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "store [%s] at head \n", entry->scope, 0, 0);
+ "store [%s] at head \n", entry->scope);
entry_added = 1;
}
@@ -1027,7 +1016,7 @@
if ((apply != 0) && (entry != NULL)) {
slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
"dna_parse_config_entry: Invalid config entry "
- "[%s] skipped\n", entry->dn, 0, 0);
+ "[%s] skipped\n", entry->dn);
}
dna_free_config_entry(&entry);
} else {
@@ -1050,7 +1039,7 @@
if (e->dn) {
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
- "freeing config entry [%s]\n", e->dn, 0, 0);
+ "freeing config entry [%s]\n", e->dn);
slapi_ch_free_string(&e->dn);
}
@@ -1355,8 +1344,8 @@
* don't need to do this if we already have a next range on deck. */
if ((config_entry->next_range_lower == 0) && (config_entry->remaining <= config_entry->threshold)) {
slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
- "dna_notice_allocation: Passed threshold of %" PRIu64 " remaining values "
- "for range %s. (%" PRIu64 " values remain)\n",
+ "dna_notice_allocation: Passed threshold of %" NSPRIu64 " remaining values "
+ "for range %s. (%" NSPRIu64 " values remain)\n",
config_entry->threshold, config_entry->dn, config_entry->remaining);
/* Only attempt to fix maxval if the fix flag is set. */
if (fix != 0) {
@@ -1784,7 +1773,7 @@
if (prefix) {
/* The 7 below is for all of the filter characters "(&(=))"
* plus the trailing \0. The 20 is for the maximum string
- * representation of a " PRIu64 ". */
+ * representation of a " NSPRIu64 ". */
filterlen = strlen(config_entry->filter) +
strlen(prefix) + strlen(type)
+ 7 + 20;
@@ -1802,7 +1791,7 @@
return LDAP_OPERATIONS_ERROR;
}
- filter = slapi_ch_smprintf("(&%s(&(%s>=%" PRIu64 ")(%s<=%" PRIu64 ")))",
+ filter = slapi_ch_smprintf("(&%s(&(%s>=%" NSPRIu64 ")(%s<=%" NSPRIu64 ")))",
config_entry->filter,
type, tmpval,
type, config_entry->maxval);
@@ -1985,7 +1974,7 @@
* of our current range */
if (nextval <= (config_entry->maxval + config_entry->interval)) {
/* try to set the new next value in the config entry */
- snprintf(next_value, sizeof(next_value),"%" PRIu64, nextval);
+ PR_snprintf(next_value, sizeof(next_value),"%" NSPRIu64, nextval);
/* set up our replace modify operation */
replace_val[0] = next_value;
@@ -2015,7 +2004,7 @@
if (LDAP_SUCCESS == ret) {
slapi_ch_free_string(next_value_ret);
- *next_value_ret = slapi_ch_smprintf("%" PRIu64, setval);
+ *next_value_ret = slapi_ch_smprintf("%" NSPRIu64, setval);
if (NULL == *next_value_ret) {
ret = LDAP_OPERATIONS_ERROR;
goto done;
@@ -2062,7 +2051,7 @@
/* We store the number of remaining assigned values
* in the shared config entry. */
- snprintf(remaining_vals, sizeof(remaining_vals),"%" PRIu64, config_entry->remaining);
+ PR_snprintf(remaining_vals, sizeof(remaining_vals),"%" NSPRIu64, config_entry->remaining);
/* set up our replace modify operation */
replace_val[0] = remaining_vals;
@@ -2147,7 +2136,7 @@
int ret = 0;
/* Try to set the new next range in the config entry. */
- snprintf(nextrange_value, sizeof(nextrange_value), "%" PRIu64 "-%" PRIu64,
+ PR_snprintf(nextrange_value, sizeof(nextrange_value), "%" NSPRIu64 "-%" NSPRIu64,
lower, upper);
/* set up our replace modify operation */
@@ -2216,8 +2205,8 @@
int ret = 0;
/* Setup the modify operation for the config entry */
- snprintf(maxval_val, sizeof(maxval_val),"%" PRIu64, config_entry->next_range_upper);
- snprintf(nextval_val, sizeof(nextval_val),"%" PRIu64, config_entry->next_range_lower);
+ PR_snprintf(maxval_val, sizeof(maxval_val),"%" NSPRIu64, config_entry->next_range_upper);
+ PR_snprintf(nextval_val, sizeof(nextval_val),"%" NSPRIu64, config_entry->next_range_lower);
maxval_vals[0] = maxval_val;
maxval_vals[1] = 0;
@@ -2855,8 +2844,8 @@
char highstr[16];
/* Create the exop response */
- snprintf(lowstr, sizeof(lowstr), "%" PRIu64, lower);
- snprintf(highstr, sizeof(highstr), "%" PRIu64, upper);
+ PR_snprintf(lowstr, sizeof(lowstr), "%" NSPRIu64, lower);
+ PR_snprintf(highstr, sizeof(highstr), "%" NSPRIu64, upper);
range_low.bv_val = lowstr;
range_low.bv_len = strlen(range_low.bv_val);
range_high.bv_val = highstr;
@@ -2889,7 +2878,7 @@
ber_bvfree(respdata);
slapi_log_error(SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM,
- "dna_extend_exop: Released range %" PRIu64 "-%" PRIu64 ".\n",
+ "dna_extend_exop: Released range %" NSPRIu64 "-%" NSPRIu64 ".\n",
lower, upper);
}
@@ -3031,7 +3020,7 @@
*lower = *upper - release + 1;
/* try to set the new maxval in the config entry */
- snprintf(max_value, sizeof(max_value),"%" PRIu64, (*lower - 1));
+ PR_snprintf(max_value, sizeof(max_value),"%" NSPRIu64, (*lower - 1));
/* set up our replace modify operation */
replace_val[0] = max_value;
15 years, 4 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/http http_impl.c, 1.11, 1.12
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/http
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13701/ldapserver/ldap/servers/plugins/http
Modified Files:
http_impl.c
Log Message:
Resolves: bug 454030
Bug Description: Need to address 64-bit compiler warnings - again
Reviewed by: nhosoi (Thanks!)
Fix Description: This patch cleans up most of the other remaining compiler warnings. I compiled the directory server code with these flags on RHEL5 x86_64: -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
I also enabled argument/format match checking for most of the commonly used varadic functions. Most of the problems I found fell into these categories:
1) Too many or not enough arguments e.g. most everything that uses or did use LDAPDebug had extra 0,0 arguments. If they had been switched to use slapi_log_error, I removed the extra arguments - for those places still using LDAPDebug, I introduced more macros to handle the number of arguments, since C macros cannot be varadic.
2) When using NSPR formatting functions, we have to use %llu or %lld for 64-bit values, even on 64-bit systems. However, for regular system formatting functions, we have to use %ld or %lu. I introduced two new macros NSPRIu64 and NSPRI64 to handle cases where we are passing explicit 64-bit values to NSPR formatting functions, so that we can use the regular PRIu64 and PRI64 macros for regular system formatting functions. I also made sure we used NSPRI* only with NSPR functions, and used PRI* only with system functions.
3) use %lu for size_t and %ld for time_t
I did find a few "real" errors, places that the code was doing something definitely not right:
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
This is why it's important to use this compiler checking, and why it's important to fix compiler warnings, if for no other reason than the sheer noise from so many warnings can mask real errors.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: http_impl.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/http/http_impl.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- http_impl.c 18 Oct 2007 00:08:30 -0000 1.11
+++ http_impl.c 5 Dec 2008 22:41:51 -0000 1.12
@@ -666,7 +666,7 @@
slapi_log_error( SLAPI_LOG_PLUGIN, HTTP_PLUGIN_SUBSYSTEM,
"nssReinitializationRequired: vendor is not Fedora \n");
slapi_log_error( SLAPI_LOG_PLUGIN, HTTP_PLUGIN_SUBSYSTEM,
- "or version is earlier than 6.0\n", value);
+ "or version [%s] is earlier than 6.0\n", value?value:"NULL");
nssReinitializationRequired = 1;
slapi_free_search_results_internal(resultpb);
slapi_pblock_destroy(resultpb);
15 years, 4 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/presence presence.c, 1.7, 1.8
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/presence
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13701/ldapserver/ldap/servers/plugins/presence
Modified Files:
presence.c
Log Message:
Resolves: bug 454030
Bug Description: Need to address 64-bit compiler warnings - again
Reviewed by: nhosoi (Thanks!)
Fix Description: This patch cleans up most of the other remaining compiler warnings. I compiled the directory server code with these flags on RHEL5 x86_64: -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
I also enabled argument/format match checking for most of the commonly used varadic functions. Most of the problems I found fell into these categories:
1) Too many or not enough arguments e.g. most everything that uses or did use LDAPDebug had extra 0,0 arguments. If they had been switched to use slapi_log_error, I removed the extra arguments - for those places still using LDAPDebug, I introduced more macros to handle the number of arguments, since C macros cannot be varadic.
2) When using NSPR formatting functions, we have to use %llu or %lld for 64-bit values, even on 64-bit systems. However, for regular system formatting functions, we have to use %ld or %lu. I introduced two new macros NSPRIu64 and NSPRI64 to handle cases where we are passing explicit 64-bit values to NSPR formatting functions, so that we can use the regular PRIu64 and PRI64 macros for regular system formatting functions. I also made sure we used NSPRI* only with NSPR functions, and used PRI* only with system functions.
3) use %lu for size_t and %ld for time_t
I did find a few "real" errors, places that the code was doing something definitely not right:
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
This is why it's important to use this compiler checking, and why it's important to fix compiler warnings, if for no other reason than the sheer noise from so many warnings can mask real errors.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: presence.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/presence/presence.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- presence.c 8 Oct 2008 17:29:02 -0000 1.7
+++ presence.c 5 Dec 2008 22:41:51 -0000 1.8
@@ -198,7 +198,7 @@
static vattr_sp_handle *_VattrHandle = NULL;
static void *_PluginID = NULL;
-static void *_PluginDN = NULL;
+static char *_PluginDN = NULL;
static PLHashTable *_IdVattrMapTable = NULL;
static PLHashTable *_IdConfigMapTable = NULL;
static void **_HttpAPI = NULL;
@@ -281,12 +281,12 @@
return _PluginID;
}
-void setPluginDN(void *pluginDN)
+void setPluginDN(char *pluginDN)
{
_PluginDN = pluginDN;
}
-void * getPluginDN()
+char * getPluginDN()
{
return _PluginDN;
}
15 years, 4 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/passthru ptconn.c, 1.5, 1.6
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13701/ldapserver/ldap/servers/plugins/passthru
Modified Files:
ptconn.c
Log Message:
Resolves: bug 454030
Bug Description: Need to address 64-bit compiler warnings - again
Reviewed by: nhosoi (Thanks!)
Fix Description: This patch cleans up most of the other remaining compiler warnings. I compiled the directory server code with these flags on RHEL5 x86_64: -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
I also enabled argument/format match checking for most of the commonly used varadic functions. Most of the problems I found fell into these categories:
1) Too many or not enough arguments e.g. most everything that uses or did use LDAPDebug had extra 0,0 arguments. If they had been switched to use slapi_log_error, I removed the extra arguments - for those places still using LDAPDebug, I introduced more macros to handle the number of arguments, since C macros cannot be varadic.
2) When using NSPR formatting functions, we have to use %llu or %lld for 64-bit values, even on 64-bit systems. However, for regular system formatting functions, we have to use %ld or %lu. I introduced two new macros NSPRIu64 and NSPRI64 to handle cases where we are passing explicit 64-bit values to NSPR formatting functions, so that we can use the regular PRIu64 and PRI64 macros for regular system formatting functions. I also made sure we used NSPRI* only with NSPR functions, and used PRI* only with system functions.
3) use %lu for size_t and %ld for time_t
I did find a few "real" errors, places that the code was doing something definitely not right:
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
This is why it's important to use this compiler checking, and why it's important to fix compiler warnings, if for no other reason than the sheer noise from so many warnings can mask real errors.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: ptconn.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/passthru/ptconn.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ptconn.c 10 Nov 2006 23:45:04 -0000 1.5
+++ ptconn.c 5 Dec 2008 22:41:51 -0000 1.6
@@ -248,7 +248,7 @@
++conn->ptconn_usecount;
*ldp = conn->ptconn_ld;
slapi_log_error( SLAPI_LOG_PLUGIN, PASSTHRU_PLUGIN_SUBSYSTEM,
- "<= passthru_get_connection ld=0x%x (concurrency now %d)\n",
+ "<= passthru_get_connection ld=0x%p (concurrency now %d)\n",
*ldp, conn->ptconn_usecount );
} else {
slapi_log_error( SLAPI_LOG_PLUGIN, PASSTHRU_PLUGIN_SUBSYSTEM,
@@ -295,7 +295,7 @@
if ( conn == NULL ) { /* ld not found -- unexpected */
slapi_log_error( SLAPI_LOG_PLUGIN, PASSTHRU_PLUGIN_SUBSYSTEM,
- "=> passthru_release_connection ld=0x%x not found\n", ld );
+ "=> passthru_release_connection ld=0x%p not found\n", ld );
} else {
PASSTHRU_ASSERT( conn->ptconn_usecount > 0 );
--conn->ptconn_usecount;
15 years, 4 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/pam_passthru pam_ptimpl.c, 1.13, 1.14
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13701/ldapserver/ldap/servers/plugins/pam_passthru
Modified Files:
pam_ptimpl.c
Log Message:
Resolves: bug 454030
Bug Description: Need to address 64-bit compiler warnings - again
Reviewed by: nhosoi (Thanks!)
Fix Description: This patch cleans up most of the other remaining compiler warnings. I compiled the directory server code with these flags on RHEL5 x86_64: -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
I also enabled argument/format match checking for most of the commonly used varadic functions. Most of the problems I found fell into these categories:
1) Too many or not enough arguments e.g. most everything that uses or did use LDAPDebug had extra 0,0 arguments. If they had been switched to use slapi_log_error, I removed the extra arguments - for those places still using LDAPDebug, I introduced more macros to handle the number of arguments, since C macros cannot be varadic.
2) When using NSPR formatting functions, we have to use %llu or %lld for 64-bit values, even on 64-bit systems. However, for regular system formatting functions, we have to use %ld or %lu. I introduced two new macros NSPRIu64 and NSPRI64 to handle cases where we are passing explicit 64-bit values to NSPR formatting functions, so that we can use the regular PRIu64 and PRI64 macros for regular system formatting functions. I also made sure we used NSPRI* only with NSPR functions, and used PRI* only with system functions.
3) use %lu for size_t and %ld for time_t
I did find a few "real" errors, places that the code was doing something definitely not right:
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
This is why it's important to use this compiler checking, and why it's important to fix compiler warnings, if for no other reason than the sheer noise from so many warnings can mask real errors.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: pam_ptimpl.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru/pam_ptimpl.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pam_ptimpl.c 15 Oct 2008 06:29:56 -0000 1.13
+++ pam_ptimpl.c 5 Dec 2008 22:41:51 -0000 1.14
@@ -377,7 +377,7 @@
delete_my_str_buf(&pam_id);
if ((retcode == LDAP_SUCCESS) && (rc != PAM_SUCCESS)) {
- errmsg = PR_smprintf("Unknown PAM error [%d] for user id [%d], bind DN [%s]",
+ errmsg = PR_smprintf("Unknown PAM error [%d] for user id [%s], bind DN [%s]",
rc, pam_id.str, escape_string(binddn, buf));
retcode = LDAP_OPERATIONS_ERROR;
}
15 years, 4 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/memberof memberof.c, 1.13, 1.14
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13701/ldapserver/ldap/servers/plugins/memberof
Modified Files:
memberof.c
Log Message:
Resolves: bug 454030
Bug Description: Need to address 64-bit compiler warnings - again
Reviewed by: nhosoi (Thanks!)
Fix Description: This patch cleans up most of the other remaining compiler warnings. I compiled the directory server code with these flags on RHEL5 x86_64: -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
I also enabled argument/format match checking for most of the commonly used varadic functions. Most of the problems I found fell into these categories:
1) Too many or not enough arguments e.g. most everything that uses or did use LDAPDebug had extra 0,0 arguments. If they had been switched to use slapi_log_error, I removed the extra arguments - for those places still using LDAPDebug, I introduced more macros to handle the number of arguments, since C macros cannot be varadic.
2) When using NSPR formatting functions, we have to use %llu or %lld for 64-bit values, even on 64-bit systems. However, for regular system formatting functions, we have to use %ld or %lu. I introduced two new macros NSPRIu64 and NSPRI64 to handle cases where we are passing explicit 64-bit values to NSPR formatting functions, so that we can use the regular PRIu64 and PRI64 macros for regular system formatting functions. I also made sure we used NSPRI* only with NSPR functions, and used PRI* only with system functions.
3) use %lu for size_t and %ld for time_t
I did find a few "real" errors, places that the code was doing something definitely not right:
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
This is why it's important to use this compiler checking, and why it's important to fix compiler warnings, if for no other reason than the sheer noise from so many warnings can mask real errors.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: memberof.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof/memberof.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- memberof.c 18 Jul 2008 18:11:30 -0000 1.13
+++ memberof.c 5 Dec 2008 22:41:51 -0000 1.14
@@ -1071,10 +1071,14 @@
*/
if (0 == memberof_compare(config, &this_dn_val, &to_dn_val))
{
+ const char *strval = "NULL";
+ if (this_dn_val) {
+ strval = slapi_value_get_string(this_dn_val);
+ }
slapi_log_error( SLAPI_LOG_PLUGIN,
MEMBEROF_PLUGIN_SUBSYSTEM,
"memberof_modop_one_replace_r: not processing memberOf "
- "operations on self entry: %s\n", this_dn_val);
+ "operations on self entry: %s\n", strval);
goto bail;
}
15 years, 4 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/acl acl.c, 1.13, 1.14 acl_ext.c, 1.9, 1.10 aclanom.c, 1.8, 1.9 aclgroup.c, 1.5, 1.6 aclinit.c, 1.7, 1.8 acllas.c, 1.14, 1.15 aclparse.c, 1.12, 1.13 aclplugin.c, 1.5, 1.6 aclutil.c, 1.9, 1.10
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/acl
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13701/ldapserver/ldap/servers/plugins/acl
Modified Files:
acl.c acl_ext.c aclanom.c aclgroup.c aclinit.c acllas.c
aclparse.c aclplugin.c aclutil.c
Log Message:
Resolves: bug 454030
Bug Description: Need to address 64-bit compiler warnings - again
Reviewed by: nhosoi (Thanks!)
Fix Description: This patch cleans up most of the other remaining compiler warnings. I compiled the directory server code with these flags on RHEL5 x86_64: -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
I also enabled argument/format match checking for most of the commonly used varadic functions. Most of the problems I found fell into these categories:
1) Too many or not enough arguments e.g. most everything that uses or did use LDAPDebug had extra 0,0 arguments. If they had been switched to use slapi_log_error, I removed the extra arguments - for those places still using LDAPDebug, I introduced more macros to handle the number of arguments, since C macros cannot be varadic.
2) When using NSPR formatting functions, we have to use %llu or %lld for 64-bit values, even on 64-bit systems. However, for regular system formatting functions, we have to use %ld or %lu. I introduced two new macros NSPRIu64 and NSPRI64 to handle cases where we are passing explicit 64-bit values to NSPR formatting functions, so that we can use the regular PRIu64 and PRI64 macros for regular system formatting functions. I also made sure we used NSPRI* only with NSPR functions, and used PRI* only with system functions.
3) use %lu for size_t and %ld for time_t
I did find a few "real" errors, places that the code was doing something definitely not right:
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
This is why it's important to use this compiler checking, and why it's important to fix compiler warnings, if for no other reason than the sheer noise from so many warnings can mask real errors.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: acl.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acl.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- acl.c 13 Nov 2008 23:08:17 -0000 1.13
+++ acl.c 5 Dec 2008 22:41:50 -0000 1.14
@@ -297,7 +297,7 @@
if ( !privateBackend && (be_readonly || slapi_config_get_readonly () )){
slapi_log_error (loglevel, plugin_name,
- "conn=%" PRIu64 " op=%d (main): Deny %s on entry(%s)"
+ "conn=%" NSPRIu64 " op=%d (main): Deny %s on entry(%s)"
": readonly backend\n",
op->o_connid, op->o_opid,
acl_access2str(access),
@@ -310,7 +310,7 @@
TNF_PROBE_0_DEBUG(acl_skipaccess_start,"ACL","");
if ( acl_skip_access_check ( pb, e )) {
slapi_log_error (loglevel, plugin_name,
- "conn=%" PRIu64 " op=%d (main): Allow %s on entry(%s)"
+ "conn=%" NSPRIu64 " op=%d (main): Allow %s on entry(%s)"
": root user\n",
op->o_connid, op->o_opid,
acl_access2str(access),
@@ -438,7 +438,7 @@
TNF_PROBE_0_DEBUG(acl_entry_first_touch_start,"ACL","");
slapi_log_error(loglevel, plugin_name,
- "#### conn=%" PRIu64 " op=%d binddn=\"%s\"\n",
+ "#### conn=%" NSPRIu64 " op=%d binddn=\"%s\"\n",
op->o_connid, op->o_opid, clientDn);
aclpb->aclpb_stat_total_entries++;
@@ -504,7 +504,7 @@
if (rv < 0) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "Unable to set the Slapi_Entry in the Plist\n",0,0,0);
+ "Unable to set the Slapi_Entry in the Plist\n");
ret_val = LDAP_OPERATIONS_ERROR;
goto cleanup_and_ret;
}
@@ -570,7 +570,7 @@
slapi_log_error( SLAPI_LOG_ACL, plugin_name,
"Processed attr:%s for entry:%s\n", attr ? attr : "NULL",
- ACL_ESCAPE_STRING_WITH_PUNCTUATION ( n_edn, ebuf), 0);
+ ACL_ESCAPE_STRING_WITH_PUNCTUATION ( n_edn, ebuf));
/*
** Now evaluate the rights.
@@ -755,7 +755,7 @@
null_user);
slapi_log_error(loglevel, plugin_name,
- "conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to proxy (%s)"
+ "conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to proxy (%s)"
": %s\n",
op->o_connid, op->o_opid,
source,
@@ -768,7 +768,7 @@
} else {
proxy_user = null_user;
slapi_log_error(loglevel, plugin_name,
- "conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to proxy (%s)"
+ "conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to proxy (%s)"
": %s\n",
op->o_connid, op->o_opid,
source,
@@ -781,7 +781,7 @@
}
} else{
slapi_log_error(loglevel, plugin_name,
- "conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to %s"
+ "conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to %s"
": %s\n",
op->o_connid, op->o_opid,
source,
@@ -1150,7 +1150,7 @@
slapi_log_error (SLAPI_LOG_ACL, plugin_name,
"Root access (%s) allowed on entry(%s)\n",
acl_access2str(access),
- ACL_ESCAPE_STRING_WITH_PUNCTUATION (n_edn, ebuf), 0);
+ ACL_ESCAPE_STRING_WITH_PUNCTUATION (n_edn, ebuf));
TNF_PROBE_1_DEBUG(acl_read_access_allowed_on_attr_end ,"ACL","",
tnf_string,skip_aclcheck,"");
@@ -1219,7 +1219,7 @@
if (aclpb->aclpb_state & ACLPB_ATTR_STAR_MATCHED) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
"STAR Access allowed on attr:%s; entry:%s \n",
- attr, ACL_ESCAPE_STRING_WITH_PUNCTUATION (n_edn, ebuf), 0);
+ attr, ACL_ESCAPE_STRING_WITH_PUNCTUATION (n_edn, ebuf));
decision_reason.reason =
ACL_REASON_EVALCONTEXT_CACHED_ATTR_STAR_ALLOW;
ret_val = LDAP_SUCCESS;
@@ -1575,7 +1575,7 @@
*/
if ( group_change ) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "Group Change: Invalidating entire UserGroup Cache\n",
+ "Group Change: Invalidating entire UserGroup Cache %s\n",
ACL_ESCAPE_STRING_WITH_PUNCTUATION(n_dn, ebuf));
aclg_regen_group_signature();
if ( (optype == SLAPI_OPERATION_MODIFY) || (optype == SLAPI_OPERATION_DELETE ) ) {
@@ -1753,7 +1753,7 @@
new_RDN = (char*) change;
slapi_log_error (SLAPI_LOG_ACL, plugin_name,
"acl_modified (MODRDN %s => \"%s\"\n",
- ACL_ESCAPE_STRING_WITH_PUNCTUATION (n_dn, ebuf), new_RDN, 0);
+ ACL_ESCAPE_STRING_WITH_PUNCTUATION (n_dn, ebuf), new_RDN);
/* compute new_DN: */
parent_DN = slapi_dn_parent (n_dn);
@@ -1921,7 +1921,7 @@
aclpb->aclpb_num_allow_handles = allow_handle;
slapi_log_error(SLAPI_LOG_ACL, plugin_name, "Num of ALLOW Handles:%d, DENY handles:%d\n",
- aclpb->aclpb_num_allow_handles, aclpb->aclpb_num_deny_handles, 0);
+ aclpb->aclpb_num_allow_handles, aclpb->aclpb_num_deny_handles);
TNF_PROBE_0_DEBUG(acl__scan_for_acis_end,"ACL","");
@@ -2057,8 +2057,7 @@
dn_matched = ACL_FALSE;
if(rv == ACL_ERR) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "acl__resource_match_aci:pattern err\n",
- 0,0,0);
+ "acl__resource_match_aci:pattern err\n");
matches = ACL_FALSE;
goto acl__resource_match_aci_EXIT;
}
@@ -2770,7 +2769,7 @@
if (access & SLAPI_ACL_SEARCH) {
if ( result & ACLPB_CACHE_SEARCH_RES_DENY){
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "DENY:Found SEARCH DENY in cache\n",0,0,0);
+ "DENY:Found SEARCH DENY in cache\n");
__acl_set_aclIndex_inResult ( aclpb, access, index );
result_reason->deciding_aci = aci;
result_reason->reason = ACL_REASON_RESULT_CACHED_DENY;
@@ -2780,7 +2779,7 @@
} else if ((result & ACLPB_CACHE_SEARCH_RES_SKIP) ||
(result & ACLPB_CACHE_SEARCH_RES_ALLOW)) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "DENY:Found SEARCH SKIP in cache\n",0,0,0);
+ "DENY:Found SEARCH SKIP in cache\n");
skip_eval = 1;
break;
} else {
@@ -2789,7 +2788,7 @@
} else { /* must be READ */
if (result & ACLPB_CACHE_READ_RES_DENY) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "DENY:Found READ DENY in cache\n",0,0,0);
+ "DENY:Found READ DENY in cache\n");
__acl_set_aclIndex_inResult ( aclpb, access, index );
result_reason->deciding_aci = aci;
result_reason->reason = ACL_REASON_RESULT_CACHED_DENY;
@@ -2798,7 +2797,7 @@
return ACL_RES_DENY;
} else if ( result & ACLPB_CACHE_READ_RES_SKIP) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "DENY:Found READ SKIP in cache\n",0,0,0);
+ "DENY:Found READ SKIP in cache\n");
skip_eval = 1;
break;
} else {
@@ -2816,8 +2815,7 @@
rv = ACL_EvalSetACL(NULL, acleval, aci->aci_handle);
if ( rv < 0) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "acl__TestRights:Unable to set the DENY acllist\n",
- 0,0,0);
+ "acl__TestRights:Unable to set the DENY acllist\n");
continue;
}
/*
@@ -2831,7 +2829,7 @@
&deny_generic,
&acl_tag, &expr_num);
- slapi_log_error( SLAPI_LOG_ACL, plugin_name, "Processed:%d DENY handles Result:%d\n",index, rights_rv,0);
+ slapi_log_error( SLAPI_LOG_ACL, plugin_name, "Processed:%d DENY handles Result:%d\n",index, rights_rv);
if (rights_rv == ACL_RES_FAIL) {
result_reason->deciding_aci = aci;
@@ -2989,7 +2987,7 @@
return ACL_RES_ALLOW;
} else if ( result & ACLPB_CACHE_SEARCH_RES_SKIP) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "Found SEARCH SKIP in cache\n",0,0,0);
+ "Found SEARCH SKIP in cache\n");
skip_eval = 1;
break;
} else {
@@ -2999,7 +2997,7 @@
} else {
if ( result & ACLPB_CACHE_READ_RES_ALLOW) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "Found READ ALLOW in cache\n",0,0,0);
+ "Found READ ALLOW in cache\n");
__acl_set_aclIndex_inResult ( aclpb, access, index );
result_reason->deciding_aci = aci;
result_reason->reason = ACL_REASON_RESULT_CACHED_ALLOW;
@@ -3008,7 +3006,7 @@
return ACL_RES_ALLOW;
} else if ( result & ACLPB_CACHE_READ_RES_SKIP) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "Found READ SKIP in cache\n",0,0,0);
+ "Found READ SKIP in cache\n");
skip_eval = 1;
break;
} else {
@@ -3027,8 +3025,7 @@
rv = ACL_EvalSetACL(NULL, acleval, aci->aci_handle);
if ( rv < 0) {
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
- "acl__TestRights:Unable to set the acllist\n",
- 0,0,0);
+ "acl__TestRights:Unable to set the acllist\n");
continue;
}
/*
@@ -3172,7 +3169,7 @@
/* 2 * in case every char is special */
if (p + 2 * strlen ( initial ) > end) {
slapi_log_error (SLAPI_LOG_ACL, plugin_name,
- "not enough pattern space\n", 0, 0, 0);
+ "not enough pattern space\n");
return (ACL_ERR);
}
@@ -3190,7 +3187,7 @@
/* ".*" + value */
if (p + 2 * strlen ( any[i]) + 2 > end) {
slapi_log_error (SLAPI_LOG_ACL, plugin_name,
- "not enough pattern space\n", 0, 0, 0);
+ "not enough pattern space\n");
return (ACL_ERR);
}
@@ -3206,7 +3203,7 @@
/* ".*" + value */
if (p + 2 * strlen ( final ) + 2 > end) {
slapi_log_error (SLAPI_LOG_ACL, plugin_name,
- "not enough pattern space\n", 0, 0, 0);
+ "not enough pattern space\n");
return (ACL_ERR);
}
@@ -3240,7 +3237,7 @@
slapd_re_lock();
if ((p = slapd_re_comp (pat)) != 0) {
slapi_log_error (SLAPI_LOG_ACL, plugin_name,
- "acl_match_substring:re_comp failed (%s)\n", p, 0, 0);
+ "acl_match_substring:re_comp failed (%s)\n", p);
slapd_re_unlock();
return (ACL_ERR);
}
@@ -3368,11 +3365,11 @@
if (aclpb->aclpb_state & ACLPB_HAS_ACLCB_EVALCONTEXT ) {
c_evalContext = &aclpb->aclpb_prev_opEval_context;
slapi_log_error ( SLAPI_LOG_ACL, plugin_name,
- "acl__attr_cached_result:Using Context: ACLPB_ACLCB\n", 0,0,0 );
+ "acl__attr_cached_result:Using Context: ACLPB_ACLCB\n" );
} else {
c_evalContext = &aclpb->aclpb_prev_entryEval_context;
slapi_log_error ( SLAPI_LOG_ACL, plugin_name,
- "acl__attr_cached_result:Using Context: ACLPB_PREV\n", 0,0,0 );
+ "acl__attr_cached_result:Using Context: ACLPB_PREV\n" );
}
if ( attr == NULL ) {
Index: acl_ext.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acl_ext.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- acl_ext.c 17 Oct 2008 22:12:47 -0000 1.9
+++ acl_ext.c 5 Dec 2008 22:41:50 -0000 1.10
@@ -800,14 +800,14 @@
if ( aclpb->aclpb_res_type & ~ACLPB_RESTYPE_ALL ) {
slapi_log_error( SLAPI_LOG_FATAL, plugin_name,
"The aclpb res_type value (%d) has exceeded. Limit is (%d)\n",
- aclpb->aclpb_res_type, ACLPB_RESTYPE_ALL, 0 );
+ aclpb->aclpb_res_type, ACLPB_RESTYPE_ALL );
dump_aclpb_info = 1;
}
if ( dump_aclpb_info ) {
const char *ndn;
slapi_log_error ( SLAPI_LOG_FATAL, plugin_name,
- "ACLPB value is:%p\n", aclpb, 0,0 );
+ "ACLPB value is:%p\n", aclpb );
ndn = slapi_sdn_get_ndn ( aclpb->aclpb_curr_entry_sdn );
slapi_log_error ( SLAPI_LOG_FATAL, plugin_name, "curr_entry:%p num_entries:%d curr_dn:%p\n",
Index: aclanom.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclanom.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aclanom.c 17 Oct 2008 22:12:47 -0000 1.8
+++ aclanom.c 5 Dec 2008 22:41:50 -0000 1.9
@@ -147,7 +147,7 @@
/* We have a new signature now */
a_profile->anom_signature = acl_get_aclsignature();
- slapi_log_error(SLAPI_LOG_ACL, plugin_name, "GENERATING ANOM USER PROFILE\n", 0,0,0);
+ slapi_log_error(SLAPI_LOG_ACL, plugin_name, "GENERATING ANOM USER PROFILE\n");
/*
** Go thru the ACL list and find all the ACLs which apply to the
** anonymous user i.e anyone. we can generate a profile for that.
@@ -173,7 +173,7 @@
(aci->aci_type & ACI_CONTAIN_NOT_GROUPDN) ||
(aci->aci_type & ACI_CONTAIN_NOT_ROLEDN)) ){
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "CANCELLING ANOM USER PROFILE BECAUSE OF DENY RULE\n", 0,0,0);
+ "CANCELLING ANOM USER PROFILE BECAUSE OF DENY RULE\n");
goto cleanup;
}
@@ -191,7 +191,7 @@
*/
if ( aci->aci_ruleType & ~ACI_USERDN_RULE ){
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "CANCELLING ANOM USER PROFILE BECAUSE OF COMPLEX RULE\n", 0,0,0);
+ "CANCELLING ANOM USER PROFILE BECAUSE OF COMPLEX RULE\n");
goto cleanup;
}
@@ -211,7 +211,7 @@
} else {
/* clean up before leaving */
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "CANCELLING ANOM USER PROFILE 1\n", 0,0,0);
+ "CANCELLING ANOM USER PROFILE 1\n");
goto cleanup;
}
@@ -221,7 +221,7 @@
a_numacl = a_profile->anom_numacls++;
if ( a_profile->anom_numacls == ACL_ANOM_MAX_ACL ) {
- slapi_log_error(SLAPI_LOG_ACL, plugin_name, "CANCELLING ANOM USER PROFILE 2\n", 0,0,0);
+ slapi_log_error(SLAPI_LOG_ACL, plugin_name, "CANCELLING ANOM USER PROFILE 2\n");
goto cleanup;
}
@@ -269,7 +269,7 @@
/* clean up before leaving */
__aclanom__del_profile ();
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "CANCELLING ANOM USER PROFILE 3\n", 0,0,0);
+ "CANCELLING ANOM USER PROFILE 3\n");
goto cleanup;
}
@@ -543,14 +543,14 @@
aci_ndn = slapi_sdn_get_ndn (acl_anom_profile->anom_targetinfo[i].anom_target);
slapi_log_error(loglevel, plugin_name,
- "conn=%" PRIu64 " op=%d: Allow access on entry(%s).attr(%s) to anonymous: acidn=\"%s\"\n",
+ "conn=%" NSPRIu64 " op=%d: Allow access on entry(%s).attr(%s) to anonymous: acidn=\"%s\"\n",
op->o_connid, op->o_opid,
escape_string_with_punctuation(ndn, ebuf),
attr ? attr:"NULL",
escape_string_with_punctuation(aci_ndn, ebuf));
} else {
slapi_log_error(loglevel, plugin_name,
- "conn=%" PRIu64 " op=%d: Deny access on entry(%s).attr(%s) to anonymous\n",
+ "conn=%" NSPRIu64 " op=%d: Deny access on entry(%s).attr(%s) to anonymous\n",
op->o_connid, op->o_opid,
escape_string_with_punctuation(ndn, ebuf), attr ? attr:"NULL" );
}
Index: aclgroup.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclgroup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aclgroup.c 10 Nov 2006 23:44:49 -0000 1.5
+++ aclgroup.c 5 Dec 2008 22:41:50 -0000 1.6
@@ -124,7 +124,7 @@
if ( !u_group->aclug_refcnt ) {
slapi_log_error( SLAPI_LOG_ACL, plugin_name,
- "In traversal group deallocation\n", 0,0,0 );
+ "In traversal group deallocation\n" );
__aclg__delete_userGroup (u_group);
}
} else {
@@ -164,7 +164,7 @@
if ( u_group == aclUserGroups->aclg_last )
aclUserGroups->aclg_last = p_group;
}
- slapi_log_error(SLAPI_LOG_ACL, plugin_name, "acl_init_userGroup: found in cache for dn:%s\n", n_dn,0,0);
+ slapi_log_error(SLAPI_LOG_ACL, plugin_name, "acl_init_userGroup: found in cache for dn:%s\n", n_dn);
}
if (!got_lock ) ACLG_ULOCK_GROUPCACHE_WRITE ();
}
@@ -291,7 +291,7 @@
* That's fine as the invalid one will be deallocated when done.
*/
- slapi_log_error( SLAPI_LOG_ACL, plugin_name, "ALLOCATING GROUP FOR:%s\n", n_dn,0,0 );
+ slapi_log_error( SLAPI_LOG_ACL, plugin_name, "ALLOCATING GROUP FOR:%s\n", n_dn );
u_group = ( aclUserGroup * ) slapi_ch_calloc ( 1, sizeof ( aclUserGroup ) );
u_group->aclug_refcnt = 1;
@@ -385,7 +385,7 @@
* be in a condemned state and later deleted.
*/
- slapi_log_error( SLAPI_LOG_ACL, plugin_name, "DEALLOCATING GROUP FOR:%s\n", u_group->aclug_ndn,0,0 );
+ slapi_log_error( SLAPI_LOG_ACL, plugin_name, "DEALLOCATING GROUP FOR:%s\n", u_group->aclug_ndn );
slapi_ch_free ( (void **) &u_group->aclug_ndn );
Index: aclinit.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclinit.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aclinit.c 18 Oct 2007 00:08:27 -0000 1.7
+++ aclinit.c 5 Dec 2008 22:41:50 -0000 1.8
@@ -86,7 +86,7 @@
/* Initialize the LIBACCESS ACL library */
if (ACL_Init() != 0) {
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
- "ACL Library Initialization failed\n",0,0,0);
+ "ACL Library Initialization failed\n");
return 1;
}
@@ -240,7 +240,7 @@
if ( thisbeonly && be_name == NULL) {
slapi_log_error ( SLAPI_LOG_FATAL, plugin_name,
- "Error: This be_name must be specified.\n", 0, 0, 0);
+ "Error: This be_name must be specified.\n");
return -1;
}
@@ -387,7 +387,7 @@
slapi_log_error ( SLAPI_LOG_FATAL, plugin_name,
"Error: This (%s) ACL will not be considered for evaluation"
" because of syntax errors.\n",
- attrValue->bv_val ? attrValue->bv_val: "NULL", 0, 0);
+ attrValue->bv_val ? attrValue->bv_val: "NULL");
call_back_data->retCode = rv;
}
i= slapi_attr_next_value( attr, i, &sval );
@@ -409,7 +409,7 @@
/* We got an error; Log it and then march along */
slapi_log_error ( SLAPI_LOG_FATAL, plugin_name,
"Error: ACls not deleted from %s\n",
- e_sdn, 0, 0);
+ slapi_sdn_get_dn(e_sdn));
call_back_data->retCode = rv;
}
if ( call_back_data->lock_flag == DO_TAKE_ACLCACHE_WRITELOCK) {
@@ -458,14 +458,14 @@
if (rv < 0) {
acl_print_acllib_err(&errp, NULL);
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
- "Unable to Register the methods\n", 0,0,0);
+ "Unable to Register the methods\n");
return ACL_ERR;
}
rv = ACL_MethodSetDefault (&errp, methodinfo);
if (rv < 0) {
acl_print_acllib_err(&errp, NULL);
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
- "Unable to Set the default method\n", 0,0,0);
+ "Unable to Set the default method\n");
return ACL_ERR;
}
rv = ACL_AttrGetterRegister(&errp, ACL_ATTR_IP, DS_LASIpGetter,
@@ -473,7 +473,7 @@
if (rv < 0) {
acl_print_acllib_err(&errp, NULL);
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
- "Unable to Register Attr ip\n", 0,0,0);
+ "Unable to Register Attr ip\n");
return ACL_ERR;
}
rv = ACL_AttrGetterRegister(&errp, ACL_ATTR_DNS, DS_LASDnsGetter,
@@ -481,7 +481,7 @@
if (rv < 0) {
acl_print_acllib_err(&errp, NULL);
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
- "Unable to Register Attr dns\n", 0,0,0);
+ "Unable to Register Attr dns\n");
return ACL_ERR;
}
return ACL_OK;
@@ -512,59 +512,59 @@
if (ACL_LasRegister(NULL, DS_LAS_USER, (LASEvalFunc_t) DS_LASUserEval,
(LASFlushFunc_t) NULL) < 0) {
slapi_log_error (SLAPI_LOG_FATAL, plugin_name,
- "Unable to register USER Las\n",0,0,0);
+ "Unable to register USER Las\n");
return ACL_ERR;
}
if (ACL_LasRegister(NULL, DS_LAS_GROUP, (LASEvalFunc_t) DS_LASGroupEval,
(LASFlushFunc_t) NULL) < 0) {
slapi_log_error (SLAPI_LOG_FATAL, plugin_name,
- "Unable to register GROUP Las\n",0,0,0);
+ "Unable to register GROUP Las\n");
return ACL_ERR;
}
if (ACL_LasRegister(NULL, DS_LAS_GROUPDN, (LASEvalFunc_t)DS_LASGroupDnEval,
(LASFlushFunc_t)NULL) < 0) {
slapi_log_error (SLAPI_LOG_FATAL, plugin_name,
- "Unable to register GROUPDN Las\n",0,0,0);
+ "Unable to register GROUPDN Las\n");
return ACL_ERR;
}
if (ACL_LasRegister(NULL, DS_LAS_ROLEDN, (LASEvalFunc_t)DS_LASRoleDnEval,
(LASFlushFunc_t)NULL) < 0) {
slapi_log_error (SLAPI_LOG_FATAL, plugin_name,
- "Unable to register ROLEDN Las\n",0,0,0);
+ "Unable to register ROLEDN Las\n");
return ACL_ERR;
}
if (ACL_LasRegister(NULL, DS_LAS_USERDN, (LASEvalFunc_t)DS_LASUserDnEval,
(LASFlushFunc_t)NULL) < 0) {
slapi_log_error (SLAPI_LOG_FATAL, plugin_name,
- "Unable to register USERDN Las\n",0,0,0);
+ "Unable to register USERDN Las\n");
return ACL_ERR;
}
if (ACL_LasRegister(NULL, DS_LAS_USERDNATTR,
(LASEvalFunc_t)DS_LASUserDnAttrEval,
(LASFlushFunc_t)NULL) < 0) {
slapi_log_error (SLAPI_LOG_FATAL, plugin_name,
- "Unable to register USERDNATTR Las\n",0,0,0);
+ "Unable to register USERDNATTR Las\n");
return ACL_ERR;
}
if (ACL_LasRegister(NULL, DS_LAS_AUTHMETHOD,
(LASEvalFunc_t)DS_LASAuthMethodEval,
(LASFlushFunc_t)NULL) < 0) {
slapi_log_error (SLAPI_LOG_FATAL, plugin_name,
- "Unable to register CLIENTAUTHTYPE Las\n",0,0,0);
+ "Unable to register CLIENTAUTHTYPE Las\n");
return ACL_ERR;
}
if (ACL_LasRegister(NULL, DS_LAS_GROUPDNATTR,
(LASEvalFunc_t)DS_LASGroupDnAttrEval,
(LASFlushFunc_t)NULL) < 0) {
slapi_log_error (SLAPI_LOG_FATAL, plugin_name,
- "Unable to register GROUPDNATTR Las\n",0,0,0);
+ "Unable to register GROUPDNATTR Las\n");
return ACL_ERR;
}
if (ACL_LasRegister(NULL, DS_LAS_USERATTR,
(LASEvalFunc_t)DS_LASUserAttrEval,
(LASFlushFunc_t)NULL) < 0) {
slapi_log_error (SLAPI_LOG_FATAL, plugin_name,
- "Unable to register USERATTR Las\n",0,0,0);
+ "Unable to register USERATTR Las\n");
return ACL_ERR;
}
return ACL_OK;
Index: acllas.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acllas.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- acllas.c 5 Nov 2008 18:14:37 -0000 1.14
+++ acllas.c 5 Dec 2008 22:41:50 -0000 1.15
@@ -293,7 +293,7 @@
if ( rv != LAS_EVAL_TRUE || ( NULL == aclpb )) {
acl_print_acllib_err(errp, NULL);
slapi_log_error( SLAPI_LOG_ACL, plugin_name,
- "DS_LASIpGetter:Unable to get the ACLPB(%d)\n", rv,0,0);
+ "DS_LASIpGetter:Unable to get the ACLPB(%d)\n", rv);
return LAS_EVAL_FAIL;
}
@@ -346,7 +346,7 @@
if ( rv != LAS_EVAL_TRUE || ( NULL == aclpb )) {
acl_print_acllib_err(errp, NULL);
slapi_log_error( SLAPI_LOG_ACL, plugin_name,
- "DS_LASDnsGetter:Unable to get the ACLPB(%d)\n", rv,0,0);
+ "DS_LASDnsGetter:Unable to get the ACLPB(%d)\n", rv);
return LAS_EVAL_FAIL;
}
@@ -424,7 +424,7 @@
PList_t global_auth)
{
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
- "User LAS is not supported in the ACL\n",0,0,0);
+ "User LAS is not supported in the ACL\n");
return LAS_EVAL_INVALID;
}
@@ -436,7 +436,7 @@
PList_t global_auth)
{
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
- "Group LAS is not supported in the ACL\n",0,0,0);
+ "Group LAS is not supported in the ACL\n");
return LAS_EVAL_INVALID;
}
@@ -542,7 +542,7 @@
char ebuf[ BUFSIZ ];
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
"DS_LASUserDnEval:Syntax error(%s)\n",
- escape_string_with_punctuation( user, ebuf ), 0,0);
+ escape_string_with_punctuation( user, ebuf ));
return LAS_EVAL_FAIL;
}
@@ -671,7 +671,7 @@
if (rc == ACL_ERR) {
slapi_log_error( SLAPI_LOG_ACL, plugin_name,
"DS_LASUserDnEval:Error in matching patteren(%s)\n",
- user,0,0);
+ user);
}
slapi_filter_free(f,1);
} else {
@@ -793,7 +793,7 @@
char ebuf[ BUFSIZ ];
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
"DS_LASGroupDnEval:Syntax error(%s)\n",
- escape_string_with_punctuation( groupName, ebuf ),0,0);
+ escape_string_with_punctuation( groupName, ebuf ));
}
/* Now we have the starting point of the "groupdn" */
@@ -1013,7 +1013,7 @@
char ebuf[ BUFSIZ ];
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
"DS_LASRoleDnEval:Syntax error(%s)\n",
- escape_string_with_punctuation( role, ebuf ),0,0);
+ escape_string_with_punctuation( role, ebuf ));
}
/* Now we have the starting point of the "roledn" */
@@ -1244,7 +1244,7 @@
return LAS_EVAL_FAIL;
}
- slapi_log_error( SLAPI_LOG_ACL, plugin_name,"Attr:%s\n" , attrName, 0,0);
+ slapi_log_error( SLAPI_LOG_ACL, plugin_name,"Attr:%s\n" , attrName);
matched = ACL_FALSE;
for (i=0; i < numOflevels; i++) {
if ( levels[i] == 0 ) {
@@ -1602,7 +1602,7 @@
*/
if ( (u_group = aclg_get_usersGroup ( aclpb , clientDN )) == NULL) {
slapi_log_error( SLAPI_LOG_ACL, plugin_name,
- "Failed to find/allocate a usergroup--aborting evaluation\n", 0, 0);
+ "Failed to find/allocate a usergroup--aborting evaluation\n");
return(ACL_DONT_KNOW);
}
@@ -1748,7 +1748,7 @@
if ((nesting_level > max_nestlevel)) {
slapi_log_error( SLAPI_LOG_ACL, plugin_name,
"GroupEval:Member not found within the allowed nesting level (Allowed:%d Looked at:%d)\n",
- max_nestlevel, nesting_level, 0);
+ max_nestlevel, nesting_level);
result = ACL_DONT_KNOW; /* don't try to cache info based on this result */
goto free_and_return;
@@ -1759,7 +1759,7 @@
max_memberlimit != -1 ) {
slapi_log_error( SLAPI_LOG_ACL, plugin_name,
"GroupEval:Looked at too many entries:(%d, %d)\n",
- info.c_idx, info.lu_idx,0);
+ info.c_idx, info.lu_idx);
result = ACL_DONT_KNOW; /* don't try to cache info based on this result */
goto free_and_return;
}
@@ -2203,7 +2203,7 @@
LDAP_UTF8DEC(ptr);
}
- slapi_log_error( SLAPI_LOG_ACL, plugin_name,"Attr:%s\n" , attrName, 0,0);
+ slapi_log_error( SLAPI_LOG_ACL, plugin_name,"Attr:%s\n" , attrName);
/* See if we have a parent[2].attr" rule */
if ( (ptr = strstr(attrName, "parent[")) != NULL) {
@@ -2229,7 +2229,7 @@
*/
slapi_log_error( SLAPI_LOG_FATAL, plugin_name,
"DS_LASGroupDnattr: Exceeded the ATTR LIMIT:%d: Ignoring extra levels\n",
- ACLLAS_MAX_LEVELS,0,0);
+ ACLLAS_MAX_LEVELS);
}
} else {
/* Must be the attr name. We can goof of by
@@ -2445,7 +2445,7 @@
if ( (u_group = aclg_get_usersGroup ( aclpb , n_clientdn )) == NULL) {
slapi_log_error( SLAPI_LOG_ACL, plugin_name,
- "Failed to find/allocate a usergroup--aborting evaluation\n", 0, 0);
+ "Failed to find/allocate a usergroup--aborting evaluation\n");
slapi_ch_free ( (void **)&s_str );
return(ACL_DONT_KNOW);
}
@@ -2544,7 +2544,7 @@
if (tt == info.lu_idx) {
slapi_log_error( SLAPI_LOG_ACL, plugin_name, "currDn:(%s) \n\tNO MEMBER ADDED\n",
- ACL_ESCAPE_STRING_WITH_PUNCTUATION (curMemberDn, ebuf) , 0,0);
+ ACL_ESCAPE_STRING_WITH_PUNCTUATION (curMemberDn, ebuf));
} else {
for (i=tt; i < info.lu_idx; i++)
slapi_log_error( SLAPI_LOG_ACL, plugin_name,
@@ -2597,7 +2597,7 @@
for (j=0; j < u_group->aclug_numof_member_group; j++)
slapi_log_error( SLAPI_LOG_ACL, plugin_name,
"acllas__eval_memberGroupDnAttr:GROUP[%d] IN CACHE:%s\n",
- j, ACL_ESCAPE_STRING_WITH_PUNCTUATION (u_group->aclug_member_groups[j], ebuf),0);
+ j, ACL_ESCAPE_STRING_WITH_PUNCTUATION (u_group->aclug_member_groups[j], ebuf));
matched = ACL_FALSE;
slapi_entry_attr_find( e, groupattr, &attr);
@@ -3060,7 +3060,7 @@
if ( NULL == aclpb->aclpb_client_entry ) {
slapi_log_error ( SLAPI_LOG_ACL, plugin_name,
- "DS_LASUserAttrEval: Unable to get client's entry\n",0,0,0);
+ "DS_LASUserAttrEval: Unable to get client's entry\n");
return ACL_FALSE;
}
@@ -3224,7 +3224,7 @@
(void **)&linfo->authType, NULL)) < 0) {
acl_print_acllib_err(errp, NULL);
slapi_log_error( SLAPI_LOG_ACL, plugin_name,
- "%s:Unable to get the auth type(%d)\n", rc);
+ "%s:Unable to get the auth type(%d)\n", lasName, rc);
return LAS_EVAL_FAIL;
}
return 0;
@@ -3273,7 +3273,7 @@
if ( NULL == aclpb->aclpb_client_entry ) {
slapi_log_error ( SLAPI_LOG_ACL, plugin_name,
- "acllas__user_has_role: Unable to get client's entry\n",0,0,0);
+ "acllas__user_has_role: Unable to get client's entry\n");
return ACL_FALSE;
}
Index: aclparse.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclparse.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- aclparse.c 8 Oct 2008 17:29:01 -0000 1.12
+++ aclparse.c 5 Dec 2008 22:41:50 -0000 1.13
@@ -394,8 +394,7 @@
if (aci_item->target) {
/* There is something already. ERROR */
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "Multiple targets in the ACL syntax\n",
- 0,0,0);
+ "Multiple targets in the ACL syntax\n");
slapi_filter_free(f, 1);
return(ACL_SYNTAX_ERR);
} else {
@@ -404,8 +403,7 @@
} else if ( type & ACI_TARGET_FILTER) {
if (aci_item->targetFilter) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "Multiple target Filters in the ACL Syntax\n",
- 0,0,0);
+ "Multiple target Filters in the ACL Syntax\n");
slapi_filter_free(f, 1);
return(ACL_SYNTAX_ERR);
} else {
@@ -418,7 +416,7 @@
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
"Unknown keyword at \"%s\"\n Expecting"
" \"target\", \"targetattr\", \"targetfilter\", \"targattrfilters\""
- " or \"version\"\n", str, 0, 0);
+ " or \"version\"\n", str);
return(ACL_SYNTAX_ERR);
}/* switch() */
@@ -491,7 +489,7 @@
if ((newstr = __aclp__normalize_acltxt (aci_item, str )) == NULL) {
return ACL_SYNTAX_ERR;
}
- slapi_log_error(SLAPI_LOG_ACL, plugin_name, "Normalized String:%s\n", newstr, 0,0);
+ slapi_log_error(SLAPI_LOG_ACL, plugin_name, "Normalized String:%s\n", newstr);
/* check for acl syntax error */
if ((handle = (ACLListHandle_t *) ACL_ParseString(&errp,
@@ -1313,7 +1311,7 @@
if (f == NULL) {
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
- "__aclp__init_targetattr:Unable to generate filter (%s)\n", lineptr,0,0);
+ "__aclp__init_targetattr:Unable to generate filter (%s)\n", lineptr);
} else {
attr->u.attr_filter = f;
}
@@ -1882,7 +1880,7 @@
/* No :, syntax error */
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
"Bad targetattrfilter %s:%s\n",
- str,"Expecting \":\"",0);
+ str,"Expecting \":\"");
return(ACL_SYNTAX_ERR);
}
@@ -1895,8 +1893,7 @@
if ( *s == '\0' ) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
- "No attribute name in targattrfilters\n",
- 0,0);
+ "No attribute name in targattrfilters\n");
return(ACL_SYNTAX_ERR);
}
@@ -1914,7 +1911,7 @@
if ((f = slapi_str2filter(tmp_ptr)) == NULL) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
"Bad targetattr filter for attribute %s:%s\n",
- attrfilter->attr_str,tmp_ptr,0);
+ attrfilter->attr_str,tmp_ptr);
slapi_ch_free( (void **) &attrfilter->attr_str);
slapi_ch_free( (void **) &tmp_ptr);
return(ACL_SYNTAX_ERR);
@@ -1929,7 +1926,7 @@
SLAPI_FILTER_SCAN_NOMORE) {
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
"Exactly one attribute type per filter allowed in targattrfilters (%s)\n",
- attrfilter->attr_str, 0);
+ attrfilter->attr_str);
slapi_ch_free( (void **) &attrfilter->attr_str);
slapi_ch_free( (void **) &tmp_ptr);
slapi_filter_free( f, 1 );
Index: aclplugin.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclplugin.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aclplugin.c 10 Nov 2006 23:44:49 -0000 1.5
+++ aclplugin.c 5 Dec 2008 22:41:50 -0000 1.6
@@ -125,7 +125,7 @@
#endif
- slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "<= acl_preop_Init %d\n", rc, 0, 0 );
+ slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "<= acl_preop_Init %d\n", rc );
return( rc );
}
@@ -299,7 +299,7 @@
{
int rc =0;
- slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "=> acl_init\n", 0, 0, 0 );
+ slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "=> acl_init\n" );
if ( 0 != acl_init_ext() ) {
slapi_log_error ( SLAPI_LOG_FATAL, plugin_name,
@@ -326,7 +326,7 @@
rc |= slapi_pblock_set( pb, SLAPI_PLUGIN_ACL_MODS_UPDATE,
(void *) acl_modified );
- slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "<= acl_init %d\n", rc, 0, 0 );
+ slapi_log_error( SLAPI_LOG_PLUGIN, plugin_name, "<= acl_init %d\n", rc);
return( rc );
}
Index: aclutil.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/aclutil.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- aclutil.c 8 Oct 2008 17:29:01 -0000 1.9
+++ aclutil.c 5 Dec 2008 22:41:50 -0000 1.10
@@ -106,7 +106,7 @@
if (msgbuf)
slapi_log_error(SLAPI_LOG_ACL, plugin_name,"ACL LIB ERR:(%s)(%s)\n",
- msgbuf, str ? str: "NULL",0);
+ msgbuf, str ? str: "NULL");
}
void
aclutil_print_aci (aci_t *aci_item, char *type)
@@ -120,7 +120,7 @@
if (!aci_item) {
slapi_log_error (SLAPI_LOG_ACL, plugin_name,
- "acl__print_aci: Null item\n",0,0,0);
+ "acl__print_aci: Null item\n");
return;
}
@@ -463,21 +463,21 @@
if ( ! slapi_is_loglevel_set ( SLAPI_LOG_ACL ) )
return;
- slapi_log_error (SLAPI_LOG_ACL, plugin_name, " ************ RESOURCE INFO STARTS *********\n",0,0,0);
+ slapi_log_error (SLAPI_LOG_ACL, plugin_name, " ************ RESOURCE INFO STARTS *********\n");
slapi_log_error (SLAPI_LOG_ACL, plugin_name, " Client DN: %s\n",
- clientdn ? escape_string_with_punctuation (clientdn, str) : "NULL", 0,0);
+ clientdn ? escape_string_with_punctuation (clientdn, str) : "NULL");
aclutil__access_str (aclpb->aclpb_access, str);
aclutil__typestr (aclpb->aclpb_res_type, &str[strlen(str)]);
slapi_log_error (SLAPI_LOG_ACL, plugin_name, " resource type:%d(%s)\n",
- aclpb->aclpb_res_type, str, 0);
+ aclpb->aclpb_res_type, str);
dn = slapi_sdn_get_dn ( aclpb->aclpb_curr_entry_sdn );
slapi_log_error (SLAPI_LOG_ACL, plugin_name, " Slapi_Entry DN: %s\n",
- dn ? escape_string_with_punctuation ( dn , str) : "NULL",0,0);
+ dn ? escape_string_with_punctuation ( dn , str) : "NULL");
- slapi_log_error (SLAPI_LOG_ACL, plugin_name, " ATTR: %s\n", attr ? attr : "NULL",0,0);
- slapi_log_error (SLAPI_LOG_ACL, plugin_name, " rights:%s\n", right ? right: "NULL",0,0);
- slapi_log_error (SLAPI_LOG_ACL, plugin_name, " ************ RESOURCE INFO ENDS *********\n",0,0,0);
+ slapi_log_error (SLAPI_LOG_ACL, plugin_name, " ATTR: %s\n", attr ? attr : "NULL");
+ slapi_log_error (SLAPI_LOG_ACL, plugin_name, " rights:%s\n", right ? right: "NULL");
+ slapi_log_error (SLAPI_LOG_ACL, plugin_name, " ************ RESOURCE INFO ENDS *********\n");
}
/*
* The input string contains a rule like
15 years, 4 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/chainingdb cb_conn_stateless.c, 1.10, 1.11
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13701/ldapserver/ldap/servers/plugins/chainingdb
Modified Files:
cb_conn_stateless.c
Log Message:
Resolves: bug 454030
Bug Description: Need to address 64-bit compiler warnings - again
Reviewed by: nhosoi (Thanks!)
Fix Description: This patch cleans up most of the other remaining compiler warnings. I compiled the directory server code with these flags on RHEL5 x86_64: -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
I also enabled argument/format match checking for most of the commonly used varadic functions. Most of the problems I found fell into these categories:
1) Too many or not enough arguments e.g. most everything that uses or did use LDAPDebug had extra 0,0 arguments. If they had been switched to use slapi_log_error, I removed the extra arguments - for those places still using LDAPDebug, I introduced more macros to handle the number of arguments, since C macros cannot be varadic.
2) When using NSPR formatting functions, we have to use %llu or %lld for 64-bit values, even on 64-bit systems. However, for regular system formatting functions, we have to use %ld or %lu. I introduced two new macros NSPRIu64 and NSPRI64 to handle cases where we are passing explicit 64-bit values to NSPR formatting functions, so that we can use the regular PRIu64 and PRI64 macros for regular system formatting functions. I also made sure we used NSPRI* only with NSPR functions, and used PRI* only with system functions.
3) use %lu for size_t and %ld for time_t
I did find a few "real" errors, places that the code was doing something definitely not right:
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
This is why it's important to use this compiler checking, and why it's important to fix compiler warnings, if for no other reason than the sheer noise from so many warnings can mask real errors.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: cb_conn_stateless.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/chainingdb/cb_conn_stateless.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cb_conn_stateless.c 2 Dec 2008 15:29:30 -0000 1.10
+++ cb_conn_stateless.c 5 Dec 2008 22:41:50 -0000 1.11
@@ -287,7 +287,7 @@
conn->refcount < maxconcurrency)){
if (cb_debug_on()) {
slapi_log_error( SLAPI_LOG_PLUGIN, CB_PLUGIN_SUBSYSTEM,
- "<= cb_get_connection server found conn 0x%x to use)\n", conn );
+ "<= cb_get_connection server found conn 0x%p to use)\n", conn );
}
goto unlock_and_return; /* found one */
}
@@ -298,7 +298,7 @@
for ( conn = pool->conn.conn_list; conn != NULL; conn = conn->next ) {
if (cb_debug_on()) {
slapi_log_error( SLAPI_LOG_PLUGIN, CB_PLUGIN_SUBSYSTEM,
- "list: conn 0x%x status %d refcount %d\n", conn,
+ "list: conn 0x%p status %d refcount %lu\n", conn,
conn->status, conn->refcount );
}
@@ -306,7 +306,7 @@
&& conn->refcount < maxconcurrency ) {
if (cb_debug_on()) {
slapi_log_error( SLAPI_LOG_PLUGIN, CB_PLUGIN_SUBSYSTEM,
- "<= cb_get_connection server found conn 0x%x to use)\n", conn );
+ "<= cb_get_connection server found conn 0x%p to use)\n", conn );
}
goto unlock_and_return; /* found one */
}
@@ -365,8 +365,7 @@
{
if (cb_debug_on()) {
slapi_log_error( SLAPI_LOG_PLUGIN, CB_PLUGIN_SUBSYSTEM,
- "Internal credentials decoding error\n.",
- 0, 0, 0);
+ "Internal credentials decoding error\n.");
}
rc = LDAP_LOCAL_ERROR;
goto unlock_and_return;
@@ -463,7 +462,7 @@
if (cb_debug_on()) {
slapi_log_error( SLAPI_LOG_PLUGIN, CB_PLUGIN_SUBSYSTEM,
- "<= cb_get_connection added new conn 0x%x, "
+ "<= cb_get_connection added new conn 0x%p, "
"conn count now %d\n", conn->ld, pool->conn.conn_list_count );
}
goto unlock_and_return; /* got a new one */
@@ -489,7 +488,7 @@
*cc=conn;
if (cb_debug_on()) {
slapi_log_error( SLAPI_LOG_PLUGIN, CB_PLUGIN_SUBSYSTEM,
- "<== cb_get_connection ld=0x%x (concurrency now %d)\n",*lld, conn->refcount );
+ "<== cb_get_connection ld=0x%p (concurrency now %lu)\n",*lld, conn->refcount );
}
} else {
@@ -542,14 +541,14 @@
if ( conn == NULL ) { /* ld not found -- unexpected */
slapi_log_error( SLAPI_LOG_PLUGIN, CB_PLUGIN_SUBSYSTEM,
- "==> cb_release_op_connection ld=0x%x not found\n", lld );
+ "==> cb_release_op_connection ld=0x%p not found\n", lld );
} else {
--conn->refcount;
if (cb_debug_on()) {
slapi_log_error( SLAPI_LOG_PLUGIN, CB_PLUGIN_SUBSYSTEM,
- "release conn 0x%x status %d refcount after release %d\n", conn,
+ "release conn 0x%p status %d refcount after release %lu\n", conn,
conn->status, conn->refcount );
}
@@ -632,7 +631,7 @@
if ( conn->refcount == 0 ) {
if (cb_debug_on()) {
slapi_log_error( SLAPI_LOG_PLUGIN, CB_PLUGIN_SUBSYSTEM,
- "cb_check_for_stale_connections: conn 0x%x idle and stale\n",conn);
+ "cb_check_for_stale_connections: conn 0x%p idle and stale\n",conn);
}
--pool->conn.conn_list_count;
if (connprev == NULL) {
@@ -653,7 +652,7 @@
}
if (cb_debug_on()) {
slapi_log_error( SLAPI_LOG_PLUGIN, CB_PLUGIN_SUBSYSTEM,
- "cb_check_for_stale_connections: conn 0x%x stale\n",conn);
+ "cb_check_for_stale_connections: conn 0x%p stale\n",conn);
}
}
connprev = conn ;
@@ -677,7 +676,7 @@
if (cb_debug_on()) {
slapi_log_error( SLAPI_LOG_PLUGIN, CB_PLUGIN_SUBSYSTEM,
- "cb_check_for_stale_connections: conn 0x%x idle and stale\n",conn);
+ "cb_check_for_stale_connections: conn 0x%p idle and stale\n",conn);
}
--pool->conn.conn_list_count;
conn_next=conn->next;
@@ -693,7 +692,7 @@
}
if (cb_debug_on()) {
slapi_log_error( SLAPI_LOG_PLUGIN, CB_PLUGIN_SUBSYSTEM,
- "cb_check_for_stale_connections: conn 0x%x stale\n",conn);
+ "cb_check_for_stale_connections: conn 0x%p stale\n",conn);
}
}
connprev = conn;
15 years, 4 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/include ldaplog.h, 1.6, 1.7
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/include
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13701/ldapserver/ldap/include
Modified Files:
ldaplog.h
Log Message:
Resolves: bug 454030
Bug Description: Need to address 64-bit compiler warnings - again
Reviewed by: nhosoi (Thanks!)
Fix Description: This patch cleans up most of the other remaining compiler warnings. I compiled the directory server code with these flags on RHEL5 x86_64: -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic
I also enabled argument/format match checking for most of the commonly used varadic functions. Most of the problems I found fell into these categories:
1) Too many or not enough arguments e.g. most everything that uses or did use LDAPDebug had extra 0,0 arguments. If they had been switched to use slapi_log_error, I removed the extra arguments - for those places still using LDAPDebug, I introduced more macros to handle the number of arguments, since C macros cannot be varadic.
2) When using NSPR formatting functions, we have to use %llu or %lld for 64-bit values, even on 64-bit systems. However, for regular system formatting functions, we have to use %ld or %lu. I introduced two new macros NSPRIu64 and NSPRI64 to handle cases where we are passing explicit 64-bit values to NSPR formatting functions, so that we can use the regular PRIu64 and PRI64 macros for regular system formatting functions. I also made sure we used NSPRI* only with NSPR functions, and used PRI* only with system functions.
3) use %lu for size_t and %ld for time_t
I did find a few "real" errors, places that the code was doing something definitely not right:
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
https://bugzilla.redhat.com/attachment.cgi?id=325774&action=diff#ldapserv...
This is why it's important to use this compiler checking, and why it's important to fix compiler warnings, if for no other reason than the sheer noise from so many warnings can mask real errors.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: ldaplog.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/include/ldaplog.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ldaplog.h 10 Nov 2006 23:44:41 -0000 1.6
+++ ldaplog.h 5 Dec 2008 22:41:50 -0000 1.7
@@ -73,9 +73,15 @@
/* Disable by default */
#define LDAPDebug( level, fmt, arg1, arg2, arg3 )
#define LDAPDebugLevelIsSet( level ) (0)
+#define LDAPDebug0Args( level, fmt )
+#define LDAPDebug1Arg( level, fmt, arg )
+#define LDAPDebug2Args( level, fmt, arg1, arg2 )
#ifdef LDAP_DEBUG
# undef LDAPDebug
+# undef LDAPDebug0Args
+# undef LDAPDebug1Arg
+# undef LDAPDebug2Args
# undef LDAPDebugLevelIsSet
/* SLAPD_LOGGING should not be on for WINSOCK (16-bit Windows) */
@@ -90,6 +96,24 @@
slapd_log_error_proc( NULL, fmt, arg1, arg2, arg3 ); \
} \
}
+# define LDAPDebug0Args( level, fmt ) \
+ { \
+ if ( *module_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt ); \
+ } \
+ }
+# define LDAPDebug1Arg( level, fmt, arg ) \
+ { \
+ if ( *module_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt, arg ); \
+ } \
+ }
+# define LDAPDebug2Args( level, fmt, arg1, arg2 ) \
+ { \
+ if ( *module_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt, arg1, arg2 ); \
+ } \
+ }
# define LDAPDebugLevelIsSet( level ) (0 != (*module_ldap_debug & level))
# else /* Not _WIN32 */
extern int slapd_ldap_debug;
@@ -99,6 +123,24 @@
slapd_log_error_proc( NULL, fmt, arg1, arg2, arg3 ); \
} \
}
+# define LDAPDebug0Args( level, fmt ) \
+ { \
+ if ( slapd_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt ); \
+ } \
+ }
+# define LDAPDebug1Arg( level, fmt, arg ) \
+ { \
+ if ( slapd_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt, arg ); \
+ } \
+ }
+# define LDAPDebug2Args( level, fmt, arg1, arg2 ) \
+ { \
+ if ( slapd_ldap_debug & level ) { \
+ slapd_log_error_proc( NULL, fmt, arg1, arg2 ); \
+ } \
+ }
# define LDAPDebugLevelIsSet( level ) (0 != (slapd_ldap_debug & level))
# endif /* Win32 */
# else /* no SLAPD_LOGGING */
@@ -110,6 +152,24 @@
PR_snprintf( msg, sizeof(msg), fmt, arg1, arg2, arg3 ); \
ber_err_print( msg ); \
}
+# define LDAPDebug0Args( level, fmt ) \
+ if ( slapd_ldap_debug & level ) { \
+ char msg[256]; \
+ PR_snprintf( msg, sizeof(msg), fmt ); \
+ ber_err_print( msg ); \
+ }
+# define LDAPDebug1Arg( level, fmt, arg ) \
+ if ( slapd_ldap_debug & level ) { \
+ char msg[256]; \
+ PR_snprintf( msg, sizeof(msg), fmt, arg ); \
+ ber_err_print( msg ); \
+ }
+# define LDAPDebug2Args( level, fmt, arg1, arg2 ) \
+ if ( slapd_ldap_debug & level ) { \
+ char msg[256]; \
+ PR_snprintf( msg, sizeof(msg), fmt, arg1, arg2 ); \
+ ber_err_print( msg ); \
+ }
# define LDAPDebugLevelIsSet( level ) (0 != (slapd_ldap_debug & level))
# endif /* SLAPD_LOGGING */
#endif /* LDAP_DEBUG */
15 years, 4 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm filterindex.c, 1.6, 1.7
by Noriko Hosoi
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29185
Modified Files:
filterindex.c
Log Message:
Resolves: #474729
Summary: Unindexed search does not get logged with "notes=U"
Fix Description: In each <index-type> candidates function, check if the
attribute is indexed by calling index_read_ext instead of index_read. The
function index_read_ext takes a variable to return whether the attribute is
indexed or not. Once it's determined, set SLAPI_OP_NOTE_UNINDEXED to the
pblock, which is used when logging the result.
Index: filterindex.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/filterindex.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- filterindex.c 10 Nov 2006 23:45:39 -0000 1.6
+++ filterindex.c 5 Dec 2008 21:03:52 -0000 1.7
@@ -52,7 +52,7 @@
static IDList *ava_candidates(Slapi_PBlock *pb, backend *be, Slapi_Filter *f, int ftype, Slapi_Filter *nextf, int range, int *err);
static IDList *presence_candidates(Slapi_PBlock *pb, backend *be, Slapi_Filter *f, int *err);
-static IDList *extensible_candidates(backend *be, Slapi_Filter *f, int *err);
+static IDList *extensible_candidates(Slapi_PBlock *pb, backend *be, Slapi_Filter *f, int *err);
static IDList *list_candidates(Slapi_PBlock *pb, backend *be, const char *base, Slapi_Filter *flist, int ftype, int *err);
static IDList *substring_candidates(Slapi_PBlock *pb, backend *be, Slapi_Filter *f, int *err);
static IDList * range_candidates(
@@ -69,7 +69,8 @@
char *type,
const char *indextype,
Slapi_Value **ivals,
- int *err
+ int *err,
+ int *unindexed
);
IDList *
@@ -147,7 +148,7 @@
case LDAP_FILTER_EXTENDED:
LDAPDebug( LDAP_DEBUG_FILTER, "\tEXTENSIBLE\n", 0, 0, 0 );
- result = extensible_candidates( be, f, err );
+ result = extensible_candidates( pb, be, f, err );
break;
case LDAP_FILTER_AND:
@@ -194,6 +195,7 @@
Slapi_Value **ivals;
IDList *idl;
void *pi;
+ int unindexed = 0;
LDAPDebug( LDAP_DEBUG_TRACE, "=> ava_candidates\n", 0, 0, 0 );
@@ -281,7 +283,11 @@
ivals=ptr;
slapi_call_syntax_assertion2keys_ava_sv( pi, &tmp, (Slapi_Value ***)&ivals, LDAP_FILTER_EQUALITY_FAST);
- idl = keys2idl( be, type, indextype, ivals, err );
+ idl = keys2idl( be, type, indextype, ivals, err, &unindexed );
+ if ( unindexed ) {
+ unsigned int opnote = SLAPI_OP_NOTE_UNINDEXED;
+ slapi_pblock_set( pb, SLAPI_OPERATION_NOTES, &opnote );
+ }
/* We don't use valuearray_free here since the valueset, berval
* and value was all allocated at once in one big chunk for
@@ -306,8 +312,12 @@
LDAPDebug( LDAP_DEBUG_TRACE,
"<= ava_candidates ALLIDS (no keys)\n", 0, 0, 0 );
return( idl_allids( be ) );
- }
- idl = keys2idl( be, type, indextype, ivals, err );
+ }
+ idl = keys2idl( be, type, indextype, ivals, err, &unindexed );
+ if ( unindexed ) {
+ unsigned int opnote = SLAPI_OP_NOTE_UNINDEXED;
+ slapi_pblock_set( pb, SLAPI_OPERATION_NOTES, &opnote );
+ }
valuearray_free( &ivals );
LDAPDebug( LDAP_DEBUG_TRACE, "<= ava_candidates %lu\n",
(u_long)IDL_NIDS(idl), 0, 0 );
@@ -324,7 +334,8 @@
)
{
char *type;
- IDList *idl;
+ IDList *idl;
+ int unindexed = 0;
LDAPDebug( LDAP_DEBUG_TRACE, "=> presence_candidates\n", 0, 0, 0 );
@@ -333,18 +344,24 @@
0, 0, 0 );
return( NULL );
}
- idl = index_read( be, type, indextype_PRESENCE, NULL, NULL, err );
+ idl = index_read_ext( be, type, indextype_PRESENCE,
+ NULL, NULL, err, &unindexed );
- if (idl != NULL && ALLIDS(idl) && strcasecmp(type, "nscpentrydn") == 0) {
- /* try the equality index instead */
- LDAPDebug(LDAP_DEBUG_TRACE,
+ if ( unindexed ) {
+ unsigned int opnote = SLAPI_OP_NOTE_UNINDEXED;
+ slapi_pblock_set( pb, SLAPI_OPERATION_NOTES, &opnote );
+ }
+
+ if (idl != NULL && ALLIDS(idl) && strcasecmp(type, "nscpentrydn") == 0) {
+ /* try the equality index instead */
+ LDAPDebug(LDAP_DEBUG_TRACE,
"fallback to eq index as pres index gave allids\n",
0, 0, 0);
- idl_free(idl);
- idl = index_range_read(pb, be, type, indextype_EQUALITY,
+ idl_free(idl);
+ idl = index_range_read(pb, be, type, indextype_EQUALITY,
SLAPI_OP_GREATER_OR_EQUAL,
NULL, NULL, 0, NULL, err);
- }
+ }
LDAPDebug( LDAP_DEBUG_TRACE, "<= presence_candidates %lu\n",
(u_long)IDL_NIDS(idl), 0, 0 );
@@ -353,9 +370,10 @@
static IDList *
extensible_candidates(
- backend *be,
- Slapi_Filter *f,
- int *err
+ Slapi_PBlock *glob_pb,
+ backend *be,
+ Slapi_Filter *f,
+ int *err
)
{
IDList* idl = NULL;
@@ -421,9 +439,17 @@
struct berval** key;
for (key = keys; *key != NULL; ++key)
{
+ int unindexed = 0;
IDList* idl3 = (mrOP == SLAPI_OP_EQUAL) ?
- index_read (be, mrTYPE, mrOID, *key, NULL, err) :
- index_range_read (pb, be, mrTYPE, mrOID, mrOP, *key, NULL, 0, NULL, err);
+ index_read_ext(be, mrTYPE, mrOID, *key, NULL,
+ err, &unindexed) :
+ index_range_read (pb, be, mrTYPE, mrOID, mrOP,
+ *key, NULL, 0, NULL, err);
+ if ( unindexed ) {
+ unsigned int opnote = SLAPI_OP_NOTE_UNINDEXED;
+ slapi_pblock_set( glob_pb,
+ SLAPI_OPERATION_NOTES, &opnote );
+ }
if (idl2 == NULL)
{
/* first iteration */
@@ -718,8 +744,9 @@
if ( idl == NULL ) {
idl = tmp;
if ( (ftype == LDAP_FILTER_AND) && ((idl == NULL) ||
- (idl_length(idl) <= FILTER_TEST_THRESHOLD)))
+ (idl_length(idl) <= FILTER_TEST_THRESHOLD))) {
break; /* We can exit the loop now, since the candidate list is small already */
+ }
} else if ( ftype == LDAP_FILTER_AND ) {
if (isnot) {
IDList *new_idl = NULL;
@@ -771,11 +798,13 @@
int *err
)
{
- char *type, *initial, *final;
- char **any;
- IDList *idl;
- void *pi;
- Slapi_Value **ivals;
+ char *type, *initial, *final;
+ char **any;
+ IDList *idl;
+ void *pi;
+ Slapi_Value **ivals;
+ int unindexed = 0;
+ unsigned int opnote = SLAPI_OP_NOTE_UNINDEXED;
LDAPDebug( LDAP_DEBUG_TRACE, "=> sub_candidates\n", 0, 0, 0 );
@@ -796,6 +825,7 @@
}
slapi_call_syntax_assertion2keys_sub_sv( pi, initial, any, final, &ivals );
if ( ivals == NULL || *ivals == NULL ) {
+ slapi_pblock_set( pb, SLAPI_OPERATION_NOTES, &opnote );
LDAPDebug( LDAP_DEBUG_TRACE,
"<= sub_candidates ALLIDS (no keys)\n", 0, 0, 0 );
return( idl_allids( be ) );
@@ -805,7 +835,10 @@
* look up each key in the index, ANDing the resulting
* IDLists together.
*/
- idl = keys2idl( be, type, indextype_SUB, ivals, err );
+ idl = keys2idl( be, type, indextype_SUB, ivals, err, &unindexed );
+ if ( unindexed ) {
+ slapi_pblock_set( pb, SLAPI_OPERATION_NOTES, &opnote );
+ }
valuearray_free( &ivals );
LDAPDebug( LDAP_DEBUG_TRACE, "<= sub_candidates %lu\n",
@@ -819,7 +852,8 @@
char *type,
const char *indextype,
Slapi_Value **ivals,
- int *err
+ int *err,
+ int *unindexed
)
{
IDList *idl;
@@ -831,7 +865,7 @@
for ( i = 0; ivals[i] != NULL; i++ ) {
IDList *idl2;
- idl2 = index_read( be, type, indextype, slapi_value_get_berval(ivals[i]), NULL, err );
+ idl2 = index_read_ext( be, type, indextype, slapi_value_get_berval(ivals[i]), NULL, err, unindexed );
#ifdef LDAP_DEBUG
/* XXX if ( slapd_ldap_debug & LDAP_DEBUG_TRACE ) { XXX */
15 years, 4 months
- 1
- 0