include/libaccess/aclproto.h | 2 +-
include/public/nsacl/aclapi.h | 2 +-
include/public/nsacl/nserrdef.h | 2 +-
ldap/servers/plugins/acl/acl.c | 19 ++++++++++---------
ldap/servers/plugins/acl/acl.h | 2 +-
ldap/servers/plugins/acl/aclutil.c | 2 +-
lib/libaccess/nseframe.cpp | 2 +-
lib/libaccess/register.cpp | 2 +-
8 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit 1cc8ede3497d752555c23e1b9783550921b64fea
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Jul 30 17:23:22 2013 -0400
Ticket 47440 - Fix runtime errors caused by last patch.
Author: richm
https://fedorahosted.org/389/ticket/47440
Reviewed by: mreynolds
diff --git a/include/libaccess/aclproto.h b/include/libaccess/aclproto.h
index 4579e8d..d30b406 100644
--- a/include/libaccess/aclproto.h
+++ b/include/libaccess/aclproto.h
@@ -112,7 +112,7 @@ NSAPI_PUBLIC int ACL_ListPostParseForAuth(NSErr_t *errp,
ACLListHandle_t *acl_li
* ACL evaluation
*********************************************************************/
-NSAPI_PUBLIC int ACL_EvalTestRights(NSErr_t *errp, ACLEvalHandle_t *acleval, char
**rights, char **map_generic, char **deny_type, char **deny_response, char **acl_tag, int
*expr_num);
+NSAPI_PUBLIC int ACL_EvalTestRights(NSErr_t *errp, ACLEvalHandle_t *acleval, const char
**rights, const char **map_generic, char **deny_type, char **deny_response, char
**acl_tag, int *expr_num);
NSAPI_PUBLIC int ACL_CachableAclList(ACLListHandle_t *acllist);
NSAPI_PUBLIC ACLEvalHandle_t * ACL_EvalNew(NSErr_t *errp, pool_handle_t *pool);
NSAPI_PUBLIC void ACL_EvalDestroy(NSErr_t *errp, pool_handle_t *pool, ACLEvalHandle_t
*acleval);
diff --git a/include/public/nsacl/aclapi.h b/include/public/nsacl/aclapi.h
index 3b2f641..e3abb25 100644
--- a/include/public/nsacl/aclapi.h
+++ b/include/public/nsacl/aclapi.h
@@ -240,7 +240,7 @@ struct ACLDispatchVector {
/* ACL evaluation */
int (*f_ACL_EvalTestRights)(NSErr_t *errp, ACLEvalHandle_t *acleval,
- char **rights, char **map_generic,
+ const char **rights, const char **map_generic,
char **deny_type, char **deny_response,
char **acl_tag, int *expr_num);
ACLEvalHandle_t * (*f_ACL_EvalNew)(NSErr_t *errp, pool_handle_t *pool);
diff --git a/include/public/nsacl/nserrdef.h b/include/public/nsacl/nserrdef.h
index 96857f4..52144e5 100644
--- a/include/public/nsacl/nserrdef.h
+++ b/include/public/nsacl/nserrdef.h
@@ -95,7 +95,7 @@ struct NSEFrame_s {
NSEFrame_t * ef_next; /* next error frame on NSErr_t list */
long ef_retcode; /* error return code */
long ef_errorid; /* error unique identifier */
- char * ef_program; /* context for ef_errorid */
+ const char * ef_program; /* context for ef_errorid */
int ef_errc; /* number of strings in ef_errv[] */
char * ef_errv[NSERRMAXARG];/* arguments for formatting error message */
};
diff --git a/ldap/servers/plugins/acl/acl.c b/ldap/servers/plugins/acl/acl.c
index fb6c2d6..a05037c 100644
--- a/ldap/servers/plugins/acl/acl.c
+++ b/ldap/servers/plugins/acl/acl.c
@@ -65,15 +65,15 @@ static short acl_signature = 0;
/****************************************************************************/
/* Defines, Constants, ande Declarations */
/****************************************************************************/
-static char *ds_map_generic[2] = { NULL, NULL };
+static const char *ds_map_generic[2] = { NULL, NULL };
/****************************************************************************/
/* prototypes */
/****************************************************************************/
static int acl__resource_match_aci(struct acl_pblock *aclpb, aci_t *aci ,
int skip_attrEval, int *a_matched);
-static int acl__TestRights(Acl_PBlock *aclpb,int access, char **right,
- char ** map_generic, aclResultReason_t *result_reason);
+static int acl__TestRights(Acl_PBlock *aclpb,int access, const char **right,
+ const char ** map_generic, aclResultReason_t *result_reason);
static int acl__scan_for_acis(struct acl_pblock *aclpb, int *err);
static void acl__reset_cached_result (struct acl_pblock *aclpb );
static int acl__scan_match_handles ( struct acl_pblock *aclpb, int type);
@@ -91,7 +91,7 @@ static int acl__test_filter ( Slapi_Entry *entry, struct slapi_filter
*f,
static void print_access_control_summary( char * source,
int ret_val, char *clientDn,
struct acl_pblock *aclpb,
- char *right,
+ const char *right,
char *attr,
const char *edn,
aclResultReason_t *acl_reason);
@@ -247,7 +247,7 @@ acl_access_allowed(
int rv;
int err;
int ret_val;
- char *right;
+ const char *right;
struct acl_pblock *aclpb = NULL;
AclAttrEval *c_attrEval = NULL;
int got_reader_locked = 0;
@@ -658,7 +658,7 @@ cleanup_and_ret:
static void
print_access_control_summary( char *source, int ret_val, char *clientDn,
struct acl_pblock *aclpb,
- char *right,
+ const char *right,
char *attr,
const char *edn,
aclResultReason_t *acl_reason)
@@ -2733,7 +2733,7 @@ acl__resource_match_aci_EXIT:
*
**************************************************************************/
static int
-acl__TestRights(Acl_PBlock *aclpb,int access, char **right, char ** map_generic,
+acl__TestRights(Acl_PBlock *aclpb,int access, const char **right, const char **
map_generic,
aclResultReason_t *result_reason)
{
ACLEvalHandle_t *acleval;
@@ -2744,7 +2744,7 @@ acl__TestRights(Acl_PBlock *aclpb,int access, char **right, char **
map_generic,
char *deny_generic = NULL;
char *acl_tag;
int expr_num;
- char *testRights[2];
+ const char *testRights[2];
aci_t *aci = NULL;
int numHandles = 0;
@@ -4015,7 +4015,8 @@ acl__recompute_acl ( Acl_PBlock *aclpb,
char *unused_str1, *unused_str2;
- char *acl_tag, *testRight[2];
+ char *acl_tag;
+ const char *testRight[2];
int j, expr_num;
int result_status = ACL_RES_INVALID, cache_result;
PRUint32 cookie;
diff --git a/ldap/servers/plugins/acl/acl.h b/ldap/servers/plugins/acl/acl.h
index 6fcef51..13c6f90 100644
--- a/ldap/servers/plugins/acl/acl.h
+++ b/ldap/servers/plugins/acl/acl.h
@@ -849,7 +849,7 @@ void aclutil_print_err (int rv , const Slapi_DN *sdn,
const struct berval* val, char **errbuf);
void aclutil_print_aci (aci_t *aci_item, char *type);
short aclutil_gen_signature ( short c_signature );
-void aclutil_print_resource( struct acl_pblock *aclpb, char *right , char *attr, char
*clientdn );
+void aclutil_print_resource( struct acl_pblock *aclpb, const char *right , char *attr,
char *clientdn );
char * aclutil_expand_paramString ( char *str, Slapi_Entry *e );
diff --git a/ldap/servers/plugins/acl/aclutil.c b/ldap/servers/plugins/acl/aclutil.c
index 4f81bc0..f33b11e 100644
--- a/ldap/servers/plugins/acl/aclutil.c
+++ b/ldap/servers/plugins/acl/aclutil.c
@@ -498,7 +498,7 @@ aclutil_gen_signature ( short c_signature )
}
void
-aclutil_print_resource( struct acl_pblock *aclpb, char *right , char *attr, char
*clientdn )
+aclutil_print_resource( struct acl_pblock *aclpb, const char *right , char *attr, char
*clientdn )
{
char str[BUFSIZ];
diff --git a/lib/libaccess/nseframe.cpp b/lib/libaccess/nseframe.cpp
index 4a023e1..20c6d2b 100644
--- a/lib/libaccess/nseframe.cpp
+++ b/lib/libaccess/nseframe.cpp
@@ -197,7 +197,7 @@ void nserrFFree(NSErr_t * errp, NSEFrame_t * efp)
*/
NSEFrame_t * nserrGenerate(NSErr_t * errp, long retcode, long errorid,
- char * program, int errc, ...)
+ const char * program, int errc, ...)
{
NSEFrame_t * efp; /* error frame pointer */
char * esp; /* error string pointer */
diff --git a/lib/libaccess/register.cpp b/lib/libaccess/register.cpp
index 798a926..645b07b 100644
--- a/lib/libaccess/register.cpp
+++ b/lib/libaccess/register.cpp
@@ -164,7 +164,7 @@ ACL_LasHashDestroy()
* 0 on success, non-zero on failure
*/
NSAPI_PUBLIC int
-ACL_LasRegister(NSErr_t *errp, char *attr_name, LASEvalFunc_t eval_func,
+ACL_LasRegister(NSErr_t *errp, const char *attr_name, LASEvalFunc_t eval_func,
LASFlushFunc_t flush_func)
{
if ((!attr_name) || (!eval_func)) return -1;