s/PATH_MAX/MAXPATHLEN/ (ITS#5531)

diff --git a/CHANGES b/CHANGES
index 8e5fb505e6b1af6ce9c6d8d68eda9537e096b3dc..7cc05b64d90f15048dad9210f406ae290dd56cad 100644 (file)
--- 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 77664de4ab910cc7086a7a84db40802b14d31708..d11a609c6b209cc901b1275271f7b02d9623d003 100644 (file)
--- 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;