[389-commits] ldap/servers

[Richard Allen Megginson]

 ldap/servers/plugins/chainingdb/cb_conn_stateless.c |    4 ++++
 ldap/servers/slapd/slapi-plugin.h                   |    5 +++++
 2 files changed, 9 insertions(+)

New commits:
commit ba433f5a1be4c7b85cb399f242fd0a2d8909ff56
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Fri Jan 20 20:01:17 2012 -0700

    fix mozldap build issues
    
    ldap_start_tls_s needs ldap_ssl.h
    mozldap does not define LDAP_MAXINT
    Reviewed by: nkinder (Thanks!)

diff --git a/ldap/servers/plugins/chainingdb/cb_conn_stateless.c b/ldap/servers/plugins/chainingdb/cb_conn_stateless.c
index ac10960..a9abc31 100644
--- a/ldap/servers/plugins/chainingdb/cb_conn_stateless.c
+++ b/ldap/servers/plugins/chainingdb/cb_conn_stateless.c
@@ -42,6 +42,10 @@
 
 #include "cb.h"
 
+#ifndef USE_OPENLDAP
+#include "ldap_ssl.h" /* for start_tls */
+#endif
+
 /*
  * Most of the complicated connection-related code lives in this file.  Some
  * general notes about how we manage our connections to "remote" LDAP servers:
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index 2296351..e684fe0 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -342,6 +342,11 @@ NSPR_API(PRUint32) PR_fprintf(struct PRFileDesc* fd, const char *fmt, ...)
 #define LBER_OVERFLOW           ((ber_tag_t) -3) /* 0xfffffffdU */
 #endif
 
+#ifndef LDAP_MAXINT
+/* RFC 4511:  maxInt INTEGER ::= 2147483647 -- (2^^31 - 1) -- */
+#define LDAP_MAXINT (2147483647)
+#endif
+
 /*
  * Sequential access types
  */