ldap/servers/plugins/automember/automember.c | 8 +--
ldap/servers/slapd/operation.c | 2
ldap/servers/slapd/slapi-plugin.h | 72 +++++++++++++++++++++++++++
ldap/servers/slapd/util.c | 4 -
4 files changed, 79 insertions(+), 7 deletions(-)
New commits:
commit a1ab932147bc6eb34ace0a4baf35e2f5aee675a6
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Fri Sep 27 16:06:27 2013 -0400
Ticket 47510 - Repl Sync does not compile against MozLDAP libraries
Repl Sync uses openldap extensively, so we had to bring over many defines. Also
fixed some other warnings.
https://fedorahosted.org/389/ticket/47510
Reviewed by: rmeggins(Thanks!)
diff --git a/ldap/servers/plugins/automember/automember.c
b/ldap/servers/plugins/automember/automember.c
index c7168cb..d63fbfe 100644
--- a/ldap/servers/plugins/automember/automember.c
+++ b/ldap/servers/plugins/automember/automember.c
@@ -2555,7 +2555,7 @@ void automember_map_task_thread(void *arg){
LDIFFP *ldif_fd_in = NULL;
ldif_record_lineno_t lineno = 0;
#else
- PRFileDesc *ldif_fd_in = NULL;
+ FILE *ldif_fd_in = NULL;
int lineno = 0;
#endif
int rc = 0;
@@ -2586,9 +2586,9 @@ void automember_map_task_thread(void *arg){
rc = errno;
errstr = strerror(rc);
#else
- if(( ldif_fd_in = PR_Open( td->ldif_in, PR_RDONLY, DEFAULT_FILE_MODE )) == NULL
){
+ if(( ldif_fd_in = fopen( td->ldif_in, "r")) == NULL ){
rc = PR_GetOSError();
- errstr = slapi_system_strerror(rc);
+ errstr = (char *)slapi_system_strerror(rc);
#endif
slapi_task_log_notice(task, "The ldif file %s could not be accessed, error
%d (%s). Aborting task.\n",
td->ldif_in, rc, errstr);
@@ -2647,7 +2647,7 @@ out:
#if defined(USE_OPENLDAP)
ldif_close(ldif_fd_in);
#else
- PR_Close(ldif_fd_in);
+ fclose(ldif_fd_in);
#endif
}
slapi_task_inc_progress(task);
diff --git a/ldap/servers/slapd/operation.c b/ldap/servers/slapd/operation.c
index 981fc01..9e55b60 100644
--- a/ldap/servers/slapd/operation.c
+++ b/ldap/servers/slapd/operation.c
@@ -216,7 +216,7 @@ operation_free( Slapi_Operation **op, Connection *conn )
if(op!=NULL && *op!=NULL)
{
/* Call the plugin extension destructors */
-
factory_destroy_extension(get_operation_object_type(),*op,conn,&((*op)->o_extension));
+ factory_destroy_extension(get_operation_object_type(),*op,conn,&((*op)->o_extension));
slapi_sdn_done(&(*op)->o_sdn);
slapi_sdn_free(&(*op)->o_target_spec);
slapi_ch_free_string( &(*op)->o_authtype );
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index b9c1b02..53a7d0e 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -371,6 +371,78 @@ NSPR_API(PRUint32) PR_fprintf(struct PRFileDesc* fd, const char *fmt,
...)
#define LDAP_CANCELLED 0x76
#endif
+#ifndef LDAP_RES_INTERMEDIATE
+#define LDAP_RES_INTERMEDIATE ((ber_tag_t) 0x79U)
+#endif
+
+#ifndef LDAP_TAG_IM_RES_OID
+#define LDAP_TAG_IM_RES_OID ((ber_tag_t) 0x80U)
+#endif
+
+#ifndef LDAP_TAG_IM_RES_VALUE
+#define LDAP_TAG_IM_RES_VALUE ((ber_tag_t) 0x81U)
+#endif
+
+#ifndef LDAP_SCOPE_ONE
+#define LDAP_SCOPE_ONE LDAP_SCOPE_ONELEVEL
+#endif
+
+#ifndef LDAP_SYNC_OID
+#define LDAP_SYNC_OID "1.3.6.1.4.1.4203.1.9.1"
+#define LDAP_CONTROL_SYNC LDAP_SYNC_OID ".1"
+#define LDAP_CONTROL_SYNC_STATE LDAP_SYNC_OID ".2"
+#define LDAP_CONTROL_SYNC_DONE LDAP_SYNC_OID ".3"
+#define LDAP_SYNC_INFO LDAP_SYNC_OID ".4"
+#define LDAP_TAG_SYNC_NEW_COOKIE ((ber_tag_t) 0x80U)
+#define LDAP_TAG_SYNC_REFRESH_DELETE ((ber_tag_t) 0xa1U)
+#define LDAP_TAG_SYNC_REFRESH_PRESENT ((ber_tag_t) 0xa2U)
+#define LDAP_TAG_SYNC_ID_SET ((ber_tag_t) 0xa3U)
+#endif
+
+#ifndef LDAP_REQ_BIND
+#define LDAP_REQ_BIND ((ber_tag_t) 0x60U) /* application + constructed */
+#define LDAP_REQ_UNBIND ((ber_tag_t) 0x42U) /* application + primitive */
+#define LDAP_REQ_SEARCH ((ber_tag_t) 0x63U) /* application + constructed */
+#define LDAP_REQ_MODIFY ((ber_tag_t) 0x66U) /* application + constructed */
+#define LDAP_REQ_ADD ((ber_tag_t) 0x68U) /* application + constructed */
+#define LDAP_REQ_DELETE ((ber_tag_t) 0x4aU) /* application + primitive */
+#define LDAP_REQ_MODDN ((ber_tag_t) 0x6cU) /* application + constructed */
+#define LDAP_REQ_MODRDN LDAP_REQ_MODDN
+#define LDAP_REQ_RENAME LDAP_REQ_MODDN
+#define LDAP_REQ_COMPARE ((ber_tag_t) 0x6eU) /* application + constructed */
+#define LDAP_REQ_ABANDON ((ber_tag_t) 0x50U) /* application + primitive */
+#define LDAP_REQ_EXTENDED ((ber_tag_t) 0x77U) /* application + constructed */
+#endif
+
+#ifndef LDAP_SYNC_PRESENT
+#define LDAP_SYNC_PRESENT 0
+#define LDAP_SYNC_ADD 1
+#define LDAP_SYNC_MODIFY 2
+#define LDAP_SYNC_DELETE 3
+#define LDAP_SYNC_NEW_COOKIE 4
+#endif
+
+#ifndef LDAP_SYNC_CAPI_NONE
+typedef enum {
+ /* these are private - the client should never see them */
+ LDAP_SYNC_CAPI_NONE = -1,
+ LDAP_SYNC_CAPI_PHASE_FLAG = 0x10U,
+ LDAP_SYNC_CAPI_IDSET_FLAG = 0x20U,
+ LDAP_SYNC_CAPI_DONE_FLAG = 0x40U,
+ /* these are passed to ls_search_entry() */
+ LDAP_SYNC_CAPI_PRESENT = LDAP_SYNC_PRESENT,
+ LDAP_SYNC_CAPI_ADD = LDAP_SYNC_ADD,
+ LDAP_SYNC_CAPI_MODIFY = LDAP_SYNC_MODIFY,
+ LDAP_SYNC_CAPI_DELETE = LDAP_SYNC_DELETE,
+ /* these are passed to ls_intermediate() */
+ LDAP_SYNC_CAPI_PRESENTS = ( LDAP_SYNC_CAPI_PHASE_FLAG |
LDAP_SYNC_CAPI_PRESENT ),
+ LDAP_SYNC_CAPI_DELETES = ( LDAP_SYNC_CAPI_PHASE_FLAG | LDAP_SYNC_CAPI_DELETE
),
+ LDAP_SYNC_CAPI_PRESENTS_IDSET = ( LDAP_SYNC_CAPI_PRESENTS |
LDAP_SYNC_CAPI_IDSET_FLAG ),
+ LDAP_SYNC_CAPI_DELETES_IDSET = ( LDAP_SYNC_CAPI_DELETES |
LDAP_SYNC_CAPI_IDSET_FLAG ),
+ LDAP_SYNC_CAPI_DONE = ( LDAP_SYNC_CAPI_DONE_FLAG |
LDAP_SYNC_CAPI_PRESENTS )
+} ldap_sync_refresh_t;
+#endif
+
/*
* Sequential access types
*/
diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c
index 0073df5..80ac0ca 100644
--- a/ldap/servers/slapd/util.c
+++ b/ldap/servers/slapd/util.c
@@ -342,7 +342,7 @@ filter_stuff_func(void *arg, const char *val, PRUint32 slen)
#else
char *val2 = NULL;
buf = slapi_ch_calloc(sizeof(char), filter_len*3 + 1);
- val2 = do_escape_string(val, filter_len, buf, special_filter);
+ val2 = (char *)do_escape_string(val, filter_len, buf, special_filter);
if(val2 == NULL){
LDAPDebug(LDAP_DEBUG_TRACE, "slapi_filter_sprintf: failed to escape
filter value(%s)\n",val,0,0);
ctx->next_arg_needs_esc_norm = 0;
@@ -477,7 +477,7 @@ slapi_escape_filter_value(char* filter_str, int len)
}
#else
char *buf = slapi_ch_calloc(sizeof(char), filter_len*3+1);
- char *esc_str = do_escape_string(filter_str, filter_len, buf, special_filter);
+ char *esc_str = (char *)do_escape_string(filter_str, filter_len, buf,
special_filter);
if(esc_str != buf){
slapi_ch_free_string(&buf);