ldap/servers/plugins/automember/automember.c | 8 ++++----
ldap/servers/plugins/posix-winsync/posix-group-task.c | 2 +-
ldap/servers/plugins/posix-winsync/posix-winsync.c | 1 +
ldap/servers/plugins/rootdn_access/rootdn_access.c | 3 ---
ldap/servers/plugins/rootdn_access/rootdn_access.h | 2 ++
ldap/servers/slapd/daemon.c | 5 +++--
ldap/servers/slapd/pw.c | 2 +-
ldap/servers/slapd/slapi-plugin.h | 4 ++++
8 files changed, 16 insertions(+), 11 deletions(-)
New commits:
commit 847150a6fca778374a5edbac213d2f0cff240695
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Thu Oct 3 15:03:11 2013 -0400
Tickets: 47510 & 47543 - 389 fails to build when using Mozldap
Backported all the mozldap fixes that applied to 1.2.11
https://fedorahosted.org/389/ticket/47510
https://fedorahosted.org/389/ticket/47543
Reviewed by: rmeggins and nhosoi(Thanks!)
diff --git a/ldap/servers/plugins/automember/automember.c
b/ldap/servers/plugins/automember/automember.c
index 49f47f7..7c249d1 100644
--- a/ldap/servers/plugins/automember/automember.c
+++ b/ldap/servers/plugins/automember/automember.c
@@ -2524,7 +2524,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;
@@ -2555,9 +2555,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);
@@ -2616,7 +2616,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/plugins/posix-winsync/posix-group-task.c
b/ldap/servers/plugins/posix-winsync/posix-group-task.c
index 05c43af..3d9003f 100644
--- a/ldap/servers/plugins/posix-winsync/posix-group-task.c
+++ b/ldap/servers/plugins/posix-winsync/posix-group-task.c
@@ -1,7 +1,7 @@
#include "slapi-plugin.h"
#include "slapi-private.h"
#include "nspr.h"
-
+#include <string.h>
#include "posix-wsp-ident.h"
#include "posix-group-func.h"
diff --git a/ldap/servers/plugins/posix-winsync/posix-winsync.c
b/ldap/servers/plugins/posix-winsync/posix-winsync.c
index 92a3a79..ea37de5 100644
--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c
+++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c
@@ -63,6 +63,7 @@
#include <dirsrv/winsync-plugin.h>
#endif
#include <plstr.h>
+#include <string.h>
#include <strings.h>
#include <stdlib.h>
#include "posix-wsp-ident.h"
diff --git a/ldap/servers/plugins/rootdn_access/rootdn_access.c
b/ldap/servers/plugins/rootdn_access/rootdn_access.c
index ad1e125..34e5bc7 100644
--- a/ldap/servers/plugins/rootdn_access/rootdn_access.c
+++ b/ldap/servers/plugins/rootdn_access/rootdn_access.c
@@ -43,9 +43,6 @@
* Root DN Access Control plug-in
*/
#include "rootdn_access.h"
-#include <nspr.h>
-#include <time.h>
-#include <ctype.h>
/*
* Add an entry like the following to dse.ldif to enable this plugin:
diff --git a/ldap/servers/plugins/rootdn_access/rootdn_access.h
b/ldap/servers/plugins/rootdn_access/rootdn_access.h
index 80b8d4a..4ad65a2 100644
--- a/ldap/servers/plugins/rootdn_access/rootdn_access.h
+++ b/ldap/servers/plugins/rootdn_access/rootdn_access.h
@@ -47,6 +47,8 @@
#include <nspr.h>
#include <time.h>
#include <ctype.h>
+#include <string.h>
+#include <strings.h>
#define ROOTDN_PLUGIN_SUBSYSTEM "rootdn-access-control-plugin"
#define ROOTDN_FEATURE_DESC "Root DN Access Control"
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index e9b300a..a61ad37 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -2588,8 +2588,9 @@ bail:
void
handle_closed_connection(Connection *conn)
{
- ber_sockbuf_remove_io(conn->c_sb, &openldap_sockbuf_io,
- LBER_SBIOD_LEVEL_PROVIDER);
+#ifdef USE_OPENLDAP
+ ber_sockbuf_remove_io(conn->c_sb, &openldap_sockbuf_io,
LBER_SBIOD_LEVEL_PROVIDER);
+#endif
}
/* NOTE: this routine is not reentrant */
diff --git a/ldap/servers/slapd/pw.c b/ldap/servers/slapd/pw.c
index 6f3d436..27215c4 100644
--- a/ldap/servers/slapd/pw.c
+++ b/ldap/servers/slapd/pw.c
@@ -64,9 +64,9 @@
#include "slap.h"
-
#define DENY_PW_CHANGE_ACI "(targetattr = \"userPassword\") ( version 3.0;
acl \"disallow_pw_change_aci\"; deny (write ) userdn =
\"ldap:///self\";)"
#define GENERALIZED_TIME_LENGTH 15
+#define LDAP_MOD_OP (0x0007)
static int pw_in_history(Slapi_Value **history_vals, const Slapi_Value *pw_val);
static int update_pw_history( Slapi_PBlock *pb, const Slapi_DN *sdn, char *old_pw );
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index 642f515..2ed91b8 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -363,6 +363,10 @@ NSPR_API(PRUint32) PR_fprintf(struct PRFileDesc* fd, const char *fmt,
...)
#define LDAP_MAXINT (2147483647)
#endif
+#ifndef LDAP_CANCELLED
+#define LDAP_CANCELLED 0x76
+#endif
+
/*
* Sequential access types
*/