summaryrefslogtreecommitdiffstats
path: root/ldap/servers/plugins/uiduniq
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2005-03-05 04:29:24 +0000
committerRich Megginson <rmeggins@redhat.com>2005-03-05 04:29:24 +0000
commitb352660e243c7b9b7d050f1c38cff1c9faf278b1 (patch)
treeede08019beb931c3206609ab2377a015d510bdb4 /ldap/servers/plugins/uiduniq
parentf08951680ddfebc3f3df07e720ad0650fe473c0f (diff)
downloadds-b352660e243c7b9b7d050f1c38cff1c9faf278b1.tar.gz
ds-b352660e243c7b9b7d050f1c38cff1c9faf278b1.tar.xz
ds-b352660e243c7b9b7d050f1c38cff1c9faf278b1.zip
clean up sprintf usage and many other flawfinder issues; clean up compiler warnings on Linux; remove pam_passthru from DS 7.1
Diffstat (limited to 'ldap/servers/plugins/uiduniq')
-rw-r--r--ldap/servers/plugins/uiduniq/7bit.c5
-rw-r--r--ldap/servers/plugins/uiduniq/uid.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/ldap/servers/plugins/uiduniq/7bit.c b/ldap/servers/plugins/uiduniq/7bit.c
index c7448078..15081a90 100644
--- a/ldap/servers/plugins/uiduniq/7bit.c
+++ b/ldap/servers/plugins/uiduniq/7bit.c
@@ -77,7 +77,6 @@ static void
issue_error(Slapi_PBlock *pb, int result, char *type, char *value)
{
char *moreinfop;
- int sz;
slapi_log_error(SLAPI_LOG_PLUGIN, plugin_name,
"%s result %d\n", type, result);
@@ -85,9 +84,7 @@ issue_error(Slapi_PBlock *pb, int result, char *type, char *value)
if (value == NULL) {
value = "unknown";
}
- sz = strlen(moreInfo) + strlen(value) + 1;
- moreinfop = (char *)slapi_ch_malloc(sz);
- sprintf(moreinfop, "%s%s", moreInfo, value);
+ moreinfop = slapi_ch_smprintf("%s%s", moreInfo, value);
/* Send failure to the client */
slapi_send_ldap_result(pb, result, 0, moreinfop, 0, 0);
diff --git a/ldap/servers/plugins/uiduniq/uid.c b/ldap/servers/plugins/uiduniq/uid.c
index 2d1c69b0..e8698a68 100644
--- a/ldap/servers/plugins/uiduniq/uid.c
+++ b/ldap/servers/plugins/uiduniq/uid.c
@@ -443,7 +443,7 @@ findSubtreeAndSearch(char *parentDN, const char *attrName, Slapi_Attr *attr,
while (NULL != (parentDN = slapi_dn_parent(parentDN)))
{
- if (spb = dnHasObjectClass(parentDN, markerObjectClass))
+ if ((spb = dnHasObjectClass(parentDN, markerObjectClass)))
{
freePblock(spb);
/*