From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 26 May 2008 20:56:42 +0000 (+0000)
Subject: s/PATH_MAX/MAXPATHLEN/ (ITS#5531)
X-Git-Tag: OPENLDAP_REL_ENG_2_3_42~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9bb2de74590efdc9bee216816ce48541647673e;p=thirdparty%2Fopenldap.git

s/PATH_MAX/MAXPATHLEN/ (ITS#5531)
---

diff --git a/CHANGES b/CHANGES
index 8e5fb505e6..7cc05b64d9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ OpenLDAP 2.3.42 Release (2008/05/15)
 	Fixed slapd delta-syncrepl refresh mode (ITS#5376)
 	Fixed slapd delta-syncrepl resync (ITS#5378)
 	Fixed slapd pagedresults stale state (ITS#5409)
+	Fixed slapd-monitor MAXPATHLEN (ITS#5531)
 	Fixed slapd-ldap connection handler (ITS#5404)
 	Fixed slapd-ldap entry_get() op-dependent behavior (ITS#5513)
 	Fixed slapd-meta quarantine crasher (ITS#5522)
diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index 77664de4ab..d11a609c6b 100644
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -49,14 +49,6 @@ static int monitor_back_add_plugin( monitor_info_t *mi, Backend *be, Entry *e );
 #include "../back-meta/back-meta.h"
 #endif /* defined(SLAPD_META) */
 
-/* for PATH_MAX on some systems (e.g. Solaris) */
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif /* HAVE_LIMITS_H */
-#ifndef PATH_MAX
-#define PATH_MAX	4095
-#endif /* ! PATH_MAX */
-
 static int
 monitor_subsys_database_modify(
 	Operation	*op,
@@ -313,7 +305,7 @@ monitor_subsys_database_init(
 		{
 			struct berval	bv;
 			ber_len_t	pathlen = 0, len = 0;
-			char		path[ PATH_MAX ] = { '\0' };
+			char		path[ MAXPATHLEN ] = { '\0' };
 			struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 			char		*fname = bdb->bi_dbenv_home;