74ca47
From 57b6e5afb6265363ede667ad450e267f8a803b9e Mon Sep 17 00:00:00 2001
74ca47
From: Mark Reynolds <mreynolds@redhat.com>
74ca47
Date: Wed, 19 Apr 2017 13:37:10 -0400
74ca47
Subject: [PATCH] Ticket 48864 - Add cgroup memory limit detection to 389-ds
74ca47
74ca47
Bug Description:  Previously our memory limits only check hardware
74ca47
    limits and shell resource limits. However, we may be in a container
74ca47
    like docker or lxc, and unable to detect these limits. This can lead
74ca47
    to crash conditions or worse, especially with autosizing
74ca47
    on import we may have conditions where the server may not
74ca47
    even be able to install.
74ca47
74ca47
Fix Description:  Add support for cgroup memory limit detection
74ca47
    so that we can properly determine our resource availability regardless
74ca47
    of lxc, docker, systemd or others.
74ca47
74ca47
https://pagure.io/389-ds-base/issue/48864
74ca47
74ca47
Author: wibrown
74ca47
74ca47
Review by: mreynolds (Thanks!)
74ca47
---
74ca47
 Makefile.am                                        |   7 +-
74ca47
 ldap/servers/plugins/acl/acl.c                     |  18 +-
74ca47
 ldap/servers/plugins/acl/acl.h                     |  16 -
74ca47
 ldap/servers/plugins/acl/aclanom.c                 |   8 +-
74ca47
 ldap/servers/plugins/dna/dna.c                     |  50 ++-
74ca47
 ldap/servers/plugins/posix-winsync/posix-winsync.c |   4 +-
74ca47
 ldap/servers/plugins/replication/repl.h            |  17 +-
74ca47
 .../plugins/replication/repl5_inc_protocol.c       |   2 +-
74ca47
 ldap/servers/plugins/replication/repl5_init.c      |   2 +-
74ca47
 ldap/servers/plugins/replication/repl5_plugins.c   |   2 +-
74ca47
 ldap/servers/plugins/replication/repl5_replica.c   |   8 +-
74ca47
 ldap/servers/plugins/replication/repl5_total.c     |   4 +-
74ca47
 ldap/servers/plugins/replication/repl_connext.c    |  20 +-
74ca47
 ldap/servers/plugins/replication/repl_extop.c      |  26 +-
74ca47
 ldap/servers/plugins/sync/sync_persist.c           |   6 +-
74ca47
 ldap/servers/plugins/syntaxes/validate_task.c      |   6 +-
74ca47
 ldap/servers/plugins/usn/usn.c                     |   8 +-
74ca47
 ldap/servers/slapd/abandon.c                       |   8 +-
74ca47
 ldap/servers/slapd/add.c                           |   4 +-
74ca47
 ldap/servers/slapd/auth.c                          |  18 +-
74ca47
 ldap/servers/slapd/back-ldbm/back-ldbm.h           |  23 +-
74ca47
 ldap/servers/slapd/back-ldbm/cache.c               |  34 +-
74ca47
 ldap/servers/slapd/back-ldbm/dblayer.c             |  72 ++--
74ca47
 ldap/servers/slapd/back-ldbm/dblayer.h             |   8 -
74ca47
 ldap/servers/slapd/back-ldbm/import-threads.c      |   2 +-
74ca47
 ldap/servers/slapd/back-ldbm/import.c              |  12 +-
74ca47
 ldap/servers/slapd/back-ldbm/ldbm_config.c         |  32 +-
74ca47
 ldap/servers/slapd/back-ldbm/ldbm_delete.c         |   4 +-
74ca47
 .../servers/slapd/back-ldbm/ldbm_instance_config.c |  20 +-
74ca47
 ldap/servers/slapd/back-ldbm/ldbm_modrdn.c         |   4 +-
74ca47
 ldap/servers/slapd/back-ldbm/ldbm_search.c         |   4 +-
74ca47
 ldap/servers/slapd/back-ldbm/misc.c                |   2 +-
74ca47
 ldap/servers/slapd/back-ldbm/monitor.c             |  10 +-
74ca47
 ldap/servers/slapd/back-ldbm/perfctrs.h            |   2 +-
74ca47
 ldap/servers/slapd/back-ldbm/start.c               | 113 +++----
74ca47
 ldap/servers/slapd/bind.c                          |   8 +-
74ca47
 ldap/servers/slapd/compare.c                       |   2 +-
74ca47
 ldap/servers/slapd/connection.c                    |  72 ++--
74ca47
 ldap/servers/slapd/conntable.c                     |   8 +-
74ca47
 ldap/servers/slapd/control.c                       |   2 +-
74ca47
 ldap/servers/slapd/daemon.c                        |  48 +--
74ca47
 ldap/servers/slapd/delete.c                        |   2 +-
74ca47
 ldap/servers/slapd/entry.c                         |   2 +-
74ca47
 ldap/servers/slapd/extendop.c                      |   4 +-
74ca47
 ldap/servers/slapd/log.c                           |  10 +-
74ca47
 ldap/servers/slapd/modify.c                        |  12 +-
74ca47
 ldap/servers/slapd/modrdn.c                        |   6 +-
74ca47
 ldap/servers/slapd/monitor.c                       |   8 +-
74ca47
 ldap/servers/slapd/operation.c                     |   6 +-
74ca47
 ldap/servers/slapd/opshared.c                      |   4 +-
74ca47
 ldap/servers/slapd/pagedresults.c                  |   2 +-
74ca47
 ldap/servers/slapd/psearch.c                       |  10 +-
74ca47
 ldap/servers/slapd/result.c                        |  12 +-
74ca47
 ldap/servers/slapd/sasl_io.c                       |  52 +--
74ca47
 ldap/servers/slapd/saslbind.c                      |   2 +-
74ca47
 ldap/servers/slapd/search.c                        |   2 +-
74ca47
 ldap/servers/slapd/slap.h                          |   9 +-
74ca47
 ldap/servers/slapd/slapi-plugin.h                  |  14 +-
74ca47
 ldap/servers/slapd/slapi-private.h                 |  38 ++-
74ca47
 ldap/servers/slapd/slapi_pal.c                     | 311 +++++++++++++++++
74ca47
 ldap/servers/slapd/slapi_pal.h                     |  62 ++++
74ca47
 ldap/servers/slapd/snmp_collator.c                 |   2 +-
74ca47
 ldap/servers/slapd/unbind.c                        |   6 +-
74ca47
 ldap/servers/slapd/util.c                          | 376 +--------------------
74ca47
 test/libslapd/spal/meminfo.c                       |  54 +++
74ca47
 test/libslapd/test.c                               |   2 +
74ca47
 test/test_slapd.h                                  |   5 +
74ca47
 67 files changed, 870 insertions(+), 859 deletions(-)
74ca47
 create mode 100644 ldap/servers/slapd/slapi_pal.c
74ca47
 create mode 100644 ldap/servers/slapd/slapi_pal.h
74ca47
 create mode 100644 test/libslapd/spal/meminfo.c
74ca47
74ca47
diff --git a/Makefile.am b/Makefile.am
74ca47
index 485a460..429a345 100644
74ca47
--- a/Makefile.am
74ca47
+++ b/Makefile.am
74ca47
@@ -481,6 +481,7 @@ dist_noinst_HEADERS = \
74ca47
 	ldap/servers/slapd/pw_verify.h \
74ca47
 	ldap/servers/slapd/secerrstrs.h \
74ca47
 	ldap/servers/slapd/slap.h \
74ca47
+	ldap/servers/slapd/slapi_pal.h \
74ca47
 	ldap/servers/slapd/slapi-plugin-compat4.h \
74ca47
 	ldap/servers/slapd/slapi-plugin.h \
74ca47
 	ldap/servers/slapd/slapi-private.h \
74ca47
@@ -850,6 +851,7 @@ pkgconfig_DATA = src/pkgconfig/dirsrv.pc \
74ca47
 # header files
74ca47
 #------------------------
74ca47
 serverinc_HEADERS = ldap/servers/plugins/replication/repl-session-plugin.h \
74ca47
+	ldap/servers/slapd/slapi_pal.h \
74ca47
 	ldap/servers/slapd/slapi-plugin.h \
74ca47
 	ldap/servers/plugins/replication/winsync-plugin.h \
74ca47
 	src/nunc-stans/include/nunc-stans.h \
74ca47
@@ -1219,6 +1221,7 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \
74ca47
 	ldap/servers/slapd/value.c \
74ca47
 	ldap/servers/slapd/valueset.c \
74ca47
 	ldap/servers/slapd/vattr.c \
74ca47
+	ldap/servers/slapd/slapi_pal.c \
74ca47
 	$(libavl_a_SOURCES)
74ca47
 
74ca47
 libslapd_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(SASL_INCLUDES) @db_inc@ $(SVRCORE_INCLUDES) @kerberos_inc@ @pcre_inc@
74ca47
@@ -2004,7 +2007,9 @@ test_slapd_SOURCES = test/main.c \
74ca47
 	test/libslapd/counters/atomic.c \
74ca47
 	test/libslapd/pblock/analytics.c \
74ca47
 	test/libslapd/pblock/v3_compat.c \
74ca47
-	test/libslapd/operation/v3_compat.c
74ca47
+	test/libslapd/operation/v3_compat.c \
74ca47
+	test/libslapd/spal/meminfo.c
74ca47
+
74ca47
 test_slapd_LDADD = libslapd.la
74ca47
 test_slapd_LDFLAGS = $(AM_CPPFLAGS) $(CMOCKA_LINKS)
74ca47
 ### WARNING: Slap.h needs cert.h, which requires the -I/lib/ldaputil!!!
