浏览代码

fix mozldap build issues

ldap_start_tls_s needs ldap_ssl.h
mozldap does not define LDAP_MAXINT
Reviewed by: nkinder (Thanks!)
Rich Megginson 14 年之前
父节点
当前提交
ba433f5a1b
共有 2 个文件被更改,包括 9 次插入0 次删除
  1. 4 0
      ldap/servers/plugins/chainingdb/cb_conn_stateless.c
  2. 5 0
      ldap/servers/slapd/slapi-plugin.h

+ 4 - 0
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:

+ 5 - 0
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
  */