From f2004eab1a9821c716a99a6efa925079d30ee457 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Aug 19 2013 23:13:26 +0000
Subject: compiler warning - ldif_read_record lineno type depends on openldap version


Reviewed by: nkinder (Thanks!)

---

diff --git a/lib/libdsa/dsalib_confs.c b/lib/libdsa/dsalib_confs.c
index 36d9356..b4a1f4c 100644
--- a/lib/libdsa/dsalib_confs.c
+++ b/lib/libdsa/dsalib_confs.c
@@ -38,6 +38,18 @@
 #include "nspr.h"
 #include "plstr.h"
 
+/* ldif_read_record lineno argument type depends on openldap version */
+#if defined(USE_OPENLDAP)
+#include <ldap_features.h>
+#if LDAP_VENDOR_VERSION >= 20434 /* changed in 2.4.34 */
+typedef unsigned long int ldif_record_lineno_t;
+#else
+typedef int ldif_record_lineno_t;
+#endif
+#else
+typedef int ldif_record_lineno_t;
+#endif
+
 int
 dsalib_ldif_parse_line(
     char *line,
@@ -75,11 +87,11 @@ ds_get_conf_from_file(FILE *conf)
     int		listsize = 0;
     char        **conf_list = NULL;
     char *entry = 0;
-    int lineno = 0;
-    int i = 0;
 #if defined(USE_OPENLDAP)
     int buflen = 0;
 #endif
+    ldif_record_lineno_t lineno;
+    int i = 0;
 
 #if defined(USE_OPENLDAP)
     while (ldif_read_record(conf, &lineno, &entry, &buflen)) {