74ca47
diff --git a/ldap/servers/plugins/acl/acl.c b/ldap/servers/plugins/acl/acl.c
74ca47
index 48b8efc..561dd91 100644
74ca47
--- a/ldap/servers/plugins/acl/acl.c
74ca47
+++ b/ldap/servers/plugins/acl/acl.c
74ca47
@@ -276,7 +276,7 @@ acl_access_allowed(
74ca47
 
74ca47
 		 if (  !privateBackend && (be_readonly ||  slapi_config_get_readonly () )){
74ca47
 			slapi_log_err(loglevel, plugin_name,
74ca47
-				"acl_access_allowed - conn=%" NSPRIu64 " op=%d (main): Deny %s on entry(%s)"
74ca47
+				"acl_access_allowed - conn=%" PRIu64 " op=%d (main): Deny %s on entry(%s)"
74ca47
 				": readonly backend\n", 
74ca47
 				o_connid, o_opid,
74ca47
 				acl_access2str(access),
74ca47
@@ -289,7 +289,7 @@ acl_access_allowed(
74ca47
 	TNF_PROBE_0_DEBUG(acl_skipaccess_start,"ACL","");
74ca47
 	if (  acl_skip_access_check ( pb, e, access )) {
74ca47
 		slapi_log_err(loglevel, plugin_name,
74ca47
-				"acl_access_allowed - conn=%" NSPRIu64 " op=%d (main): Allow %s on entry(%s)"
74ca47
+				"acl_access_allowed - conn=%" PRIu64 " op=%d (main): Allow %s on entry(%s)"
74ca47
 				": root user\n", 
74ca47
 				o_connid, o_opid,
74ca47
 				acl_access2str(access),
74ca47
@@ -448,7 +448,7 @@ acl_access_allowed(
74ca47
 		TNF_PROBE_0_DEBUG(acl_entry_first_touch_start,"ACL","");
74ca47
 
74ca47
 		slapi_log_err(loglevel, plugin_name,
74ca47
-			"acl_access_allowed - #### conn=%" NSPRIu64 " op=%d binddn=\"%s\"\n",
74ca47
+			"acl_access_allowed - #### conn=%" PRIu64 " op=%d binddn=\"%s\"\n",
74ca47
 			o_connid, o_opid, clientDn);
74ca47
 		aclpb->aclpb_stat_total_entries++;
74ca47
 
74ca47
@@ -776,7 +776,7 @@ print_access_control_summary( char *source, int ret_val, char *clientDn,
74ca47
                                 null_user);
74ca47
                         if (strcasecmp(right, access_str_moddn) == 0) {
74ca47
                                  slapi_log_err(loglevel, plugin_name, "print_access_control_summary - "                                            
74ca47
-                                        "conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) [from %s] to proxy (%s)"
74ca47
+                                        "conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) [from %s] to proxy (%s)"
74ca47
                                          ": %s\n",
74ca47
                                         o_connid, o_opid,
74ca47
                                         source,
74ca47
@@ -790,7 +790,7 @@ print_access_control_summary( char *source, int ret_val, char *clientDn,
74ca47
 
74ca47
                         } else {
74ca47
                                 slapi_log_err(loglevel, plugin_name, 
74ca47
-                                        "print_access_control_summary - conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to proxy (%s)"
74ca47
+                                        "print_access_control_summary - conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to proxy (%s)"
74ca47
                                          ": %s\n",
74ca47
                                         o_connid, o_opid,
74ca47
                                         source,
74ca47
@@ -805,7 +805,7 @@ print_access_control_summary( char *source, int ret_val, char *clientDn,
74ca47
                         proxy_user = null_user;
74ca47
                         if (strcasecmp(right, access_str_moddn) == 0) {
74ca47
                                 slapi_log_err(loglevel, plugin_name, 
74ca47
-                                        "print_access_control_summary - conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) [from %s] to proxy (%s)"
74ca47
+                                        "print_access_control_summary - conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) [from %s] to proxy (%s)"
74ca47
                                         ": %s\n",
74ca47
                                         o_connid, o_opid,
74ca47
                                         source,
74ca47
@@ -819,7 +819,7 @@ print_access_control_summary( char *source, int ret_val, char *clientDn,
74ca47
                                 
74ca47
                         } else {
74ca47
                                 slapi_log_err(loglevel, plugin_name, 
74ca47
-                                        "print_access_control_summary - conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to proxy (%s)"
74ca47
+                                        "print_access_control_summary - conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to proxy (%s)"
74ca47
                                         ": %s\n",
74ca47
                                         o_connid, o_opid,
74ca47
                                         source,
74ca47
@@ -834,7 +834,7 @@ print_access_control_summary( char *source, int ret_val, char *clientDn,
74ca47
 	} else {
74ca47
                 if (strcasecmp(right, access_str_moddn) == 0) {
74ca47
                         slapi_log_err(loglevel, plugin_name, 
74ca47
-                                "print_access_control_summary - conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) [from %s] to %s"
74ca47
+                                "print_access_control_summary - conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) [from %s] to %s"
74ca47
                                 ": %s\n",
74ca47
                                 o_connid, o_opid,
74ca47
                                 source,
74ca47
@@ -848,7 +848,7 @@ print_access_control_summary( char *source, int ret_val, char *clientDn,
74ca47
                         
74ca47
                 } else {
74ca47
                         slapi_log_err(loglevel, plugin_name, 
74ca47
-                                "print_access_control_summary - conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to %s"
74ca47
+                                "print_access_control_summary - conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to %s"
74ca47
                                 ": %s\n",
74ca47
                                 o_connid, o_opid,
74ca47
                                 source,
74ca47
diff --git a/ldap/servers/plugins/acl/acl.h b/ldap/servers/plugins/acl/acl.h
74ca47
index 91f5071..8b3486c 100644
74ca47
--- a/ldap/servers/plugins/acl/acl.h
74ca47
+++ b/ldap/servers/plugins/acl/acl.h
74ca47
@@ -20,22 +20,6 @@
74ca47
 #ifndef _ACL_H_
74ca47
 #define _ACL_H_
74ca47
 
74ca47
-/* Required to get portable printf/scanf format macros */
74ca47
-#ifdef HAVE_INTTYPES_H
74ca47
-#include <inttypes.h>
74ca47
-
74ca47
-/* NSPR uses the print macros a bit differently than ANSI C.  We
74ca47
- * need to use ll for a 64-bit integer, even when a long is 64-bit.
74ca47
- */
74ca47
-#undef PRIu64
74ca47
-#define PRIu64  "llu"
74ca47
-#undef PRI64
74ca47
-#define PRI64   "ll"
74ca47
-
74ca47
-#else
74ca47
-#error Need to define portable format macros such as PRIu64
74ca47
-#endif /* HAVE_INTTYPES_H */
74ca47
-
74ca47
 #include 	<stdio.h>
74ca47
 #include 	<string.h>
74ca47
 #include 	<sys types.h="">
74ca47
diff --git a/ldap/servers/plugins/acl/aclanom.c b/ldap/servers/plugins/acl/aclanom.c
74ca47
index 5462d87..96d0d9f 100644
74ca47
--- a/ldap/servers/plugins/acl/aclanom.c
74ca47
+++ b/ldap/servers/plugins/acl/aclanom.c
74ca47
@@ -523,7 +523,7 @@ aclanom_match_profile (Slapi_PBlock *pb, struct acl_pblock *aclpb, Slapi_Entry *
74ca47
 			aci_ndn = slapi_sdn_get_ndn (acl_anom_profile->anom_targetinfo[i].anom_target);
74ca47
 			if (access & SLAPI_ACL_MODDN) {
74ca47
 				slapi_log_err(loglevel, plugin_name, 
74ca47
-					"aclanom_match_profile - conn=%" NSPRIu64 " op=%d: Allow access on entry(%s).attr(%s) (from %s) to anonymous: acidn=\"%s\"\n",
74ca47
+					"aclanom_match_profile - conn=%" PRIu64 " op=%d: Allow access on entry(%s).attr(%s) (from %s) to anonymous: acidn=\"%s\"\n",
74ca47
 					o_connid, o_opid,
74ca47
 					ndn,
74ca47
 					attr ? attr:"NULL",
74ca47
@@ -532,7 +532,7 @@ aclanom_match_profile (Slapi_PBlock *pb, struct acl_pblock *aclpb, Slapi_Entry *
74ca47
 				
74ca47
 			} else {
74ca47
 				slapi_log_err(loglevel, plugin_name, 
74ca47
-					"aclanom_match_profile - conn=%" NSPRIu64 " op=%d: Allow access on entry(%s).attr(%s) to anonymous: acidn=\"%s\"\n",
74ca47
+					"aclanom_match_profile - conn=%" PRIu64 " op=%d: Allow access on entry(%s).attr(%s) to anonymous: acidn=\"%s\"\n",
74ca47
 					o_connid, o_opid,
74ca47
 					ndn,
74ca47
 					attr ? attr:"NULL",
74ca47
@@ -541,13 +541,13 @@ aclanom_match_profile (Slapi_PBlock *pb, struct acl_pblock *aclpb, Slapi_Entry *
74ca47
 		} else {
74ca47
 			if (access & SLAPI_ACL_MODDN) {
74ca47
 				slapi_log_err(loglevel, plugin_name,
74ca47
-					"aclanom_match_profile - conn=%" NSPRIu64 " op=%d: Deny access on entry(%s).attr(%s) (from %s) to anonymous\n",
74ca47
+					"aclanom_match_profile - conn=%" PRIu64 " op=%d: Deny access on entry(%s).attr(%s) (from %s) to anonymous\n",
74ca47
 					o_connid, o_opid,
74ca47
 					ndn, attr ? attr:"NULL" ,
74ca47
 					aclpb->aclpb_moddn_source_sdn ? slapi_sdn_get_dn(aclpb->aclpb_moddn_source_sdn) : "NULL");
74ca47
 			} else {
74ca47
 				slapi_log_err(loglevel, plugin_name,
74ca47
-					"aclanom_match_profile - conn=%" NSPRIu64 " op=%d: Deny access on entry(%s).attr(%s) to anonymous\n",
74ca47
+					"aclanom_match_profile - conn=%" PRIu64 " op=%d: Deny access on entry(%s).attr(%s) to anonymous\n",
74ca47
 					o_connid, o_opid,
74ca47
 					ndn, attr ? attr:"NULL" );
74ca47
 			}
74ca47
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
74ca47
index 34011b9..a085941 100644
74ca47
--- a/ldap/servers/plugins/dna/dna.c
74ca47
+++ b/ldap/servers/plugins/dna/dna.c
74ca47
@@ -23,14 +23,6 @@
74ca47
 #include "slapi-private.h"
74ca47
 #include "prclist.h"
74ca47
 
74ca47
-/* Required to get portable printf/scanf format macros */
74ca47
-#ifdef HAVE_INTTYPES_H
74ca47
-#include <inttypes.h>
74ca47
-
74ca47
-#else
74ca47
-#error Need to define portable format macros such as PRIu64
74ca47
-#endif /* HAVE_INTTYPES_H */
74ca47
-
74ca47
 #include <sys stat.h="">
74ca47
 
74ca47
 #define DNA_PLUGIN_SUBSYSTEM "dna-plugin"
74ca47
@@ -997,7 +989,7 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry * e, int apply)
74ca47
     }
74ca47
 
74ca47
     slapi_log_err(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
74ca47
-                    "dna_parse_config_entry - %s [%" NSPRIu64 "]\n", DNA_NEXTVAL,
74ca47
+                    "dna_parse_config_entry - %s [%" PRIu64 "]\n", DNA_NEXTVAL,
74ca47
                     entry->nextval);
74ca47
 
74ca47
     value = slapi_entry_attr_get_charptr(e, DNA_PREFIX);
74ca47
@@ -1026,7 +1018,7 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry * e, int apply)
74ca47
     }
74ca47
 
74ca47
     slapi_log_err(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
74ca47
-                    "dna_parse_config_entry - %s [%" NSPRIu64 "]\n", DNA_INTERVAL, entry->interval);
74ca47
+                    "dna_parse_config_entry - %s [%" PRIu64 "]\n", DNA_INTERVAL, entry->interval);
74ca47
 #endif
74ca47
 
74ca47
     value = slapi_entry_attr_get_charptr(e, DNA_GENERATE);
74ca47
@@ -1126,7 +1118,7 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry * e, int apply)
74ca47
     }
74ca47
 
74ca47
     slapi_log_err(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
74ca47
-                    "dna_parse_config_entry - %s [%" NSPRIu64 "]\n", DNA_MAXVAL,
74ca47
+                    "dna_parse_config_entry - %s [%" PRIu64 "]\n", DNA_MAXVAL,
74ca47
                     entry->maxval);
74ca47
 
74ca47
     /* get the global bind dn and password(if any) */
74ca47
@@ -1256,7 +1248,7 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry * e, int apply)
74ca47
     }
74ca47
 
74ca47
     slapi_log_err(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
74ca47
-                    "dna_parse_config_entry - %s [%" NSPRIu64 "]\n", DNA_THRESHOLD,
74ca47
+                    "dna_parse_config_entry - %s [%" PRIu64 "]\n", DNA_THRESHOLD,
74ca47
                     entry->threshold);
74ca47
 
74ca47
     value = slapi_entry_attr_get_charptr(e, DNA_RANGE_REQUEST_TIMEOUT);
74ca47
@@ -1268,7 +1260,7 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry * e, int apply)
74ca47
     }
74ca47
 
74ca47
     slapi_log_err(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
74ca47
-                    "dna_parse_config_entry - %s [%" NSPRIu64 "]\n", DNA_RANGE_REQUEST_TIMEOUT,
74ca47
+                    "dna_parse_config_entry - %s [%" PRIu64 "]\n", DNA_RANGE_REQUEST_TIMEOUT,
74ca47
                     entry->timeout);
74ca47
 
74ca47
     value = slapi_entry_attr_get_charptr(e, DNA_NEXT_RANGE);
74ca47
@@ -2307,7 +2299,7 @@ dna_first_free_value(struct configEntry *config_entry,
74ca47
             return LDAP_OPERATIONS_ERROR;
74ca47
         }
74ca47
 
74ca47
-        filter = slapi_ch_smprintf("(&%s(&(%s>=%" NSPRIu64 ")(%s<=%" NSPRIu64 ")))",
74ca47
+        filter = slapi_ch_smprintf("(&%s(&(%s>=%" PRIu64 ")(%s<=%" PRIu64 ")))",
74ca47
                                    config_entry->filter,
74ca47
                                    config_entry->types[0], tmpval,
74ca47
                                    config_entry->types[0], config_entry->maxval);
74ca47
@@ -2497,7 +2489,7 @@ static int dna_get_next_value(struct configEntry *config_entry,
74ca47
     if ((config_entry->maxval == -1) ||
74ca47
         (nextval <= (config_entry->maxval + config_entry->interval))) {
74ca47
         /* try to set the new next value in the config entry */
74ca47
-        snprintf(next_value, sizeof(next_value),"%" NSPRIu64, nextval);
74ca47
+        snprintf(next_value, sizeof(next_value),"%" PRIu64, nextval);
74ca47
 
74ca47
         /* set up our replace modify operation */
74ca47
         replace_val[0] = next_value;
74ca47
@@ -2524,7 +2516,7 @@ static int dna_get_next_value(struct configEntry *config_entry,
74ca47
 
74ca47
     if (LDAP_SUCCESS == ret) {
74ca47
         slapi_ch_free_string(next_value_ret);
74ca47
-        *next_value_ret = slapi_ch_smprintf("%" NSPRIu64, setval);
74ca47
+        *next_value_ret = slapi_ch_smprintf("%" PRIu64, setval);
74ca47
         if (NULL == *next_value_ret) {
74ca47
             ret = LDAP_OPERATIONS_ERROR;
74ca47
             goto done;
74ca47
@@ -2609,7 +2601,7 @@ dna_update_shared_config(struct configEntry *config_entry)
74ca47
 
74ca47
         /* We store the number of remaining assigned values
74ca47
          * in the shared config entry. */
74ca47
-        snprintf(remaining_vals, sizeof(remaining_vals),"%" NSPRIu64,
74ca47
+        snprintf(remaining_vals, sizeof(remaining_vals),"%" PRIu64,
74ca47
                 config_entry->remaining);
74ca47
 
74ca47
         /* set up our replace modify operation */
74ca47
@@ -2709,7 +2701,7 @@ dna_update_next_range(struct configEntry *config_entry,
74ca47
     int ret = 0;
74ca47
 
74ca47
     /* Try to set the new next range in the config entry. */
74ca47
-    snprintf(nextrange_value, sizeof(nextrange_value), "%" NSPRIu64 "-%" NSPRIu64,
74ca47
+    snprintf(nextrange_value, sizeof(nextrange_value), "%" PRIu64 "-%" PRIu64,
74ca47
     		lower, upper);
74ca47
 
74ca47
     /* set up our replace modify operation */
74ca47
@@ -2778,8 +2770,8 @@ dna_activate_next_range(struct configEntry *config_entry)
74ca47
     int ret = 0;
74ca47
 
74ca47
     /* Setup the modify operation for the config entry */
74ca47
-    snprintf(maxval_val, sizeof(maxval_val),"%" NSPRIu64, config_entry->next_range_upper);
74ca47
-    snprintf(nextval_val, sizeof(nextval_val),"%" NSPRIu64, config_entry->next_range_lower);
74ca47
+    snprintf(maxval_val, sizeof(maxval_val),"%" PRIu64, config_entry->next_range_upper);
74ca47
+    snprintf(nextval_val, sizeof(nextval_val),"%" PRIu64, config_entry->next_range_lower);
74ca47
 
74ca47
     maxval_vals[0] = maxval_val;
74ca47
     maxval_vals[1] = 0;
74ca47
@@ -3319,7 +3311,7 @@ dna_create_valcheck_filter(struct configEntry *config_entry, PRUint64 value, cha
74ca47
      * - the string length of the filter in the config
74ca47
      * - the string length sum of all configured types
74ca47
      * - 23 bytes for each type (20 for the max string
74ca47
-     *   representation of a NSPRIu64, 3 for "(=)"
74ca47
+     *   representation of a PRIu64, 3 for "(=)"
74ca47
      * - 3 bytes for the beginning and end of the filter - "(&" and ")"
74ca47
      * - 3 bytes to OR together multiple types (if present) - "(|" and ")"
74ca47
      * - the string length of the prefix (if one is configured) for each type
74ca47
@@ -3556,8 +3548,8 @@ _dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e, char **errstr)
74ca47
                     (config_entry->remaining <= config_entry->threshold)) {
74ca47
                     slapi_log_err(SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM,
74ca47
                                     "_dna_pre_op_add - Passed threshold of %" 
74ca47
-                                    NSPRIu64 " remaining values "
74ca47
-                                    "for range %s. (%" NSPRIu64 " values remain)\n",
74ca47
+                                    PRIu64 " remaining values "
74ca47
+                                    "for range %s. (%" PRIu64 " values remain)\n",
74ca47
                                     config_entry->threshold, config_entry->dn,
74ca47
                                     config_entry->remaining);
74ca47
                     dna_fix_maxval(config_entry, 0);
74ca47
@@ -3828,8 +3820,8 @@ _dna_pre_op_modify(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Mods *smods, char **e
74ca47
                     (config_entry->remaining <= config_entry->threshold)) {
74ca47
                     slapi_log_err(SLAPI_LOG_ERR, DNA_PLUGIN_SUBSYSTEM,
74ca47
                                     "_dna_pre_op_modify - Passed threshold of %" 
74ca47
-                                    NSPRIu64 " remaining values "
74ca47
-                                    "for range %s. (%" NSPRIu64 " values remain)\n",
74ca47
+                                    PRIu64 " remaining values "
74ca47
+                                    "for range %s. (%" PRIu64 " values remain)\n",
74ca47
                                     config_entry->threshold, config_entry->dn,
74ca47
                                     config_entry->remaining);
74ca47
                     dna_fix_maxval(config_entry, 0);
74ca47
@@ -4411,8 +4403,8 @@ static int dna_extend_exop(Slapi_PBlock *pb)
74ca47
         char highstr[16];
74ca47
 
74ca47
         /* Create the exop response */
74ca47
-        snprintf(lowstr, sizeof(lowstr), "%" NSPRIu64, lower);
74ca47
-        snprintf(highstr, sizeof(highstr), "%" NSPRIu64, upper);
74ca47
+        snprintf(lowstr, sizeof(lowstr), "%" PRIu64, lower);
74ca47
+        snprintf(highstr, sizeof(highstr), "%" PRIu64, upper);
74ca47
         range_low.bv_val = lowstr;
74ca47
         range_low.bv_len = strlen(range_low.bv_val);
74ca47
         range_high.bv_val = highstr;
74ca47
@@ -4445,7 +4437,7 @@ static int dna_extend_exop(Slapi_PBlock *pb)
74ca47
         ber_bvfree(respdata);
74ca47
 
74ca47
         slapi_log_err(SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM,
74ca47
-                        "dna_extend_exop - Released range %" NSPRIu64 "-%" NSPRIu64 ".\n",
74ca47
+                        "dna_extend_exop - Released range %" PRIu64 "-%" PRIu64 ".\n",
74ca47
                         lower, upper);
74ca47
     }
74ca47
 
74ca47
@@ -4588,7 +4580,7 @@ dna_release_range(char *range_dn, PRUint64 *lower, PRUint64 *upper)
74ca47
                 *lower = *upper - release + 1;
74ca47
 
74ca47
                 /* try to set the new maxval in the config entry */
74ca47
-                snprintf(max_value, sizeof(max_value),"%" NSPRIu64, (*lower - 1));
74ca47
+                snprintf(max_value, sizeof(max_value),"%" PRIu64, (*lower - 1));
74ca47
 
74ca47
                 /* set up our replace modify operation */
74ca47
                 replace_val[0] = max_value;
74ca47
diff --git a/ldap/servers/plugins/posix-winsync/posix-winsync.c b/ldap/servers/plugins/posix-winsync/posix-winsync.c
74ca47
index 63444e5..21e4ad0 100644
74ca47
--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c
74ca47
+++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c
74ca47
@@ -270,7 +270,7 @@ sync_acct_disable(void *cbdata, /* the usual domain config data */
74ca47
         if (update_entry) {
74ca47
             slapi_entry_attr_set_ulong(update_entry, "userAccountControl", adval);
74ca47
             slapi_log_err(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
74ca47
-                "<-- sync_acct_disable - %s AD account [%s] - new value is [%" NSPRIu64 "]\n",
74ca47
+                "<-- sync_acct_disable - %s AD account [%s] - new value is [%" PRIu64 "]\n",
74ca47
 				(ds_is_enabled) ? "enabled" : "disabled", slapi_entry_get_dn_const(update_entry), adval);
74ca47
         } else {
74ca47
             /* iterate through the mods - if there is already a mod
74ca47
@@ -326,7 +326,7 @@ sync_acct_disable(void *cbdata, /* the usual domain config data */
74ca47
                 mod_bval->bv_len = strlen(acctvalstr);
74ca47
             }
74ca47
             slapi_log_err(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
74ca47
-                "<-- sync_acct_disable - %s AD account [%s] - new value is [%" NSPRIu64 "]\n",
74ca47
+                "<-- sync_acct_disable - %s AD account [%s] - new value is [%" PRIu64 "]\n",
74ca47
 				(ds_is_enabled) ? "enabled" : "disabled", slapi_entry_get_dn_const(ad_entry), adval);
74ca47
         }
74ca47
     }
74ca47
diff --git a/ldap/servers/plugins/replication/repl.h b/ldap/servers/plugins/replication/repl.h
74ca47
index 89ad481..9460ca9 100644
74ca47
--- a/ldap/servers/plugins/replication/repl.h
74ca47
+++ b/ldap/servers/plugins/replication/repl.h
74ca47
@@ -15,21 +15,8 @@
74ca47
 #ifndef _REPL_H_
74ca47
 #define _REPL_H_
74ca47
 
74ca47
-/* Required to get portable printf/scanf format macros */
74ca47
-#ifdef HAVE_INTTYPES_H
74ca47
-#include <inttypes.h>
74ca47
-
74ca47
-/* NSPR uses the print macros a bit differently than ANSI C.  We
74ca47
- * need to use ll for a 64-bit integer, even when a long is 64-bit.
74ca47
- */
74ca47
-#undef PRIu64
74ca47
-#define PRIu64  "llu"
74ca47
-#undef PRI64
74ca47
-#define PRI64   "ll"
74ca47
-
74ca47
-#else
74ca47
-#error Need to define portable format macros such as PRIu64
74ca47
-#endif /* HAVE_INTTYPES_H */
74ca47
+/* Provides our int types and platform specific requirements. */
74ca47
+#include <slapi_pal.h>
74ca47
 
74ca47
 #include <limits.h>
74ca47
 #include <time.h>
74ca47
diff --git a/ldap/servers/plugins/replication/repl5_inc_protocol.c b/ldap/servers/plugins/replication/repl5_inc_protocol.c
74ca47
index a5ae885..36c279e 100644
74ca47
--- a/ldap/servers/plugins/replication/repl5_inc_protocol.c
74ca47
+++ b/ldap/servers/plugins/replication/repl5_inc_protocol.c
74ca47
@@ -2104,7 +2104,7 @@ repl5_inc_stop(Private_Repl_Protocol *prp)
74ca47
 		/* Isn't listening. Do something drastic. */
74ca47
 		return_value = -1;
74ca47
 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
-				"repl5_inc_stop - %s: Protocol does not stop after %" NSPRIu64 " seconds\n",
74ca47
+				"repl5_inc_stop - %s: Protocol does not stop after %" PRIu64 " seconds\n",
74ca47
 				agmt_get_long_name(prp->agmt), timeout);
74ca47
 	}
74ca47
 	else
74ca47
diff --git a/ldap/servers/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c
74ca47
index 9549dcf..edffb84 100644
74ca47
--- a/ldap/servers/plugins/replication/repl5_init.c
74ca47
+++ b/ldap/servers/plugins/replication/repl5_init.c
74ca47
@@ -208,7 +208,7 @@ get_repl_session_id (Slapi_PBlock *pb, char *idstr, CSN **csn)
74ca47
 		/* Avoid "Connection is NULL and hence cannot access SLAPI_CONN_ID" */
74ca47
 		if (opid) {
74ca47
 			slapi_pblock_get (pb, SLAPI_CONN_ID, &connid);
74ca47
-			snprintf (idstr, REPL_SESSION_ID_SIZE, "conn=%" NSPRIu64 " op=%d",
74ca47
+			snprintf (idstr, REPL_SESSION_ID_SIZE, "conn=%" PRIu64 " op=%d",
74ca47
 					connid, opid);
74ca47
 		}
74ca47
 
74ca47
diff --git a/ldap/servers/plugins/replication/repl5_plugins.c b/ldap/servers/plugins/replication/repl5_plugins.c
74ca47
index 357c093..ebcc230 100644
74ca47
--- a/ldap/servers/plugins/replication/repl5_plugins.c
74ca47
+++ b/ldap/servers/plugins/replication/repl5_plugins.c
74ca47
@@ -1335,7 +1335,7 @@ process_postop (Slapi_PBlock *pb)
74ca47
 			{
74ca47
 				slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name,
74ca47
 					"process_postop - Failed to apply update (%s) error (%d).  "
74ca47
-					"Aborting replication session(conn=%" NSPRIu64 " op=%d)\n",
74ca47
+					"Aborting replication session(conn=%" PRIu64 " op=%d)\n",
74ca47
 					csn_as_string(opcsn, PR_FALSE, csn_str), retval,
74ca47
 					connid, opid);
74ca47
 				/*
74ca47
diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
74ca47
index 5718a98..a106f8b 100644
74ca47
--- a/ldap/servers/plugins/replication/repl5_replica.c
74ca47
+++ b/ldap/servers/plugins/replication/repl5_replica.c
74ca47
@@ -596,7 +596,7 @@ replica_get_exclusive_access(Replica *r, PRBool *isInc, PRUint64 connid, int opi
74ca47
 
74ca47
 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 				"replica_get_exclusive_access - "
74ca47
-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": "
74ca47
+				"conn=%" PRIu64 " op=%d repl=\"%s\": "
74ca47
 				"Replica in use locking_purl=%s\n",
74ca47
 				connid, opid,
74ca47
 				slapi_sdn_get_dn(r->repl_root),
74ca47
@@ -620,7 +620,7 @@ replica_get_exclusive_access(Replica *r, PRBool *isInc, PRUint64 connid, int opi
74ca47
 	{
74ca47
         slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
         		"replica_get_exclusive_access - "
74ca47
-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": Acquired replica\n",
74ca47
+				"conn=%" PRIu64 " op=%d repl=\"%s\": Acquired replica\n",
74ca47
 				connid, opid,
74ca47
 				slapi_sdn_get_dn(r->repl_root));
74ca47
 		r->repl_state_flags |= REPLICA_IN_USE;
74ca47
@@ -664,13 +664,13 @@ replica_relinquish_exclusive_access(Replica *r, PRUint64 connid, int opid)
74ca47
 	{
74ca47
 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 				"replica_relinquish_exclusive_access - "
74ca47
-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": "
74ca47
+				"conn=%" PRIu64 " op=%d repl=\"%s\": "
74ca47
 				"Replica not in use\n",
74ca47
 				connid, opid, slapi_sdn_get_dn(r->repl_root));
74ca47
 	} else {
74ca47
 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 				"replica_relinquish_exclusive_access - "
74ca47
-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": "
74ca47
+				"conn=%" PRIu64 " op=%d repl=\"%s\": "
74ca47
 				"Released replica held by locking_purl=%s\n",
74ca47
 				connid, opid,
74ca47
 				slapi_sdn_get_dn(r->repl_root),	r->locking_purl);
74ca47
diff --git a/ldap/servers/plugins/replication/repl5_total.c b/ldap/servers/plugins/replication/repl5_total.c
74ca47
index af570a8..064a099 100644
74ca47
--- a/ldap/servers/plugins/replication/repl5_total.c
74ca47
+++ b/ldap/servers/plugins/replication/repl5_total.c
74ca47
@@ -853,7 +853,7 @@ multimaster_extop_NSDS50ReplicationEntry(Slapi_PBlock  *pb)
74ca47
            const char *dn = slapi_entry_get_dn_const(e);
74ca47
            slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
                    "multimaster_extop_NSDS50ReplicationEntry - "
74ca47
-                   "Error %d: could not import entry dn %s for total update operation conn=%" NSPRIu64 " op=%d\n",
74ca47
+                   "Error %d: could not import entry dn %s for total update operation conn=%" PRIu64 " op=%d\n",
74ca47
                    rc, dn, connid, opid);
74ca47
 		   rc = -1;
74ca47
 	   }
74ca47
@@ -864,7 +864,7 @@ multimaster_extop_NSDS50ReplicationEntry(Slapi_PBlock  *pb)
74ca47
 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 				"multimaster_extop_NSDS50ReplicationEntry - "
74ca47
 				"Error %d: could not decode the total update extop "
74ca47
-				"for total update operation conn=%" NSPRIu64 " op=%d\n",
74ca47
+				"for total update operation conn=%" PRIu64 " op=%d\n",
74ca47
 				rc, connid, opid);
74ca47
 	}
74ca47
    
74ca47
diff --git a/ldap/servers/plugins/replication/repl_connext.c b/ldap/servers/plugins/replication/repl_connext.c
74ca47
index 29dc2a7..ba0fa15 100644
74ca47
--- a/ldap/servers/plugins/replication/repl_connext.c
74ca47
+++ b/ldap/servers/plugins/replication/repl_connext.c
74ca47
@@ -84,7 +84,7 @@ void consumer_connection_extension_destructor (void *ext, void *object, void *pa
74ca47
 					slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 							"consumer_connection_extension_destructor - "
74ca47
 							"Aborting total update in progress for replicated "
74ca47
-							"area %s connid=%" NSPRIu64 "\n", slapi_sdn_get_dn(repl_root_sdn), connid);
74ca47
+							"area %s connid=%" PRIu64 "\n", slapi_sdn_get_dn(repl_root_sdn), connid);
74ca47
 					slapi_stop_bulk_import(pb);
74ca47
 				}
74ca47
 				else
74ca47
@@ -156,7 +156,7 @@ consumer_connection_extension_acquire_exclusive_access(void* conn, PRUint64 conn
74ca47
             ret = connext;
74ca47
             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
             		"consumer_connection_extension_acquire_exclusive_access - "
74ca47
-                    "conn=%" NSPRIu64 " op=%d Acquired consumer connection extension\n",
74ca47
+                    "conn=%" PRIu64 " op=%d Acquired consumer connection extension\n",
74ca47
                     connid, opid);
74ca47
         }
74ca47
         else if (opid == connext->in_use_opid)
74ca47
@@ -164,14 +164,14 @@ consumer_connection_extension_acquire_exclusive_access(void* conn, PRUint64 conn
74ca47
             ret = connext;
74ca47
             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
             		"consumer_connection_extension_acquire_exclusive_access - "
74ca47
-                    "conn=%" NSPRIu64 " op=%d Reacquired consumer connection extension\n",
74ca47
+                    "conn=%" PRIu64 " op=%d Reacquired consumer connection extension\n",
74ca47
                     connid, opid);
74ca47
         }
74ca47
         else
74ca47
         {
74ca47
             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
             		"consumer_connection_extension_acquire_exclusive_access - "
74ca47
-                    "conn=%" NSPRIu64 " op=%d Could not acquire consumer connection extension; it is in use by op=%d\n",
74ca47
+                    "conn=%" PRIu64 " op=%d Could not acquire consumer connection extension; it is in use by op=%d\n",
74ca47
                     connid, opid, connext->in_use_opid);
74ca47
         }
74ca47
 
74ca47
@@ -182,7 +182,7 @@ consumer_connection_extension_acquire_exclusive_access(void* conn, PRUint64 conn
74ca47
     {
74ca47
         slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
         		"consumer_connection_extension_acquire_exclusive_access - "
74ca47
-                "conn=%" NSPRIu64 " op=%d Could not acquire consumer extension, it is NULL!\n",
74ca47
+                "conn=%" PRIu64 " op=%d Could not acquire consumer extension, it is NULL!\n",
74ca47
                 connid, opid);
74ca47
     }
74ca47
     
74ca47
@@ -221,7 +221,7 @@ consumer_connection_extension_relinquish_exclusive_access(void* conn, PRUint64 c
74ca47
         {
74ca47
             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
             		"consumer_connection_extension_relinquish_exclusive_access - "
74ca47
-                    "conn=%" NSPRIu64 " op=%d Consumer connection extension is not in use\n",
74ca47
+                    "conn=%" PRIu64 " op=%d Consumer connection extension is not in use\n",
74ca47
                     connid, opid);
74ca47
             ret = 2;
74ca47
         }
74ca47
@@ -230,7 +230,7 @@ consumer_connection_extension_relinquish_exclusive_access(void* conn, PRUint64 c
74ca47
             /* step 4, relinquish it (normal) */
74ca47
             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
             		"consumer_connection_extension_relinquish_exclusive_access - "
74ca47
-                    "conn=%" NSPRIu64 " op=%d Relinquishing consumer connection extension\n",
74ca47
+                    "conn=%" PRIu64 " op=%d Relinquishing consumer connection extension\n",
74ca47
                     connid, opid);
74ca47
             connext->in_use_opid = -1;
74ca47
             ret = 1;
74ca47
@@ -240,7 +240,7 @@ consumer_connection_extension_relinquish_exclusive_access(void* conn, PRUint64 c
74ca47
             /* step 4, relinquish it (forced) */
74ca47
             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
             		"consumer_connection_extension_relinquish_exclusive_access - "
74ca47
-                    "conn=%" NSPRIu64 " op=%d Forced to relinquish consumer connection extension held by op=%d\n",
74ca47
+                    "conn=%" PRIu64 " op=%d Forced to relinquish consumer connection extension held by op=%d\n",
74ca47
                     connid, opid, connext->in_use_opid);
74ca47
             connext->in_use_opid = -1;
74ca47
             ret = 1;
74ca47
@@ -249,7 +249,7 @@ consumer_connection_extension_relinquish_exclusive_access(void* conn, PRUint64 c
74ca47
         {
74ca47
             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
             		"consumer_connection_extension_relinquish_exclusive_access - "
74ca47
-                    "conn=%" NSPRIu64 " op=%d Not relinquishing consumer connection extension, it is held by op=%d!\n",
74ca47
+                    "conn=%" PRIu64 " op=%d Not relinquishing consumer connection extension, it is held by op=%d!\n",
74ca47
                     connid, opid, connext->in_use_opid);
74ca47
         }
74ca47
         
74ca47
@@ -260,7 +260,7 @@ consumer_connection_extension_relinquish_exclusive_access(void* conn, PRUint64 c
74ca47
     {
74ca47
         slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
         		"consumer_connection_extension_relinquish_exclusive_access - "
74ca47
-                "conn=%" NSPRIu64 " op=%d Could not relinquish consumer extension, it is NULL!\n",
74ca47
+                "conn=%" PRIu64 " op=%d Could not relinquish consumer extension, it is NULL!\n",
74ca47
                 connid, opid);
74ca47
     }
74ca47
     
74ca47
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
74ca47
index 80580f9..412caec 100644
74ca47
--- a/ldap/servers/plugins/replication/repl_extop.c
74ca47
+++ b/ldap/servers/plugins/replication/repl_extop.c
74ca47
@@ -668,7 +668,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
74ca47
 		connext->repl_protocol_version = REPL_PROTOCOL_50_INCREMENTAL;
74ca47
 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 			"multimaster_extop_StartNSDS50ReplicationRequest - "
74ca47
-			"conn=%" NSPRIu64 " op=%d repl=\"%s\": Begin incremental protocol\n",
74ca47
+			"conn=%" PRIu64 " op=%d repl=\"%s\": Begin incremental protocol\n",
74ca47
 			connid, opid, repl_root);
74ca47
 		isInc = PR_TRUE;
74ca47
 	}
74ca47
@@ -695,7 +695,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
74ca47
 		}
74ca47
 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 				"multimaster_extop_StartNSDS50ReplicationRequest - "
74ca47
-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": Begin total protocol\n",
74ca47
+				"conn=%" PRIu64 " op=%d repl=\"%s\": Begin total protocol\n",
74ca47
 				connid, opid, repl_root);
74ca47
 		isInc = PR_FALSE;
74ca47
 	}
74ca47
@@ -705,7 +705,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
74ca47
 		connext->repl_protocol_version = REPL_PROTOCOL_50_INCREMENTAL;
74ca47
 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 			"multimaster_extop_StartNSDS50ReplicationRequest - "
74ca47
-			"conn=%" NSPRIu64 " op=%d repl=\"%s\": Begin 7.1 incremental protocol\n",
74ca47
+			"conn=%" PRIu64 " op=%d repl=\"%s\": Begin 7.1 incremental protocol\n",
74ca47
 			connid, opid, repl_root);
74ca47
 		isInc = PR_TRUE;
74ca47
 	}
74ca47
@@ -718,7 +718,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
74ca47
 		}
74ca47
 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 				"multimaster_extop_StartNSDS50ReplicationRequest - "
74ca47
-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": Begin 7.1 total protocol\n",
74ca47
+				"conn=%" PRIu64 " op=%d repl=\"%s\": Begin 7.1 total protocol\n",
74ca47
 				connid, opid, repl_root);
74ca47
 		isInc = PR_FALSE;
74ca47
 	}
74ca47
@@ -741,7 +741,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
74ca47
 	{
74ca47
         slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
         		"multimaster_extop_StartNSDS50ReplicationRequest - "
74ca47
-				"conn=%" NSPRIu64 " op=%d replica=\"%s\": "
74ca47
+				"conn=%" PRIu64 " op=%d replica=\"%s\": "
74ca47
 				"Replica is being configured: try again later\n",
74ca47
 				connid, opid, repl_root);
74ca47
 		response = NSDS50_REPL_REPLICA_BUSY;
74ca47
@@ -814,7 +814,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
74ca47
 				{
74ca47
 					slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name,
74ca47
 							"multimaster_extop_StartNSDS50ReplicationRequest - "
74ca47
-							"conn=%" NSPRIu64 " op=%d repl=\"%s\": "
74ca47
+							"conn=%" PRIu64 " op=%d repl=\"%s\": "
74ca47
 							"Excessive clock skew from supplier RUV\n",
74ca47
 							connid, opid, repl_root);
74ca47
 					response = NSDS50_REPL_EXCESSIVE_CLOCK_SKEW;
74ca47
@@ -852,7 +852,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
74ca47
 	if (check_replica_id_uniqueness(replica, supplier_ruv) != 0){
74ca47
         slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
         		"multimaster_extop_StartNSDS50ReplicationRequest - "
74ca47
-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": "
74ca47
+				"conn=%" PRIu64 " op=%d repl=\"%s\": "
74ca47
 				"Replica has same replicaID %d as supplier\n",
74ca47
 				connid, opid, repl_root, replica_get_rid(replica));
74ca47
 		response = NSDS50_REPL_REPLICAID_ERROR;
74ca47
@@ -865,7 +865,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
74ca47
 	 * the session's conn id and op id to identify the the supplier.
74ca47
 	 */
74ca47
 	/* junkrc = ruv_get_first_id_and_purl(supplier_ruv, &junkrid, &locking_purl); */
74ca47
-	snprintf(locking_session, sizeof(locking_session), "conn=%" NSPRIu64 " id=%d",
74ca47
+	snprintf(locking_session, sizeof(locking_session), "conn=%" PRIu64 " id=%d",
74ca47
 			connid, opid);
74ca47
 	locking_purl = &locking_session[0];
74ca47
 	if (replica_get_exclusive_access(replica, &isInc, connid, opid,
74ca47
@@ -892,7 +892,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
74ca47
 		int max = 480 * 5;
74ca47
 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 				"multimaster_extop_StartNSDS50ReplicationRequest - "
74ca47
-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": "
74ca47
+				"conn=%" PRIu64 " op=%d repl=\"%s\": "
74ca47
 				"374 - Starting sleep: connext->repl_protocol_version == %d\n",
74ca47
 				connid, opid, repl_root, connext->repl_protocol_version);
74ca47
         
74ca47
@@ -902,7 +902,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
74ca47
         
74ca47
 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 				"multimaster_extop_StartNSDS50ReplicationRequest - "
74ca47
-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": "
74ca47
+				"conn=%" PRIu64 " op=%d repl=\"%s\": "
74ca47
 				"374 - Finished sleep: connext->repl_protocol_version == %d\n",
74ca47
 				connid, opid, repl_root, connext->repl_protocol_version);
74ca47
 	}
74ca47
@@ -997,7 +997,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)
74ca47
 		response = NSDS50_REPL_INTERNAL_ERROR;
74ca47
 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 				"multimaster_extop_StartNSDS50ReplicationRequest - "
74ca47
-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": "
74ca47
+				"conn=%" PRIu64 " op=%d repl=\"%s\": "
74ca47
 				"Unexpected update protocol received: %d.  "
74ca47
 				"Expected incremental or total.\n",
74ca47
 				connid, opid, repl_root, connext->repl_protocol_version);
74ca47
@@ -1039,7 +1039,7 @@ send_response:
74ca47
 		slapi_log_err (resp_log_level,
74ca47
 			repl_plugin_name,
74ca47
 			"multimaster_extop_StartNSDS50ReplicationRequest - "
74ca47
-			"conn=%" NSPRIu64 " op=%d replica=\"%s\": "
74ca47
+			"conn=%" PRIu64 " op=%d replica=\"%s\": "
74ca47
 			"Unable to acquire replica: error: %s%s\n",
74ca47
 			connid, opid,
74ca47
 			(replica ? slapi_sdn_get_dn(replica_get_root(replica)) : "unknown"),
74ca47
@@ -1092,7 +1092,7 @@ send_response:
74ca47
 	slapi_pblock_set(pb, SLAPI_EXT_OP_RET_VALUE, resp_bval);
74ca47
 	slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,
74ca47
 			"multimaster_extop_StartNSDS50ReplicationRequest - "
74ca47
-			"conn=%" NSPRIu64 " op=%d repl=\"%s\": "
74ca47
+			"conn=%" PRIu64 " op=%d repl=\"%s\": "
74ca47
 			"%s: response=%d rc=%d\n",
74ca47
 			connid, opid, repl_root,
74ca47
 			is90 ? "StartNSDS90ReplicationRequest" :
74ca47
diff --git a/ldap/servers/plugins/sync/sync_persist.c b/ldap/servers/plugins/sync/sync_persist.c
74ca47
index 667a529..bd856cb 100644
74ca47
--- a/ldap/servers/plugins/sync/sync_persist.c
74ca47
+++ b/ldap/servers/plugins/sync/sync_persist.c
74ca47
@@ -548,14 +548,14 @@ sync_send_results( void *arg )
74ca47
 	slapi_pblock_get(req->req_pblock, SLAPI_CONNECTION, &conn);
74ca47
 	if (NULL == conn) {
74ca47
 		slapi_log_err(SLAPI_LOG_ERR, SYNC_PLUGIN_SUBSYSTEM,
74ca47
-			"sync_send_results - conn=%" NSPRIu64 " op=%d Null connection - aborted\n",
74ca47
+			"sync_send_results - conn=%" PRIu64 " op=%d Null connection - aborted\n",
74ca47
 			connid, opid);
74ca47
 		goto done;
74ca47
 	}
74ca47
 	conn_acq_flag = sync_acquire_connection (conn);
74ca47
 	if (conn_acq_flag) {
74ca47
 		slapi_log_err(SLAPI_LOG_ERR, SYNC_PLUGIN_SUBSYSTEM,
74ca47
-			"sync_send_results - conn=%" NSPRIu64 " op=%d Could not acquire the connection - aborted\n",
74ca47
+			"sync_send_results - conn=%" PRIu64 " op=%d Could not acquire the connection - aborted\n",
74ca47
 			connid, opid);
74ca47
 		goto done;
74ca47
 	}
74ca47
@@ -566,7 +566,7 @@ sync_send_results( void *arg )
74ca47
 		/* Check for an abandoned operation */
74ca47
 		if ( op == NULL || slapi_is_operation_abandoned( op ) ) {
74ca47
 			slapi_log_err(SLAPI_LOG_PLUGIN, SYNC_PLUGIN_SUBSYSTEM,
74ca47
-						"sync_send_results - conn=%" NSPRIu64 " op=%d Operation no longer active - terminating\n",
74ca47
+						"sync_send_results - conn=%" PRIu64 " op=%d Operation no longer active - terminating\n",
74ca47
 						connid, opid);
74ca47
 			break;
74ca47
 		}
74ca47
diff --git a/ldap/servers/plugins/syntaxes/validate_task.c b/ldap/servers/plugins/syntaxes/validate_task.c
74ca47
index eae2d2a..c051573 100644
74ca47
--- a/ldap/servers/plugins/syntaxes/validate_task.c
74ca47
+++ b/ldap/servers/plugins/syntaxes/validate_task.c
74ca47
@@ -201,12 +201,12 @@ syntax_validate_task_thread(void *arg)
74ca47
 	slapi_pblock_destroy(search_pb);
74ca47
 
74ca47
 	/* Log finished message. */
74ca47
-	slapi_task_log_notice(task, "Syntax validate task complete.  Found %" NSPRIu64
74ca47
+	slapi_task_log_notice(task, "Syntax validate task complete.  Found %" PRIu64
74ca47
 	                " invalid entries.\n", slapi_counter_get_value(td->invalid_entries));
74ca47
-	slapi_task_log_status(task, "Syntax validate task complete.  Found %" NSPRIu64
74ca47
+	slapi_task_log_status(task, "Syntax validate task complete.  Found %" PRIu64
74ca47
 	                " invalid entries.\n", slapi_counter_get_value(td->invalid_entries));
74ca47
 	slapi_log_err(SLAPI_LOG_ERR, SYNTAX_PLUGIN_SUBSYSTEM, "syntax_validate_task_thread - Complete."
74ca47
-	                "  Found %" NSPRIu64 " invalid entries.\n",
74ca47
+	                "  Found %" PRIu64 " invalid entries.\n",
74ca47
 	                slapi_counter_get_value(td->invalid_entries));
74ca47
 	slapi_task_inc_progress(task);
74ca47
 
74ca47
diff --git a/ldap/servers/plugins/usn/usn.c b/ldap/servers/plugins/usn/usn.c
74ca47
index 5e67e0a..54ebc31 100644
74ca47
--- a/ldap/servers/plugins/usn/usn.c
74ca47
+++ b/ldap/servers/plugins/usn/usn.c
74ca47
@@ -320,7 +320,7 @@ _usn_add_next_usn(Slapi_Entry *e, Slapi_Backend *be)
74ca47
                     "--> _usn_add_next_usn\n");
74ca47
 
74ca47
     /* add next USN to the entry; "be" contains the usn counter */
74ca47
-    usn_berval.bv_val = slapi_ch_smprintf("%" NSPRIu64, 
74ca47
+    usn_berval.bv_val = slapi_ch_smprintf("%" PRIu64, 
74ca47
                                           slapi_counter_get_value(be->be_usn_counter));
74ca47
     usn_berval.bv_len = strlen(usn_berval.bv_val);
74ca47
     slapi_entry_attr_find(e, SLAPI_ATTR_ENTRYUSN, &attr);
74ca47
@@ -360,7 +360,7 @@ _usn_mod_next_usn(LDAPMod ***mods, Slapi_Backend *be)
74ca47
 
74ca47
     /* add next USN to the mods; "be" contains the usn counter */
74ca47
     usn_berval.bv_val = counter_buf;
74ca47
-    snprintf(usn_berval.bv_val, USN_COUNTER_BUF_LEN, "%" NSPRIu64,
74ca47
+    snprintf(usn_berval.bv_val, USN_COUNTER_BUF_LEN, "%" PRIu64,
74ca47
                 slapi_counter_get_value(be->be_usn_counter));
74ca47
     usn_berval.bv_len = strlen(usn_berval.bv_val);
74ca47
     bvals[0] = &usn_berval;
74ca47
@@ -681,7 +681,7 @@ usn_rootdse_search(Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter,
74ca47
             /* get a next USN counter from be_usn_counter; 
74ca47
              * then minus 1 from it (except if be_usn_counter has value 0) */
74ca47
             if (slapi_counter_get_value(be->be_usn_counter)) {
74ca47
-                snprintf(usn_berval.bv_val, USN_COUNTER_BUF_LEN, "%" NSPRIu64,
74ca47
+                snprintf(usn_berval.bv_val, USN_COUNTER_BUF_LEN, "%" PRIu64,
74ca47
                             slapi_counter_get_value(be->be_usn_counter)-1);
74ca47
             } else {
74ca47
                 snprintf(usn_berval.bv_val, USN_COUNTER_BUF_LEN, "-1");
74ca47
@@ -704,7 +704,7 @@ usn_rootdse_search(Slapi_PBlock *pb, Slapi_Entry* e, Slapi_Entry* entryAfter,
74ca47
             /* get a next USN counter from be_usn_counter; 
74ca47
              * then minus 1 from it (except if be_usn_counter has value 0) */
74ca47
             if (slapi_counter_get_value(be->be_usn_counter)) {
74ca47
-                snprintf(usn_berval.bv_val, USN_COUNTER_BUF_LEN, "%" NSPRIu64,
74ca47
+                snprintf(usn_berval.bv_val, USN_COUNTER_BUF_LEN, "%" PRIu64,
74ca47
                             slapi_counter_get_value(be->be_usn_counter)-1);
74ca47
             } else {
74ca47
                 snprintf(usn_berval.bv_val, USN_COUNTER_BUF_LEN, "-1");
74ca47
diff --git a/ldap/servers/slapd/abandon.c b/ldap/servers/slapd/abandon.c
74ca47
index 18ff8ce..0485006 100644
74ca47
--- a/ldap/servers/slapd/abandon.c
74ca47
+++ b/ldap/servers/slapd/abandon.c
74ca47
@@ -119,19 +119,19 @@ do_abandon( Slapi_PBlock *pb )
74ca47
 	}
74ca47
 
74ca47
 	if ( 0 == pagedresults_free_one_msgid_nolock(pb->pb_conn, id) ) {
74ca47
-		slapi_log_access( LDAP_DEBUG_STATS, "conn=%" NSPRIu64 
74ca47
+		slapi_log_access( LDAP_DEBUG_STATS, "conn=%" PRIu64 
74ca47
 		    " op=%d ABANDON targetop=Simple Paged Results msgid=%d\n",
74ca47
 		    pb->pb_conn->c_connid, pb->pb_op->o_opid, id );
74ca47
 	} else if ( NULL == o ) {
74ca47
-		slapi_log_access( LDAP_DEBUG_STATS, "conn=%" NSPRIu64 " op=%d ABANDON"
74ca47
+		slapi_log_access( LDAP_DEBUG_STATS, "conn=%" PRIu64 " op=%d ABANDON"
74ca47
 			" targetop=NOTFOUND msgid=%d\n",
74ca47
 			pb->pb_conn->c_connid, pb->pb_op->o_opid, id );
74ca47
 	} else if ( suppressed_by_plugin ) {
74ca47
-		slapi_log_access( LDAP_DEBUG_STATS, "conn=%" NSPRIu64 " op=%d ABANDON"
74ca47
+		slapi_log_access( LDAP_DEBUG_STATS, "conn=%" PRIu64 " op=%d ABANDON"
74ca47
 			" targetop=SUPPRESSED-BY-PLUGIN msgid=%d\n",
74ca47
 			pb->pb_conn->c_connid, pb->pb_op->o_opid, id );
74ca47
 	} else {
74ca47
-		slapi_log_access( LDAP_DEBUG_STATS, "conn=%" NSPRIu64 " op=%d ABANDON"
74ca47
+		slapi_log_access( LDAP_DEBUG_STATS, "conn=%" PRIu64 " op=%d ABANDON"
74ca47
 			" targetop=%d msgid=%d nentries=%d etime=%ld\n",
74ca47
 			pb->pb_conn->c_connid, pb->pb_op->o_opid, o->o_opid, id,
74ca47
 			o->o_results.r.r_search.nentries, current_time() - o->o_time );
74ca47
diff --git a/ldap/servers/slapd/add.c b/ldap/servers/slapd/add.c
74ca47
index 1b994a0..9c4001e 100644
74ca47
--- a/ldap/servers/slapd/add.c
74ca47
+++ b/ldap/servers/slapd/add.c
74ca47
@@ -168,7 +168,7 @@ do_add( Slapi_PBlock *pb )
74ca47
 			if (( rc = slapi_entry_add_values( e, normtype, vals ))
74ca47
 				!= LDAP_SUCCESS ) {
74ca47
 				slapi_log_access( LDAP_DEBUG_STATS, 
74ca47
-					"conn=%" NSPRIu64 " op=%d ADD dn=\"%s\", add values for type %s failed\n",
74ca47
+					"conn=%" PRIu64 " op=%d ADD dn=\"%s\", add values for type %s failed\n",
74ca47
 					pb->pb_conn->c_connid, operation->o_opid,
74ca47
 					slapi_entry_get_dn_const(e), normtype );
74ca47
 				send_ldap_result( pb, rc, NULL, NULL, 0, NULL );
74ca47
@@ -460,7 +460,7 @@ static void op_shared_add (Slapi_PBlock *pb)
74ca47
 
74ca47
 		if ( !internal_op )
74ca47
 		{
74ca47
-			slapi_log_access(LDAP_DEBUG_STATS, "conn=%" NSPRIu64 " op=%d ADD dn=\"%s\"%s\n",
74ca47
+			slapi_log_access(LDAP_DEBUG_STATS, "conn=%" PRIu64 " op=%d ADD dn=\"%s\"%s\n",
74ca47
 							 pb->pb_conn->c_connid,
74ca47
 							 operation->o_opid,
74ca47
 							 slapi_entry_get_dn_const(e),
74ca47
diff --git a/ldap/servers/slapd/auth.c b/ldap/servers/slapd/auth.c
74ca47
index c787dd4..da1b586 100644
74ca47
--- a/ldap/servers/slapd/auth.c
74ca47
+++ b/ldap/servers/slapd/auth.c
74ca47
@@ -366,7 +366,7 @@ handle_bad_certificate (void* clientData, PRFileDesc *prfd)
74ca47
     char* subject = subject_of (clientCert);
74ca47
     char* issuer  = issuer_of  (clientCert);
74ca47
     slapi_log_access( LDAP_DEBUG_STATS,
74ca47
-	       "conn=%" NSPRIu64 " " SLAPI_COMPONENT_NAME_NSPR " error %i (%s); unauthenticated client %s; issuer %s\n",
74ca47
+	       "conn=%" PRIu64 " " SLAPI_COMPONENT_NAME_NSPR " error %i (%s); unauthenticated client %s; issuer %s\n",
74ca47
 	       conn->c_connid, errorCode, slapd_pr_strerror(errorCode),
74ca47
 	       subject ? escape_string( subject, sbuf ) : "NULL",
74ca47
 	       issuer  ? escape_string( issuer,  ibuf ) : "NULL" );
74ca47
@@ -402,7 +402,7 @@ handle_handshake_done (PRFileDesc *prfd, void* clientData)
74ca47
 	if ( (slapd_ssl_getChannelInfo (prfd, &channelInfo, sizeof(channelInfo))) != SECSuccess ) {
74ca47
 		PRErrorCode errorCode = PR_GetError();
74ca47
 		slapi_log_access (LDAP_DEBUG_STATS,
74ca47
-			"conn=%" NSPRIu64 " SSL failed to obtain channel info; "
74ca47
+			"conn=%" PRIu64 " SSL failed to obtain channel info; "
74ca47
 			SLAPI_COMPONENT_NAME_NSPR " error %i (%s)\n",
74ca47
 			conn->c_connid, errorCode, slapd_pr_strerror(errorCode));
74ca47
 		goto done;
74ca47
@@ -411,7 +411,7 @@ handle_handshake_done (PRFileDesc *prfd, void* clientData)
74ca47
 			!= SECSuccess) {
74ca47
 		PRErrorCode errorCode = PR_GetError();
74ca47
 		slapi_log_access (LDAP_DEBUG_STATS,
74ca47
-			"conn=%" NSPRIu64 " SSL failed to obtain cipher info; "
74ca47
+			"conn=%" PRIu64 " SSL failed to obtain cipher info; "
74ca47
 			SLAPI_COMPONENT_NAME_NSPR " error %i (%s)\n",
74ca47
 			conn->c_connid, errorCode, slapd_pr_strerror(errorCode));
74ca47
 		goto done;
74ca47
@@ -432,14 +432,14 @@ handle_handshake_done (PRFileDesc *prfd, void* clientData)
74ca47
 
74ca47
     if (config_get_SSLclientAuth() == SLAPD_SSLCLIENTAUTH_OFF ) {
74ca47
         (void) slapi_getSSLVersion_str(channelInfo.protocolVersion, sslversion, sizeof(sslversion));
74ca47
-        slapi_log_access (LDAP_DEBUG_STATS, "conn=%" NSPRIu64 " %s %i-bit %s\n",
74ca47
+        slapi_log_access (LDAP_DEBUG_STATS, "conn=%" PRIu64 " %s %i-bit %s\n",
74ca47
                 conn->c_connid, 
74ca47
                 sslversion, keySize, cipher ? cipher : "NULL" );
74ca47
         goto done;
74ca47
     }
74ca47
     if (clientCert == NULL) {
74ca47
         (void) slapi_getSSLVersion_str(channelInfo.protocolVersion, sslversion, sizeof(sslversion));
74ca47
-        slapi_log_access (LDAP_DEBUG_STATS, "conn=%" NSPRIu64 " %s %i-bit %s\n",
74ca47
+        slapi_log_access (LDAP_DEBUG_STATS, "conn=%" PRIu64 " %s %i-bit %s\n",
74ca47
                 conn->c_connid, 
74ca47
                 sslversion, keySize, cipher ? cipher : "NULL" );
74ca47
     } else {
74ca47
@@ -448,7 +448,7 @@ handle_handshake_done (PRFileDesc *prfd, void* clientData)
74ca47
             (void) slapi_getSSLVersion_str(channelInfo.protocolVersion,
74ca47
                                                  sslversion, sizeof(sslversion));
74ca47
             slapi_log_access( LDAP_DEBUG_STATS,
74ca47
-                       "conn=%" NSPRIu64 " %s %i-bit %s; missing subject\n",
74ca47
+                       "conn=%" PRIu64 " %s %i-bit %s; missing subject\n",
74ca47
                        conn->c_connid, 
74ca47
                        sslversion, keySize, cipher ? cipher : "NULL");
74ca47
             goto done;
74ca47
@@ -459,7 +459,7 @@ handle_handshake_done (PRFileDesc *prfd, void* clientData)
74ca47
             (void) slapi_getSSLVersion_str(channelInfo.protocolVersion,
74ca47
                                                  sslversion, sizeof(sslversion));
74ca47
             slapi_log_access( LDAP_DEBUG_STATS,
74ca47
-                        "conn=%" NSPRIu64 " %s %i-bit %s; client %s; issuer %s\n",
74ca47
+                        "conn=%" PRIu64 " %s %i-bit %s; client %s; issuer %s\n",
74ca47
                         conn->c_connid,
74ca47
                         sslversion, keySize, cipher ? cipher : "NULL",
74ca47
                         subject ? escape_string( subject, sbuf ) : "NULL",
74ca47
@@ -503,14 +503,14 @@ handle_handshake_done (PRFileDesc *prfd, void* clientData)
74ca47
         (void) slapi_getSSLVersion_str(channelInfo.protocolVersion,
74ca47
                                              sslversion, sizeof(sslversion));
74ca47
         slapi_log_access (LDAP_DEBUG_STATS, 
74ca47
-                          "conn=%" NSPRIu64 " %s client bound as %s\n",
74ca47
+                          "conn=%" PRIu64 " %s client bound as %s\n",
74ca47
                           conn->c_connid,
74ca47
                           sslversion, clientDN);
74ca47
     } else if (clientCert != NULL) {
74ca47
         (void) slapi_getSSLVersion_str(channelInfo.protocolVersion,
74ca47
                                              sslversion, sizeof(sslversion));
74ca47
         slapi_log_access (LDAP_DEBUG_STATS,
74ca47
-                          "conn=%" NSPRIu64 " %s failed to map client "
74ca47
+                          "conn=%" PRIu64 " %s failed to map client "
74ca47
                           "certificate to LDAP DN (%s)\n",
74ca47
                           conn->c_connid,
74ca47
                           sslversion, extraErrorMsg);
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h
74ca47
index a5fc540..0bb15e3 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h
74ca47
+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h
74ca47
@@ -28,21 +28,8 @@
74ca47
 #endif
74ca47
 #endif
74ca47
 
74ca47
-/* Required to get portable printf/scanf format macros */
74ca47
-#ifdef HAVE_INTTYPES_H
74ca47
-#include <inttypes.h>
74ca47
-
74ca47
-/* NSPR uses the print macros a bit differently than ANSI C.  We
74ca47
- * need to use ll for a 64-bit integer, even when a long is 64-bit.
74ca47
- */
74ca47
-#undef PRIu64
74ca47
-#define PRIu64  "llu"
74ca47
-#undef PRI64
74ca47
-#define PRI64   "ll"
74ca47
-
74ca47
-#else
74ca47
-#error Need to define portable format macros such as PRIu64
74ca47
-#endif /* HAVE_INTTYPES_H */
74ca47
+/* Provides our int types and platform specific requirements. */
74ca47
+#include <slapi_pal.h>
74ca47
 
74ca47
 /* A bunch of random system headers taken from all the source files, no source file should #include
74ca47
    any system headers now */
74ca47
@@ -162,11 +149,11 @@ typedef unsigned short u_int16_t;
74ca47
 #define    DBVERSION_FILENAME    "DBVERSION"
74ca47
 /* 0 here means to let the autotuning reset the value on first run */
74ca47
 /* cache can't get any smaller than this (in bytes) */
74ca47
-#define MINCACHESIZE             (size_t)512000
74ca47
-#define DEFAULT_CACHE_SIZE       (size_t)0
74ca47
+#define MINCACHESIZE             (uint64_t)512000
74ca47
+#define DEFAULT_CACHE_SIZE       (uint64_t)0
74ca47
 #define DEFAULT_CACHE_SIZE_STR   "0"
74ca47
 #define DEFAULT_CACHE_ENTRIES    -1        /* no limit */
74ca47
-#define DEFAULT_DNCACHE_SIZE     (size_t)16777216
74ca47
+#define DEFAULT_DNCACHE_SIZE     (uint64_t)16777216
74ca47
 #define DEFAULT_DNCACHE_SIZE_STR "16777216"
74ca47
 #define DEFAULT_DNCACHE_MAXCOUNT -1        /* no limit */
74ca47
 #define DEFAULT_DBCACHE_SIZE     33554432
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/cache.c b/ldap/servers/slapd/back-ldbm/cache.c
74ca47
index ade2240..0f0cf3b 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/cache.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/cache.c
74ca47
@@ -649,7 +649,7 @@ void cache_set_max_size(struct cache *cache, size_t bytes, int type)
74ca47
     }
74ca47
 }
74ca47
 
74ca47
-static void entrycache_set_max_size(struct cache *cache, size_t bytes)
74ca47
+static void entrycache_set_max_size(struct cache *cache, uint64_t bytes)
74ca47
 {
74ca47
     struct backentry *eflush = NULL;
74ca47
     struct backentry *eflushtemp = NULL;
74ca47
@@ -659,16 +659,17 @@ static void entrycache_set_max_size(struct cache *cache, size_t bytes)
74ca47
          * to happen. In that case, suppress this warning.
74ca47
          */
74ca47
         if (bytes > 0) {
74ca47
-            slapi_log_err(SLAPI_LOG_WARNING, "entrycache_set_max_size", "Minimum cache size is %lu -- rounding up\n", MINCACHESIZE);
74ca47
+            slapi_log_err(SLAPI_LOG_WARNING, "entrycache_set_max_size", "Minimum cache size is %"PRIu64" -- rounding up\n", MINCACHESIZE);
74ca47
         }
74ca47
         bytes = MINCACHESIZE;
74ca47
     }
74ca47
     cache_lock(cache);
74ca47
     cache->c_maxsize = bytes;
74ca47
-    LOG("entry cache size set to %lu\n", bytes);
74ca47
+    LOG("entry cache size set to %"PRIu64"\n", bytes);
74ca47
     /* check for full cache, and clear out if necessary */
74ca47
-    if (CACHE_FULL(cache))
74ca47
+    if (CACHE_FULL(cache)) {
74ca47
        eflush = entrycache_flush(cache);
74ca47
+    }
74ca47
     while (eflush)
74ca47
     {
74ca47
         eflushtemp = BACK_LRU_NEXT(eflush, struct backentry *);
74ca47
@@ -686,12 +687,11 @@ static void entrycache_set_max_size(struct cache *cache, size_t bytes)
74ca47
     /* This may already have been called by one of the functions in
74ca47
      * ldbm_instance_config
74ca47
      */
74ca47
-    if (! util_is_cachesize_sane(&bytes)) {
74ca47
-       slapi_log_err(SLAPI_LOG_WARNING,
74ca47
-                "entrycache_set_max_size", "Possible CONFIGURATION ERROR -- cachesize "
74ca47
-                "(%lu) may be configured to use more than the available "
74ca47
-                "physical memory.\n", bytes);
74ca47
+    slapi_pal_meminfo *mi = spal_meminfo_get();
74ca47
+    if (util_is_cachesize_sane(mi, &bytes) != UTIL_CACHESIZE_VALID) {
74ca47
+       slapi_log_err(SLAPI_LOG_WARNING, "entrycache_set_max_size", "Cachesize (%"PRIu64") may use more than the available physical memory.\n", bytes);
74ca47
     }
74ca47
+    spal_meminfo_destroy(mi);
74ca47
 }
74ca47
 
74ca47
 void cache_set_max_entries(struct cache *cache, long entries)
74ca47
@@ -1597,7 +1597,7 @@ dn_same_id(const void *bdn, const void *k)
74ca47
 }
74ca47
 
74ca47
 static void
74ca47
-dncache_set_max_size(struct cache *cache, size_t bytes)
74ca47
+dncache_set_max_size(struct cache *cache, uint64_t bytes)
74ca47
 {
74ca47
     struct backdn *dnflush = NULL;
74ca47
     struct backdn *dnflushtemp = NULL;
74ca47
@@ -1609,12 +1609,12 @@ dncache_set_max_size(struct cache *cache, size_t bytes)
74ca47
     if (bytes < MINCACHESIZE) {
74ca47
        bytes = MINCACHESIZE;
74ca47
        slapi_log_err(SLAPI_LOG_WARNING,
74ca47
-                "dncache_set_max_size", "Minimum cache size is %lu -- rounding up\n",
74ca47
+                "dncache_set_max_size", "Minimum cache size is %"PRIu64" -- rounding up\n",
74ca47
                 MINCACHESIZE);
74ca47
     }
74ca47
     cache_lock(cache);
74ca47
     cache->c_maxsize = bytes;
74ca47
-    LOG("entry cache size set to %lu\n", bytes);
74ca47
+    LOG("entry cache size set to %"PRIu64"\n", bytes);
74ca47
     /* check for full cache, and clear out if necessary */
74ca47
     if (CACHE_FULL(cache)) {
74ca47
        dnflush = dncache_flush(cache);
74ca47
@@ -1636,12 +1636,12 @@ dncache_set_max_size(struct cache *cache, size_t bytes)
74ca47
     /* This may already have been called by one of the functions in
74ca47
      * ldbm_instance_config
74ca47
      */
74ca47
-    if (! util_is_cachesize_sane(&bytes)) {
74ca47
-       slapi_log_err(SLAPI_LOG_WARNING,
74ca47
-                "dncache_set_max_size", "Possible CONFIGURATION ERROR -- cachesize "
74ca47
-                "(%lu) may be configured to use more than the available "
74ca47
-                "physical memory.\n", bytes);
74ca47
+
74ca47
+    slapi_pal_meminfo *mi = spal_meminfo_get();
74ca47
+    if (util_is_cachesize_sane(mi, &bytes) != UTIL_CACHESIZE_VALID) {
74ca47
+       slapi_log_err(SLAPI_LOG_WARNING, "dncache_set_max_size", "Cachesize (%"PRIu64") may use more than the available physical memory.\n", bytes);
74ca47
     }
74ca47
+    spal_meminfo_destroy(mi);
74ca47
 }
74ca47
 
74ca47
 /* remove a dn from the cache */
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
74ca47
index 507a3cc..3c1fbb0 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
74ca47
@@ -1386,14 +1386,16 @@ dblayer_start(struct ldbminfo *li, int dbmode)
74ca47
 
74ca47
     /* Sanity check on cache size on platforms which allow us to figure out
74ca47
      * the available phys mem */
74ca47
-    if (!util_is_cachesize_sane(&(priv->dblayer_cachesize))) {
74ca47
+    slapi_pal_meminfo *mi = spal_meminfo_get();
74ca47
+    if (!util_is_cachesize_sane(mi, &(priv->dblayer_cachesize))) {
74ca47
         /* Oops---looks like the admin misconfigured, let's warn them */
74ca47
         slapi_log_err(SLAPI_LOG_WARNING,"dblayer_start", "Likely CONFIGURATION ERROR -"
74ca47
                   "dbcachesize is configured to use more than the available "
74ca47
-                  "physical memory, decreased to the largest available size (%lu bytes).\n",
74ca47
+                  "physical memory, decreased to the largest available size (%"PRIu64" bytes).\n",
74ca47
                   priv->dblayer_cachesize);
74ca47
         li->li_dbcachesize = priv->dblayer_cachesize;
74ca47
     }
74ca47
+    spal_meminfo_destroy(mi);
74ca47
 
74ca47
     /* fill in DB_ENV stuff from the common configuration */
74ca47
     return_value = dblayer_make_env(&pEnv, li);
74ca47
@@ -1690,9 +1692,6 @@ dblayer_start(struct ldbminfo *li, int dbmode)
74ca47
  *    nsslapd-import-cache-autosize: 0
74ca47
  * get the nsslapd-import-cachesize.
74ca47
  * Calculate the memory size left after allocating the import cache size.
74ca47
- * If the size is less than the hard limit, it issues an error and quit.
74ca47
- * If the size is greater than the hard limit and less than the soft limit,
74ca47
- * it issues a warning, but continues the import task.
74ca47
  *
74ca47
  * Note: this function is called only if the import is executed as a stand
74ca47
  * alone command line (ldif2db).
74ca47
@@ -1700,27 +1699,17 @@ dblayer_start(struct ldbminfo *li, int dbmode)
74ca47
 int
74ca47
 check_and_set_import_cache(struct ldbminfo *li)
74ca47
 {
74ca47
-    size_t import_pages = 0;
74ca47
-    size_t pagesize, pages, procpages, availpages;
74ca47
-    size_t soft_limit = 0;
74ca47
-    size_t hard_limit = 0;
74ca47
-    size_t page_delta = 0;
74ca47
+    uint64_t import_cache = 0;
74ca47
     char s[64];   /* big enough to hold %ld */
74ca47
+    /* Get our platform memory values. */
74ca47
+    slapi_pal_meminfo *mi = spal_meminfo_get();
74ca47
 
74ca47
-    if (util_info_sys_pages(&pagesize, &pages, &procpages, &availpages) != 0 || 0 == pagesize || 0 == pages) {
74ca47
-        slapi_log_err(SLAPI_LOG_ERR, "check_and_set_import_cache",
74ca47
-                       "Failed to get pagesize: %ld or pages: %ld\n",
74ca47
-                       pagesize, pages);
74ca47
+    if (mi == NULL) {
74ca47
+        slapi_log_err(SLAPI_LOG_ERR, "check_and_set_import_cache", "Failed to get system memory infomation\n");
74ca47
         return ENOENT;
74ca47
     }
74ca47
-    slapi_log_err(SLAPI_LOG_INFO, "check_and_set_import_cache",
74ca47
-                  "pagesize: %ld, pages: %ld, procpages: %ld\n",
74ca47
-                  pagesize, pages, procpages);
74ca47
+    slapi_log_err(SLAPI_LOG_INFO, "check_and_set_import_cache", "pagesize: %"PRIu64", available bytes %"PRIu64", process usage %"PRIu64" \n", mi->pagesize_bytes, mi->system_available_bytes, mi->process_consumed_bytes);
74ca47
 
74ca47
-    /* Soft limit: pages equivalent to 1GB (defined in dblayer.h) */
74ca47
-    soft_limit = (DBLAYER_IMPORTCACHESIZE_SL*1024) / (pagesize/1024);
74ca47
-    /* Hard limit: pages equivalent to 100MB (defined in dblayer.h) */
74ca47
-    hard_limit = (DBLAYER_IMPORTCACHESIZE_HL*1024) / (pagesize/1024);
74ca47
     /*
74ca47
      * default behavior for ldif2db import cache,
74ca47
      * nsslapd-import-cache-autosize==-1,
74ca47
@@ -1741,48 +1730,29 @@ check_and_set_import_cache(struct ldbminfo *li)
74ca47
 
74ca47
     if (li->li_import_cache_autosize == 0) {
74ca47
         /* user specified importCache */
74ca47
-        import_pages = li->li_import_cachesize / pagesize;
74ca47
+        import_cache = li->li_import_cachesize;
74ca47
 
74ca47
     } else {
74ca47
         /* autosizing importCache */
74ca47
         /* ./125 instead of ./100 is for adjusting the BDB overhead. */
74ca47
-#ifdef LINUX
74ca47
-        /* On linux, availpages is correct so we should use it! */
74ca47
-        import_pages = (li->li_import_cache_autosize * availpages) / 125;
74ca47
-#else
74ca47
-        import_pages = (li->li_import_cache_autosize * pages) / 125;
74ca47
-#endif
74ca47
+        import_cache = (li->li_import_cache_autosize * mi->system_available_bytes) / 125;
74ca47
     }
74ca47
 
74ca47
-    page_delta = pages - import_pages;
74ca47
-    if (page_delta < hard_limit) {
74ca47
-        slapi_log_err(SLAPI_LOG_ERR, 
74ca47
-            "check_and_set_import_cache", "After allocating import cache %ldKB, "
74ca47
-            "the available memory is %ldKB, "
74ca47
-            "which is less than the hard limit %ldKB. "
74ca47
-            "Please decrease the import cache size and rerun import.\n",
74ca47
-            import_pages*(pagesize/1024), page_delta*(pagesize/1024),
74ca47
-            hard_limit*(pagesize/1024));
74ca47
+    if (util_is_cachesize_sane(mi, &import_cache) == UTIL_CACHESIZE_ERROR) {
74ca47
+
74ca47
+        slapi_log_err(SLAPI_LOG_INFO, "check_and_set_import_cache", "Import failed to run: unable to validate system memory limits.\n");
74ca47
+        spal_meminfo_destroy(mi);
74ca47
         return ENOMEM;
74ca47
     }
74ca47
-    if (page_delta < soft_limit) {
74ca47
-        slapi_log_err(SLAPI_LOG_WARNING, 
74ca47
-            "check_and_set_import_cache", "After allocating import cache %ldKB, "
74ca47
-            "the available memory is %ldKB, "
74ca47
-            "which is less than the soft limit %ldKB. "
74ca47
-            "You may want to decrease the import cache size and "
74ca47
-            "rerun import.\n",
74ca47
-            import_pages*(pagesize/1024), page_delta*(pagesize/1024),
74ca47
-            soft_limit*(pagesize/1024));
74ca47
-    }
74ca47
 
74ca47
-    slapi_log_err(SLAPI_LOG_INFO, "check_and_set_import_cache", "Import allocates %ldKB import cache.\n", 
74ca47
-                  import_pages*(pagesize/1024));
74ca47
-    if (li->li_import_cache_autosize > 0) { /* import cache autosizing */
74ca47
+    slapi_log_err(SLAPI_LOG_INFO, "check_and_set_import_cache", "Import allocates %"PRIu64"KB import cache.\n", import_cache / 1024);
74ca47
+    if (li->li_import_cache_autosize > 0) {
74ca47
+        /* import cache autosizing */
74ca47
         /* set the calculated import cache size to the config */
74ca47
-        sprintf(s, "%lu", (unsigned long)(import_pages * pagesize));
74ca47
+        sprintf(s, "%"PRIu64, import_cache);
74ca47
         ldbm_config_internal_set(li, CONFIG_IMPORT_CACHESIZE, s);
74ca47
     }
74ca47
+    spal_meminfo_destroy(mi);
74ca47
     return 0;
74ca47
 }
74ca47
 
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.h b/ldap/servers/slapd/back-ldbm/dblayer.h
74ca47
index e4307fc..816c943 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/dblayer.h
74ca47
+++ b/ldap/servers/slapd/back-ldbm/dblayer.h
74ca47
@@ -68,14 +68,6 @@
74ca47
 #define	DB_REGION_NAME	25		/* DB: named regions, no backing file. */
74ca47
 #endif
74ca47
 
74ca47
-/* Used in check_and_set_import_cache */
74ca47
-/* After allocating the import cache, free memory must be left more than
74ca47
- * the hard limit to run import. */
74ca47
-/* If the free memory size left is greater than hard limit and less than
74ca47
- * soft limit, the import utility issues a warning, but it runs */
74ca47
-#define DBLAYER_IMPORTCACHESIZE_HL 100  /* import cache hard limit 100MB */
74ca47
-#define DBLAYER_IMPORTCACHESIZE_SL 1024 /* import cache soft limit 1GB */
74ca47
-
74ca47
 struct dblayer_private_env {
74ca47
 	DB_ENV	*dblayer_DB_ENV;
74ca47
 	Slapi_RWLock * dblayer_env_lock;
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c
74ca47
index 087103b..ab32e0a 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/import-threads.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/import-threads.c
74ca47
@@ -3979,7 +3979,7 @@ _get_import_entryusn(ImportJob *job, Slapi_Value **usn_value)
74ca47
              * Use the counter which stores the old DB's
74ca47
              * next entryusn. */
74ca47
             PR_snprintf(counter_buf, sizeof(counter_buf),
74ca47
-                    "%" NSPRIu64, slapi_counter_get_value(be->be_usn_counter));
74ca47
+                    "%" PRIu64, slapi_counter_get_value(be->be_usn_counter));
74ca47
         } else {
74ca47
             /* import_init value is digit.
74ca47
              * Initialize the entryusn values with the digit */
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/import.c b/ldap/servers/slapd/back-ldbm/import.c
74ca47
index d0cef1a..7161bac 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/import.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/import.c
74ca47
@@ -84,17 +84,19 @@ static int import_fifo_init(ImportJob *job)
74ca47
 int import_fifo_validate_capacity_or_expand(ImportJob *job, size_t entrysize) {
74ca47
     int result = 1;
74ca47
     /* We shoot for four times as much to start with. */
74ca47
-    size_t request = entrysize * 4;
74ca47
-    int sane = 0;
74ca47
+    uint64_t request = entrysize * 4;
74ca47
+    util_cachesize_result sane;
74ca47
 
74ca47
     if (entrysize > job->fifo.bsize) {
74ca47
         /* Check the amount of memory on the system */
74ca47
-        sane = util_is_cachesize_sane(&request);
74ca47
-        if (!sane && entrysize <= request) {
74ca47
+        slapi_pal_meminfo *mi = spal_meminfo_get();
74ca47
+        sane = util_is_cachesize_sane(mi, &request);
74ca47
+        spal_meminfo_destroy(mi);
74ca47
+        if (sane == UTIL_CACHESIZE_REDUCED && entrysize <= request) {
74ca47
             /* Did the amount cachesize set still exceed entrysize? It'll do ... */
74ca47
             job->fifo.bsize = request;
74ca47
             result = 0;
74ca47
-        } else if (!sane) {
74ca47
+        } else if (sane != UTIL_CACHESIZE_VALID) {
74ca47
             /* Can't allocate! No!!! */
74ca47
             result = 1;
74ca47
         } else {
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
74ca47
index dfe7a13..d5120d3 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
74ca47
@@ -403,8 +403,8 @@ static int ldbm_config_dbcachesize_set(void *arg, void *value, char *errorbuf, i
74ca47
 {
74ca47
     struct ldbminfo *li = (struct ldbminfo *) arg;
74ca47
     int retval = LDAP_SUCCESS;
74ca47
-    size_t val = (size_t)value;
74ca47
-    size_t delta = (size_t)value;
74ca47
+    uint64_t val = (size_t)value;
74ca47
+    uint64_t delta = (size_t)value;
74ca47
 
74ca47
     /* There is an error here. We check the new val against our current mem-alloc 
74ca47
      * Issue is that we already are using system pages, so while our value *might*
74ca47
@@ -430,7 +430,13 @@ static int ldbm_config_dbcachesize_set(void *arg, void *value, char *errorbuf, i
74ca47
             val = DBDEFMINSIZ;
74ca47
         } else if (val > li->li_dbcachesize) {
74ca47
             delta = val - li->li_dbcachesize;
74ca47
-            if (!util_is_cachesize_sane(&delta)){
74ca47
+
74ca47
+            util_cachesize_result sane;
74ca47
+            slapi_pal_meminfo *mi = spal_meminfo_get();
74ca47
+            sane = util_is_cachesize_sane(mi, &delta);
74ca47
+            spal_meminfo_destroy(mi);
74ca47
+
74ca47
+            if (sane != UTIL_CACHESIZE_VALID){
74ca47
                 slapi_create_errormsg(errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "Error: nsslapd-dbcachesize value is too large.");
74ca47
                 slapi_log_err(SLAPI_LOG_ERR, "ldbm_config_dbcachesize_set",
74ca47
                         "nsslapd-dbcachesize value is too large.\n");
74ca47
@@ -1086,7 +1092,7 @@ static int ldbm_config_db_cache_set(void *arg, void *value, char *errorbuf, int
74ca47
     struct ldbminfo *li = (struct ldbminfo *) arg;
74ca47
     int retval = LDAP_SUCCESS;
74ca47
     int val = ((uintptr_t)value);
74ca47
-    size_t delta = 0;
74ca47
+    uint64_t delta = 0;
74ca47
 
74ca47
     /* There is an error here. We check the new val against our current mem-alloc 
74ca47
      * Issue is that we already are using system pages, so while our value *might*
74ca47
@@ -1101,7 +1107,13 @@ static int ldbm_config_db_cache_set(void *arg, void *value, char *errorbuf, int
74ca47
     if (apply) {
74ca47
         if (val > li->li_dblayer_private->dblayer_cache_config) {
74ca47
             delta = val - li->li_dblayer_private->dblayer_cache_config;
74ca47
-            if (!util_is_cachesize_sane(&delta)){
74ca47
+            util_cachesize_result sane;
74ca47
+
74ca47
+            slapi_pal_meminfo *mi = spal_meminfo_get();
74ca47
+            sane = util_is_cachesize_sane(mi, &delta);
74ca47
+            spal_meminfo_destroy(mi);
74ca47
+
74ca47
+            if (sane != UTIL_CACHESIZE_VALID){
74ca47
                 slapi_create_errormsg(errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "Error: db cachesize value is too large");
74ca47
                 slapi_log_err(SLAPI_LOG_ERR,"ldbm_config_db_cache_set", "db cachesize value is too large.\n");
74ca47
                 return LDAP_UNWILLING_TO_PERFORM;
74ca47
@@ -1219,7 +1231,7 @@ static int ldbm_config_import_cachesize_set(void *arg, void *value, char *errorb
74ca47
 {
74ca47
     struct ldbminfo *li = (struct ldbminfo *)arg;
74ca47
     size_t val = (size_t)value;
74ca47
-    size_t delta = (size_t)value;
74ca47
+    uint64_t delta = (size_t)value;
74ca47
     /* There is an error here. We check the new val against our current mem-alloc 
74ca47
      * Issue is that we already are using system pages, so while our value *might*
74ca47
      * be valid, we may reject it here due to the current procs page usage.
74ca47
@@ -1232,7 +1244,13 @@ static int ldbm_config_import_cachesize_set(void *arg, void *value, char *errorb
74ca47
     if (apply){
74ca47
         if (val > li->li_import_cachesize) {
74ca47
             delta = val - li->li_import_cachesize;
74ca47
-            if (!util_is_cachesize_sane(&delta)){
74ca47
+
74ca47
+            util_cachesize_result sane;
74ca47
+            slapi_pal_meminfo *mi = spal_meminfo_get();
74ca47
+            sane = util_is_cachesize_sane(mi, &delta);
74ca47
+            spal_meminfo_destroy(mi);
74ca47
+
74ca47
+            if (sane != UTIL_CACHESIZE_VALID){
74ca47
                 slapi_create_errormsg(errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "Error: import cachesize value is too large.");
74ca47
                 slapi_log_err(SLAPI_LOG_ERR,"ldbm_config_import_cachesize_set",
74ca47
                         "Import cachesize value is too large.\n");
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
74ca47
index 92d982e..0b0b37e 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
74ca47
@@ -107,7 +107,7 @@ ldbm_back_delete( Slapi_PBlock *pb )
74ca47
 
74ca47
 	if (pb->pb_conn)
74ca47
 	{
74ca47
-		slapi_log_err(SLAPI_LOG_TRACE, "ldbm_back_delete", "Enter conn=%" NSPRIu64 " op=%d\n",
74ca47
+		slapi_log_err(SLAPI_LOG_TRACE, "ldbm_back_delete", "Enter conn=%" PRIu64 " op=%d\n",
74ca47
 				pb->pb_conn->c_connid, operation->o_opid);
74ca47
 	}
74ca47
 
74ca47
@@ -1493,7 +1493,7 @@ diskfull_return:
74ca47
 	slapi_sdn_done(&parentsdn);
74ca47
 	if (pb->pb_conn)
74ca47
 	{
74ca47
-		slapi_log_err(SLAPI_LOG_TRACE, "ldbm_back_delete", "leave conn=%" NSPRIu64 " op=%d\n",
74ca47
+		slapi_log_err(SLAPI_LOG_TRACE, "ldbm_back_delete", "leave conn=%" PRIu64 " op=%d\n",
74ca47
 				pb->pb_conn->c_connid, operation->o_opid);
74ca47
 	}
74ca47
 
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
74ca47
index e03954d..62cdbc3 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
74ca47
@@ -92,7 +92,7 @@ ldbm_instance_config_cachememsize_set(void *arg, void *value, char *errorbuf, in
74ca47
     ldbm_instance *inst = (ldbm_instance *) arg;
74ca47
     int retval = LDAP_SUCCESS;
74ca47
     size_t val = (size_t) value;
74ca47
-    size_t delta = 0;
74ca47
+    uint64_t delta = 0;
74ca47
 
74ca47
     /* Do whatever we can to make sure the data is ok. */
74ca47
     /* There is an error here. We check the new val against our current mem-alloc 
74ca47
@@ -108,7 +108,13 @@ ldbm_instance_config_cachememsize_set(void *arg, void *value, char *errorbuf, in
74ca47
     if (apply) {
74ca47
         if (val > inst->inst_cache.c_maxsize) {
74ca47
             delta = val - inst->inst_cache.c_maxsize;
74ca47
-            if (!util_is_cachesize_sane(&delta)){
74ca47
+
74ca47
+            util_cachesize_result sane;
74ca47
+            slapi_pal_meminfo *mi = spal_meminfo_get();
74ca47
+            sane = util_is_cachesize_sane(mi, &delta);
74ca47
+            spal_meminfo_destroy(mi);
74ca47
+
74ca47
+            if (sane != UTIL_CACHESIZE_VALID){
74ca47
                 slapi_create_errormsg(errorbuf, SLAPI_DSE_RETURNTEXT_SIZE, "Error: cachememsize value is too large.");
74ca47
                 slapi_log_err(SLAPI_LOG_ERR, "ldbm_instance_config_cachememsize_set", "cachememsize value is too large.\n");
74ca47
                 return LDAP_UNWILLING_TO_PERFORM;
74ca47
@@ -134,7 +140,7 @@ ldbm_instance_config_dncachememsize_set(void *arg, void *value, char *errorbuf,
74ca47
     ldbm_instance *inst = (ldbm_instance *) arg;
74ca47
     int retval = LDAP_SUCCESS;
74ca47
     size_t val = (size_t)value;
74ca47
-    size_t delta = 0;
74ca47
+    uint64_t delta = 0;
74ca47
 
74ca47
     /* Do whatever we can to make sure the data is ok. */
74ca47
     /* There is an error here. We check the new val against our current mem-alloc 
74ca47
@@ -150,7 +156,13 @@ ldbm_instance_config_dncachememsize_set(void *arg, void *value, char *errorbuf,
74ca47
     if (apply) {
74ca47
         if (val > inst->inst_dncache.c_maxsize) {
74ca47
             delta = val - inst->inst_dncache.c_maxsize;
74ca47
-            if (!util_is_cachesize_sane(&delta)){
74ca47
+
74ca47
+            util_cachesize_result sane;
74ca47
+            slapi_pal_meminfo *mi = spal_meminfo_get();
74ca47
+            sane = util_is_cachesize_sane(mi, &delta);
74ca47
+            spal_meminfo_destroy(mi);
74ca47
+
74ca47
+            if (sane != UTIL_CACHESIZE_VALID){
74ca47
                 slapi_create_errormsg(errorbuf, SLAPI_DSE_RETURNTEXT_SIZE,
74ca47
                     "Error: dncachememsize value is too large.");
74ca47
                 slapi_log_err(SLAPI_LOG_ERR,"ldbm_instance_config_dncachememsize_set",
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
74ca47
index a78d850..533273b 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
74ca47
@@ -142,7 +142,7 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
74ca47
 
74ca47
     if (pb->pb_conn)
74ca47
     {
74ca47
-        slapi_log_err(SLAPI_LOG_TRACE, "ldbm_back_modrdn", "enter conn=%" NSPRIu64 " op=%d\n",
74ca47
+        slapi_log_err(SLAPI_LOG_TRACE, "ldbm_back_modrdn", "enter conn=%" PRIu64 " op=%d\n",
74ca47
                 pb->pb_conn->c_connid, operation->o_opid);
74ca47
     }
74ca47
 
74ca47
@@ -1539,7 +1539,7 @@ common_return:
74ca47
     if (pb->pb_conn)
74ca47
     {
74ca47
         slapi_log_err(SLAPI_LOG_TRACE, "ldbm_back_modrdn",
74ca47
-                "leave conn=%" NSPRIu64 " op=%d\n",
74ca47
+                "leave conn=%" PRIu64 " op=%d\n",
74ca47
                 pb->pb_conn->c_connid, operation->o_opid);
74ca47
     }
74ca47
     return retval;
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c
74ca47
index a6c3b74..cfb0d6b 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/ldbm_search.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c
74ca47
@@ -407,7 +407,7 @@ ldbm_back_search( Slapi_PBlock *pb )
74ca47
                     slapi_pblock_get(pb, SLAPI_OPERATION_ID, &op_id);
74ca47
 
74ca47
                     slapi_log_err(SLAPI_LOG_WARNING,
74ca47
-                            "ldbm_back_search", "Sort control ignored for conn=%" NSPRIu64 " op=%d\n",
74ca47
+                            "ldbm_back_search", "Sort control ignored for conn=%" PRIu64 " op=%d\n",
74ca47
                             conn_id, op_id);                    
74ca47
                 }
74ca47
             } else {
74ca47
@@ -442,7 +442,7 @@ ldbm_back_search( Slapi_PBlock *pb )
74ca47
                         slapi_pblock_get(pb, SLAPI_OPERATION_ID, &op_id);
74ca47
 
74ca47
                         slapi_log_err(SLAPI_LOG_WARNING,
74ca47
-                                "ldbm_back_search", "VLV control ignored for conn=%" NSPRIu64 " op=%d\n",
74ca47
+                                "ldbm_back_search", "VLV control ignored for conn=%" PRIu64 " op=%d\n",
74ca47
                                 conn_id, op_id);             
74ca47
                     }
74ca47
 
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/misc.c b/ldap/servers/slapd/back-ldbm/misc.c
74ca47
index 5268087..7192b3a 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/misc.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/misc.c
74ca47
@@ -54,7 +54,7 @@ void ldbm_log_access_message(Slapi_PBlock *pblock,char *string)
74ca47
         return;
74ca47
     }
74ca47
     operation_id = operation->o_opid;
74ca47
-    slapi_log_access(LDAP_DEBUG_STATS, "conn=%" NSPRIu64 " op=%d %s\n",
74ca47
+    slapi_log_access(LDAP_DEBUG_STATS, "conn=%" PRIu64 " op=%d %s\n",
74ca47
                      connection_id, operation_id, string);
74ca47
 }
74ca47
 
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/monitor.c b/ldap/servers/slapd/back-ldbm/monitor.c
74ca47
index 757792b..c58b069 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/monitor.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/monitor.c
74ca47
@@ -101,9 +101,9 @@ int ldbm_back_monitor_instance_search(Slapi_PBlock *pb, Slapi_Entry *e,
74ca47
         /* fetch cache statistics */
74ca47
         cache_get_stats(&(inst->inst_dncache), &hits, &tries, 
74ca47
                         &nentries, &maxentries, &size, &maxsize);
74ca47
-        sprintf(buf, "%" NSPRIu64, hits);
74ca47
+        sprintf(buf, "%" PRIu64, hits);
74ca47
         MSET("dnCacheHits");
74ca47
-        sprintf(buf, "%" NSPRIu64, tries);
74ca47
+        sprintf(buf, "%" PRIu64, tries);
74ca47
         MSET("dnCacheTries");
74ca47
         sprintf(buf, "%lu", (unsigned long)(100.0*(double)hits / (double)(tries > 0 ? tries : 1)));
74ca47
         MSET("dnCacheHitRatio");
74ca47
@@ -119,11 +119,11 @@ int ldbm_back_monitor_instance_search(Slapi_PBlock *pb, Slapi_Entry *e,
74ca47
     /* normalized dn cache stats */
74ca47
     if(ndn_cache_started()){
74ca47
         ndn_cache_get_stats(&hits, &tries, &size, &maxsize, &count);
74ca47
-        sprintf(buf, "%" NSPRIu64, tries);
74ca47
+        sprintf(buf, "%" PRIu64, tries);
74ca47
         MSET("normalizedDnCacheTries");
74ca47
-        sprintf(buf, "%" NSPRIu64, hits);
74ca47
+        sprintf(buf, "%" PRIu64, hits);
74ca47
         MSET("normalizedDnCacheHits");
74ca47
-        sprintf(buf, "%" NSPRIu64, (tries - hits));
74ca47
+        sprintf(buf, "%" PRIu64, (tries - hits));
74ca47
         MSET("normalizedDnCacheMisses");
74ca47
         sprintf(buf, "%lu", (unsigned long)(100.0*(double)hits / (double)(tries > 0 ? tries : 1)));
74ca47
         MSET("normalizedDnCacheHitRatio");
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/perfctrs.h b/ldap/servers/slapd/back-ldbm/perfctrs.h
74ca47
index 57be1d1..64c79e1 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/perfctrs.h
74ca47
+++ b/ldap/servers/slapd/back-ldbm/perfctrs.h
74ca47
@@ -11,7 +11,7 @@
74ca47
 #  include <config.h>
74ca47
 #endif
74ca47
 
74ca47
-#include <inttypes.h>
74ca47
+#include <slapi_pal.h>
74ca47
 
74ca47
 /* Structure definition for performance data */
74ca47
 /* This stuff goes in shared memory, so make sure the packing is consistent */
74ca47
diff --git a/ldap/servers/slapd/back-ldbm/start.c b/ldap/servers/slapd/back-ldbm/start.c
74ca47
index 1ae9858..a207bd8 100644
74ca47
--- a/ldap/servers/slapd/back-ldbm/start.c
74ca47
+++ b/ldap/servers/slapd/back-ldbm/start.c
74ca47
@@ -32,34 +32,25 @@ ldbm_back_start_autotune(struct ldbminfo *li) {
74ca47
     Object *inst_obj = NULL;
74ca47
     ldbm_instance *inst = NULL;
74ca47
     /* size_t is a platform unsigned int, IE uint64_t */
74ca47
-    size_t total_cache_size = 0;
74ca47
-    size_t pagesize = 0;
74ca47
-    size_t pages = 0;
74ca47
-    size_t procpages __attribute__((unused)) = 0;
74ca47
-    size_t availpages = 0;
74ca47
-    size_t cache_size_to_configure = 0;
74ca47
-    size_t zone_pages = 0;
74ca47
-    size_t db_pages = 0;
74ca47
-    size_t entry_pages = 0;
74ca47
-    size_t import_pages = 0;
74ca47
-    size_t zone_size = 0;
74ca47
-    size_t import_size = 0;
74ca47
-    size_t cache_size = 0;
74ca47
-    size_t db_size = 0;
74ca47
+    uint64_t total_cache_size = 0;
74ca47
+    uint64_t entry_size = 0;
74ca47
+    uint64_t zone_size = 0;
74ca47
+    uint64_t import_size = 0;
74ca47
+    uint64_t cache_size = 0;
74ca47
+    uint64_t db_size = 0;
74ca47
     /* For clamping the autotune value to a 64Mb boundary */
74ca47
-    size_t clamp_pages = 0;
74ca47
-    size_t clamp_div = 0;
74ca47
-    size_t clamp_mod = 0;
74ca47
+    uint64_t clamp_div = 0;
74ca47
     /* Backend count */
74ca47
-    size_t backend_count = 0;
74ca47
+    uint64_t backend_count = 0;
74ca47
 
74ca47
     int_fast32_t autosize_percentage = 0;
74ca47
     int_fast32_t autosize_db_percentage_split = 0;
74ca47
     int_fast32_t import_percentage = 0;
74ca47
-    int32_t issane = 0;
74ca47
+    util_cachesize_result issane;
74ca47
     char *msg = ""; /* This will be set by one of the two cache sizing paths below. */
74ca47
     char size_to_str[32];    /* big enough to hold %ld */
74ca47
 
74ca47
+
74ca47
     /* == Begin autotune == */
74ca47
 
74ca47
     /*
74ca47
@@ -120,42 +111,34 @@ ldbm_back_start_autotune(struct ldbminfo *li) {
74ca47
         return SLAPI_FAIL_GENERAL;
74ca47
     }
74ca47
 
74ca47
-    if (util_info_sys_pages(&pagesize, &pages, &procpages, &availpages) != 0) {
74ca47
+    /* Get our platform memory values. */
74ca47
+    slapi_pal_meminfo *mi = spal_meminfo_get();
74ca47
+    if (mi == NULL) {
74ca47
         slapi_log_err(SLAPI_LOG_CRIT, "ldbm_back_start", "Unable to determine system page limits\n");
74ca47
         return SLAPI_FAIL_GENERAL;
74ca47
     }
74ca47
 
74ca47
-    if (pagesize == 0) {
74ca47
-        /* If this happens, we are in a very bad state indeed... */
74ca47
-        slapi_log_err(SLAPI_LOG_CRIT, "ldbm_back_start", "Unable to determine system page size\n");
74ca47
-        return SLAPI_FAIL_GENERAL;
74ca47
-    }
74ca47
-
74ca47
     /* calculate the needed values */
74ca47
-    zone_pages = (autosize_percentage * pages) / 100;
74ca47
-    zone_size = zone_pages * pagesize;
74ca47
+    zone_size = (autosize_percentage * mi->system_total_bytes) / 100;
74ca47
     /* This is how much we "might" use, lets check it's sane. */
74ca47
     /* In the case it is not, this will *reduce* the allocation */
74ca47
-    issane = util_is_cachesize_sane(&zone_size);
74ca47
-    if (!issane) {
74ca47
+    issane = util_is_cachesize_sane(mi, &zone_size);
74ca47
+    if (issane == UTIL_CACHESIZE_REDUCED) {
74ca47
         slapi_log_err(SLAPI_LOG_WARNING, "ldbm_back_start", "Your autosized cache values have been reduced. Likely your nsslapd-cache-autosize percentage is too high.\n");
74ca47
         slapi_log_err(SLAPI_LOG_WARNING, "ldbm_back_start", "%s", msg);
74ca47
     }
74ca47
     /* It's valid, lets divide it up and set according to user prefs */
74ca47
-    zone_pages = zone_size / pagesize;
74ca47
-    db_pages = (autosize_db_percentage_split * zone_pages) / 100;
74ca47
+    db_size = (autosize_db_percentage_split * zone_size) / 100;
74ca47
 
74ca47
     /* Cap the DB size at 512MB, as this doesn't help perf much more (lkrispen's advice) */
74ca47
-    if ((db_pages * pagesize) > (512 * MEGABYTE)) {
74ca47
-        db_pages = (512 * MEGABYTE) / pagesize;
74ca47
+    if (db_size > (512 * MEGABYTE)) {
74ca47
+        db_size = (512 * MEGABYTE);
74ca47
     }
74ca47
 
74ca47
     if (backend_count > 0 ) {
74ca47
         /* Number of entry cache pages per backend. */
74ca47
-        entry_pages = (zone_pages - db_pages) / backend_count;
74ca47
+        entry_size = (zone_size - db_size) / backend_count;
74ca47
         /* Now, clamp this value to a 64mb boundary. */
74ca47
-        /* How many pages are in 64mb? */
74ca47
-        clamp_pages = (64 * MEGABYTE) / pagesize;
74ca47
         /* Now divide the entry pages by this, and also mod. If mod != 0, we need
74ca47
          * to add 1 to the diveded number. This should give us:
74ca47
          * 510 * 1024 * 1024 == 510MB
74ca47
@@ -166,17 +149,15 @@ ldbm_back_start_autotune(struct ldbminfo *li) {
74ca47
          * 130560 % 16384 = 15872 which is != 0
74ca47
          * therfore 7 + 1, aka 8 * 16384 = 131072 pages = 536870912 bytes = 512MB.
74ca47
          */
74ca47
-        clamp_div = entry_pages / clamp_pages;
74ca47
-        clamp_mod = entry_pages % clamp_pages;
74ca47
-        if (clamp_mod != 0) {
74ca47
-            /* If we want to clamp down, remove this line. This would change the above from 510mb -> 448mb. */
74ca47
-            clamp_div += 1;
74ca47
-            entry_pages = clamp_div * clamp_pages;
74ca47
+        if (entry_size % (64 * MEGABYTE) != 0) {
74ca47
+            /* If we want to clamp down, remove the "+1". This would change the above from 510mb -> 448mb. */
74ca47
+            clamp_div = (entry_size / (64 * MEGABYTE)) + 1;
74ca47
+            entry_size = clamp_div * (64 * MEGABYTE);
74ca47
         }
74ca47
     }
74ca47
 
74ca47
-    slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "found %luk physical memory\n", pages*(pagesize/1024));
74ca47
-    slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "found %luk avaliable\n", zone_pages*(pagesize/1024));
74ca47
+    slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "found %luk physical memory\n", mi->system_total_bytes / 1024);
74ca47
+    slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "found %luk avaliable\n", mi->system_available_bytes / 1024);
74ca47
 
74ca47
     /* We've now calculated the autotuning values. Do we need to apply it?
74ca47
      * we use the logic of "if size is 0, or autosize is > 0. This way three
74ca47
@@ -191,13 +172,12 @@ ldbm_back_start_autotune(struct ldbminfo *li) {
74ca47
 
74ca47
     /* First, check the dbcache */
74ca47
     if (li->li_dbcachesize == 0 || li->li_cache_autosize > 0) {
74ca47
-        slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "cache autosizing: db cache: %luk\n", db_pages*(pagesize/1024));
74ca47
-        cache_size_to_configure = (unsigned long)(db_pages * pagesize);
74ca47
-        if (cache_size_to_configure < (500 * MEGABYTE)) {
74ca47
-            cache_size_to_configure = (unsigned long)((db_pages * pagesize) / 1.25);
74ca47
+        slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "cache autosizing: db cache: %luk\n", db_size / 1024);
74ca47
+        if (db_size < (500 * MEGABYTE)) {
74ca47
+            db_size = db_size / 1.25;
74ca47
         }
74ca47
         /* Have to set this value through text. */
74ca47
-        sprintf(size_to_str, "%lu", cache_size_to_configure);
74ca47
+        sprintf(size_to_str, "%" PRIu64 , db_size);
74ca47
         ldbm_config_internal_set(li, CONFIG_DBCACHESIZE, size_to_str);
74ca47
     }
74ca47
     total_cache_size += li->li_dbcachesize;
74ca47
@@ -205,7 +185,7 @@ ldbm_back_start_autotune(struct ldbminfo *li) {
74ca47
     /* For each backend */
74ca47
     /*   apply the appropriate cache size if 0 */
74ca47
     if (backend_count > 0 ) {
74ca47
-        li->li_cache_autosize_ec = (unsigned long)entry_pages * pagesize;
74ca47
+        li->li_cache_autosize_ec = entry_size;
74ca47
     }
74ca47
 
74ca47
     for (inst_obj = objset_first_obj(li->li_instance_set); inst_obj;
74ca47
@@ -220,7 +200,7 @@ ldbm_back_start_autotune(struct ldbminfo *li) {
74ca47
          * it's highly unlikely.
74ca47
          */
74ca47
         if (cache_size == 0 || cache_size == MINCACHESIZE || li->li_cache_autosize > 0) {
74ca47
-            slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "cache autosizing: %s entry cache (%lu total): %luk\n", inst->inst_name, backend_count, entry_pages*(pagesize/1024));
74ca47
+            slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "cache autosizing: %s entry cache (%lu total): %luk\n", inst->inst_name, backend_count, entry_size / 1024);
74ca47
             cache_set_max_entries(&(inst->inst_cache), -1);
74ca47
             cache_set_max_size(&(inst->inst_cache), li->li_cache_autosize_ec, CACHE_TYPE_ENTRY);
74ca47
         }
74ca47
@@ -229,8 +209,8 @@ ldbm_back_start_autotune(struct ldbminfo *li) {
74ca47
         db_size = dblayer_get_id2entry_size(inst);
74ca47
         if (cache_size < db_size) {
74ca47
             slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start",
74ca47
-                  "%s: entry cache size %lu B is "
74ca47
-                  "less than db size %lu B; "
74ca47
+                  "%s: entry cache size %"PRIu64" B is "
74ca47
+                  "less than db size %"PRIu64" B; "
74ca47
                   "We recommend to increase the entry cache size "
74ca47
                   "nsslapd-cachememsize.\n",
74ca47
                   inst->inst_name, cache_size, db_size);
74ca47
@@ -244,37 +224,36 @@ ldbm_back_start_autotune(struct ldbminfo *li) {
74ca47
     /* autosizing importCache */
74ca47
     if (li->li_import_cache_autosize > 0) {
74ca47
         /* Use import percentage here, as it's been corrected for -1 behaviour */
74ca47
-        import_pages = (import_percentage * pages) / 100;
74ca47
-        import_size = import_pages * pagesize;
74ca47
-        issane = util_is_cachesize_sane(&import_size);
74ca47
-        if (!issane) {
74ca47
+        import_size = (import_percentage * mi->system_total_bytes) / 100;
74ca47
+        issane = util_is_cachesize_sane(mi, &import_size);
74ca47
+        if (issane == UTIL_CACHESIZE_REDUCED) {
74ca47
             slapi_log_err(SLAPI_LOG_WARNING, "ldbm_back_start", "Your autosized import cache values have been reduced. Likely your nsslapd-import-cache-autosize percentage is too high.\n");
74ca47
         }
74ca47
         /* We just accept the reduced allocation here. */
74ca47
-        import_pages = import_size / pagesize;
74ca47
-        slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "cache autosizing: import cache: %luk\n",
74ca47
-        import_pages*(pagesize/1024));
74ca47
+        slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "cache autosizing: import cache: %"PRIu64"k\n", import_size / 1024);
74ca47
 
74ca47
-        sprintf(size_to_str, "%lu", (unsigned long)(import_pages * pagesize));
74ca47
+        sprintf(size_to_str, "%"PRIu64, import_size);
74ca47
         ldbm_config_internal_set(li, CONFIG_IMPORT_CACHESIZE, size_to_str);
74ca47
     }
74ca47
 
74ca47
     /* Finally, lets check that the total result is sane. */
74ca47
-    slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "total cache size: %lu B; \n", total_cache_size);
74ca47
+    slapi_log_err(SLAPI_LOG_NOTICE, "ldbm_back_start", "total cache size: %"PRIu64" B; \n", total_cache_size);
74ca47
 
74ca47
-    issane = util_is_cachesize_sane(&total_cache_size);
74ca47
-    if (!issane) {
74ca47
+    issane = util_is_cachesize_sane(mi, &total_cache_size);
74ca47
+    if (issane != UTIL_CACHESIZE_VALID) {
74ca47
         /* Right, it's time to panic */
74ca47
         slapi_log_err(SLAPI_LOG_WARNING, "ldbm_back_start", "It is highly likely your memory configuration of all backends will EXCEED your systems memory.\n");
74ca47
         slapi_log_err(SLAPI_LOG_WARNING, "ldbm_back_start", "In a future release this WILL prevent server start up. You MUST alter your configuration.\n");
74ca47
-        slapi_log_err(SLAPI_LOG_WARNING, "ldbm_back_start", "Total entry cache size: %lu B; dbcache size: %lu B; available memory size: %lu B; \n",
74ca47
-                  (PRUint64)total_cache_size, (PRUint64)li->li_dbcachesize, availpages * pagesize
74ca47
+        slapi_log_err(SLAPI_LOG_WARNING, "ldbm_back_start", "Total entry cache size: %"PRIu64" B; dbcache size: %"PRIu64" B; available memory size: %"PRIu64" B; \n",
74ca47
+                    total_cache_size, (uint64_t)li->li_dbcachesize, mi->system_available_bytes
74ca47
         );
74ca47
         slapi_log_err(SLAPI_LOG_WARNING, "ldbm_back_start", "%s\n", msg);
74ca47
         /* WB 2016 - This should be UNCOMMENTED in a future release */
74ca47
         /* return SLAPI_FAIL_GENERAL; */
74ca47
     }
74ca47
 
74ca47
+    spal_meminfo_destroy(mi);
74ca47
+
74ca47
     /* == End autotune == */
74ca47
     return 0;
74ca47
 }
74ca47
diff --git a/ldap/servers/slapd/bind.c b/ldap/servers/slapd/bind.c
74ca47
index f83df7d..648a0f9 100644
74ca47
--- a/ldap/servers/slapd/bind.c
74ca47
+++ b/ldap/servers/slapd/bind.c
74ca47
@@ -853,25 +853,25 @@ log_bind_access (
74ca47
 {
74ca47
     if (method == LDAP_AUTH_SASL && saslmech && msg) {
74ca47
         slapi_log_access( LDAP_DEBUG_STATS, 
74ca47
-                          "conn=%" NSPRIu64 " op=%d BIND dn=\"%s\" "
74ca47
+                          "conn=%" PRIu64 " op=%d BIND dn=\"%s\" "
74ca47
                           "method=sasl version=%d mech=%s, %s\n",
74ca47
                           pb->pb_conn->c_connid, pb->pb_op->o_opid, dn,
74ca47
                           version, saslmech, msg );
74ca47
     } else if (method == LDAP_AUTH_SASL && saslmech) {
74ca47
         slapi_log_access( LDAP_DEBUG_STATS, 
74ca47
-                          "conn=%" NSPRIu64 " op=%d BIND dn=\"%s\" "
74ca47
+                          "conn=%" PRIu64 " op=%d BIND dn=\"%s\" "
74ca47
                           "method=sasl version=%d mech=%s\n",
74ca47
                           pb->pb_conn->c_connid, pb->pb_op->o_opid, dn,
74ca47
                           version, saslmech );
74ca47
     } else if (msg) {
74ca47
         slapi_log_access( LDAP_DEBUG_STATS, 
74ca47
-                          "conn=%" NSPRIu64 " op=%d BIND dn=\"%s\" "
74ca47
+                          "conn=%" PRIu64 " op=%d BIND dn=\"%s\" "
74ca47
                           "method=%" BERTAG_T " version=%d, %s\n",
74ca47
                           pb->pb_conn->c_connid, pb->pb_op->o_opid, dn,
74ca47
                           method, version, msg );
74ca47
     } else {
74ca47
         slapi_log_access( LDAP_DEBUG_STATS, 
74ca47
-                          "conn=%" NSPRIu64 " op=%d BIND dn=\"%s\" "
74ca47
+                          "conn=%" PRIu64 " op=%d BIND dn=\"%s\" "
74ca47
                           "method=%" BERTAG_T " version=%d\n",
74ca47
                           pb->pb_conn->c_connid, pb->pb_op->o_opid, dn,
74ca47
                           method, version );
74ca47
diff --git a/ldap/servers/slapd/compare.c b/ldap/servers/slapd/compare.c
74ca47
index 07ded98..3c03053 100644
74ca47
--- a/ldap/servers/slapd/compare.c
74ca47
+++ b/ldap/servers/slapd/compare.c
74ca47
@@ -111,7 +111,7 @@ do_compare( Slapi_PBlock *pb )
74ca47
 	    rawdn, ava.ava_type, 0 );
74ca47
 
74ca47
 	slapi_log_access( LDAP_DEBUG_STATS,
74ca47
-	    "conn=%" NSPRIu64 " op=%d CMP dn=\"%s\" attr=\"%s\"\n",
74ca47
+	    "conn=%" PRIu64 " op=%d CMP dn=\"%s\" attr=\"%s\"\n",
74ca47
 	    pb->pb_conn->c_connid, pb->pb_op->o_opid, dn, ava.ava_type );
74ca47
 
74ca47
 	/*
74ca47
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
74ca47
index 7c83c66..359b59a 100644
74ca47
--- a/ldap/servers/slapd/connection.c
74ca47
+++ b/ldap/servers/slapd/connection.c
74ca47
@@ -411,7 +411,7 @@ connection_reset(Connection* conn, int ns, PRNetAddr * from, int fromLen, int is
74ca47
 
74ca47
     /* log useful stuff to our access log */
74ca47
     slapi_log_access( LDAP_DEBUG_STATS,
74ca47
-        "conn=%" NSPRIu64 " fd=%d slot=%d %sconnection from %s to %s\n",
74ca47
+        "conn=%" PRIu64 " fd=%d slot=%d %sconnection from %s to %s\n",
74ca47
         conn->c_connid, conn->c_sd, ns, pTmp, str_ip, str_destip );
74ca47
 
74ca47
     /* initialize the remaining connection fields */
74ca47
@@ -511,7 +511,7 @@ connection_need_new_password(const Connection *conn, const Operation *op, Slapi_
74ca47
 		op->o_tag != LDAP_REQ_ABANDON && op->o_tag != LDAP_REQ_EXTENDED)
74ca47
 	{
74ca47
 		slapi_add_pwd_control ( pb, LDAP_CONTROL_PWEXPIRED, 0);	
74ca47
-		slapi_log_access( LDAP_DEBUG_STATS, "conn=%" NSPRIu64 " op=%d %s\n",
74ca47
+		slapi_log_access( LDAP_DEBUG_STATS, "conn=%" PRIu64 " op=%d %s\n",
74ca47
 			pb->pb_conn->c_connid, pb->pb_op->o_opid,
74ca47
 			"UNPROCESSED OPERATION - need new password" );
74ca47
 		send_ldap_result( pb, LDAP_UNWILLING_TO_PERFORM, 
74ca47
@@ -562,7 +562,7 @@ connection_dispatch_operation(Connection *conn, Operation *op, Slapi_PBlock *pb)
74ca47
 	    (op->o_tag != LDAP_REQ_EXTENDED) && (op->o_tag != LDAP_REQ_UNBIND) &&
74ca47
 	    (op->o_tag != LDAP_REQ_ABANDON)) {
74ca47
 		slapi_log_access( LDAP_DEBUG_STATS,
74ca47
-			"conn=%" NSPRIu64 " op=%d UNPROCESSED OPERATION"
74ca47
+			"conn=%" PRIu64 " op=%d UNPROCESSED OPERATION"
74ca47
 			" - Insufficient SSF (local_ssf=%d sasl_ssf=%d ssl_ssf=%d)\n",
74ca47
 			conn->c_connid, op->o_opid, conn->c_local_ssf,
74ca47
 			conn->c_sasl_ssf, conn->c_ssl_ssf );
74ca47
@@ -591,7 +591,7 @@ connection_dispatch_operation(Connection *conn, Operation *op, Slapi_PBlock *pb)
74ca47
 	    (op->o_tag != LDAP_REQ_ABANDON) && (op->o_tag != LDAP_REQ_SEARCH))))
74ca47
 	{
74ca47
 		slapi_log_access( LDAP_DEBUG_STATS,
74ca47
-			"conn=%" NSPRIu64 " op=%d UNPROCESSED OPERATION"
74ca47
+			"conn=%" PRIu64 " op=%d UNPROCESSED OPERATION"
74ca47
 			" - Anonymous access not allowed\n",
74ca47
 			conn->c_connid, op->o_opid );
74ca47
 
74ca47
@@ -650,7 +650,7 @@ connection_dispatch_operation(Connection *conn, Operation *op, Slapi_PBlock *pb)
74ca47
 			int ret = setsockopt(conn->c_sd,IPPROTO_TCP,TCP_CORK,&i,sizeof(i));
74ca47
 			if (ret < 0) {
74ca47
 				slapi_log_err(SLAPI_LOG_ERR, "connection_dispatch_operation",
74ca47
-					"Failed to set TCP_CORK on connection %" NSPRIu64 "\n",conn->c_connid);
74ca47
+					"Failed to set TCP_CORK on connection %" PRIu64 "\n",conn->c_connid);
74ca47
 			}
74ca47
 			pop_cork = 1;
74ca47
 		}
74ca47
@@ -664,7 +664,7 @@ connection_dispatch_operation(Connection *conn, Operation *op, Slapi_PBlock *pb)
74ca47
 			int ret = setsockopt(conn->c_sd,IPPROTO_TCP,TCP_CORK,&i,sizeof(i));
74ca47
 			if (ret < 0) {
74ca47
 				slapi_log_err(SLAPI_LOG_ERR, "connection_dispatch_operation",
74ca47
-					"Failed to clear TCP_CORK on connection %" NSPRIu64 "\n",conn->c_connid);
74ca47
+					"Failed to clear TCP_CORK on connection %" PRIu64 "\n",conn->c_connid);
74ca47
 			}
74ca47
 		}
74ca47
 #endif
74ca47
@@ -690,7 +690,7 @@ connection_dispatch_operation(Connection *conn, Operation *op, Slapi_PBlock *pb)
74ca47
 
74ca47
 	default:
74ca47
 		slapi_log_err(SLAPI_LOG_ERR,
74ca47
-		    "connection_dispatch_operation", "Ignoring unknown LDAP request (conn=%" NSPRIu64 ", tag=0x%lx)\n",
74ca47
+		    "connection_dispatch_operation", "Ignoring unknown LDAP request (conn=%" PRIu64 ", tag=0x%lx)\n",
74ca47
 		    conn->c_connid, op->o_tag);
74ca47
 		break;
74ca47
 	}
74ca47
@@ -702,7 +702,7 @@ int connection_release_nolock_ext (Connection *conn, int release_only)
74ca47
     if (conn->c_refcnt <= 0)
74ca47
     {
74ca47
         slapi_log_err(SLAPI_LOG_ERR, "connection_release_nolock_ext",
74ca47
-		                "conn=%" NSPRIu64 " fd=%d Attempt to release connection that is not acquired\n",
74ca47
+		                "conn=%" PRIu64 " fd=%d Attempt to release connection that is not acquired\n",
74ca47
 		                conn->c_connid, conn->c_sd);
74ca47
         PR_ASSERT (PR_FALSE);
74ca47
         return -1;
74ca47
@@ -734,7 +734,7 @@ int connection_acquire_nolock_ext (Connection *conn, int allow_when_closing)