|
 |
3fe9c0 |
From ac782ed2990d5d8149c6796aa9aaf03044ad1446 Mon Sep 17 00:00:00 2001
|
|
|
3fe9c0 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
3fe9c0 |
Date: Wed, 10 Feb 2016 13:45:50 -0800
|
|
|
3fe9c0 |
Subject: [PATCH 85/86] Ticket #48536 - Crash in slapi_get_object_extension
|
|
|
3fe9c0 |
|
|
|
3fe9c0 |
Description: commit 091a5f5daf3fa378f029e293c5358ae9be9f548e introduced
|
|
|
3fe9c0 |
a compier warning: format '%x' expects argument of type 'unsigned int',
|
|
|
3fe9c0 |
but argument 4 has type 'Slapi_PBlock * {aka struct slapi_pblock *}
|
|
|
3fe9c0 |
|
|
|
3fe9c0 |
Replacing '%x' with '%p'.
|
|
|
3fe9c0 |
|
|
|
3fe9c0 |
(cherry picked from commit b31749f2a0bed838712719b2e6533bed0a4144e0)
|
|
|
3fe9c0 |
(cherry picked from commit 7fb593fe56dbbce06f707bd9807bf14748273ea2)
|
|
|
3fe9c0 |
---
|
|
|
3fe9c0 |
ldap/servers/plugins/acl/acl.c | 4 ++--
|
|
|
3fe9c0 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
3fe9c0 |
|
|
|
3fe9c0 |
diff --git a/ldap/servers/plugins/acl/acl.c b/ldap/servers/plugins/acl/acl.c
|
|
|
3fe9c0 |
index d56bed6..7b7fea1 100644
|
|
|
3fe9c0 |
--- a/ldap/servers/plugins/acl/acl.c
|
|
|
3fe9c0 |
+++ b/ldap/servers/plugins/acl/acl.c
|
|
|
3fe9c0 |
@@ -319,7 +319,7 @@ acl_access_allowed(
|
|
|
3fe9c0 |
|
|
|
3fe9c0 |
if (pb != aclpb->aclpb_pblock) {
|
|
|
3fe9c0 |
slapi_log_error(SLAPI_LOG_FATAL, plugin_name,
|
|
|
3fe9c0 |
- "acl_access_allowed: Resetting aclpb_pblock 0x%x to pblock addr 0x%x\n",
|
|
|
3fe9c0 |
+ "acl_access_allowed: Resetting aclpb_pblock %p to pblock addr %p\n",
|
|
|
3fe9c0 |
aclpb->aclpb_pblock, pb);
|
|
|
3fe9c0 |
aclpb->aclpb_pblock = pb;
|
|
|
3fe9c0 |
}
|
|
|
3fe9c0 |
@@ -942,7 +942,7 @@ acl_read_access_allowed_on_entry (
|
|
|
3fe9c0 |
|
|
|
3fe9c0 |
if (pb != aclpb->aclpb_pblock) {
|
|
|
3fe9c0 |
slapi_log_error(SLAPI_LOG_ACL, plugin_name,
|
|
|
3fe9c0 |
- "acl_read_access_allowed_on_entry: Resetting aclpb_pblock 0x%x to pblock addr 0x%x\n",
|
|
|
3fe9c0 |
+ "acl_read_access_allowed_on_entry: Resetting aclpb_pblock %p to pblock addr %p\n",
|
|
|
3fe9c0 |
aclpb->aclpb_pblock, pb);
|
|
|
3fe9c0 |
aclpb->aclpb_pblock = pb;
|
|
|
3fe9c0 |
}
|
|
|
3fe9c0 |
--
|
|
|
3fe9c0 |
2.4.3
|
|
|
3fe9c0 |
|