From 57b6e5afb6265363ede667ad450e267f8a803b9e Mon Sep 17 00:00:00 2001

From: Mark Reynolds <mreynolds@redhat.com>

Date: Wed, 19 Apr 2017 13:37:10 -0400

Subject: [PATCH] Ticket 48864 - Add cgroup memory limit detection to 389-ds

Bug Description:  Previously our memory limits only check hardware

    limits and shell resource limits. However, we may be in a container

    like docker or lxc, and unable to detect these limits. This can lead

    to crash conditions or worse, especially with autosizing

    on import we may have conditions where the server may not

    even be able to install.

Fix Description:  Add support for cgroup memory limit detection

    so that we can properly determine our resource availability regardless

    of lxc, docker, systemd or others.

https://pagure.io/389-ds-base/issue/48864

Author: wibrown

Review by: mreynolds (Thanks!)

---

 Makefile.am                                        |   7 +-

 ldap/servers/plugins/acl/acl.c                     |  18 +-

 ldap/servers/plugins/acl/acl.h                     |  16 -

 ldap/servers/plugins/acl/aclanom.c                 |   8 +-

 ldap/servers/plugins/dna/dna.c                     |  50 ++-

 ldap/servers/plugins/posix-winsync/posix-winsync.c |   4 +-

 ldap/servers/plugins/replication/repl.h            |  17 +-

 .../plugins/replication/repl5_inc_protocol.c       |   2 +-

 ldap/servers/plugins/replication/repl5_init.c      |   2 +-

 ldap/servers/plugins/replication/repl5_plugins.c   |   2 +-

 ldap/servers/plugins/replication/repl5_replica.c   |   8 +-

 ldap/servers/plugins/replication/repl5_total.c     |   4 +-

 ldap/servers/plugins/replication/repl_connext.c    |  20 +-

 ldap/servers/plugins/replication/repl_extop.c      |  26 +-

 ldap/servers/plugins/sync/sync_persist.c           |   6 +-

 ldap/servers/plugins/syntaxes/validate_task.c      |   6 +-

 ldap/servers/plugins/usn/usn.c                     |   8 +-

 ldap/servers/slapd/abandon.c                       |   8 +-

 ldap/servers/slapd/add.c                           |   4 +-

 ldap/servers/slapd/auth.c                          |  18 +-

 ldap/servers/slapd/back-ldbm/back-ldbm.h           |  23 +-

 ldap/servers/slapd/back-ldbm/cache.c               |  34 +-

 ldap/servers/slapd/back-ldbm/dblayer.c             |  72 ++--

 ldap/servers/slapd/back-ldbm/dblayer.h             |   8 -

 ldap/servers/slapd/back-ldbm/import-threads.c      |   2 +-

 ldap/servers/slapd/back-ldbm/import.c              |  12 +-

 ldap/servers/slapd/back-ldbm/ldbm_config.c         |  32 +-

 ldap/servers/slapd/back-ldbm/ldbm_delete.c         |   4 +-

 .../servers/slapd/back-ldbm/ldbm_instance_config.c |  20 +-

 ldap/servers/slapd/back-ldbm/ldbm_modrdn.c         |   4 +-

 ldap/servers/slapd/back-ldbm/ldbm_search.c         |   4 +-

 ldap/servers/slapd/back-ldbm/misc.c                |   2 +-

 ldap/servers/slapd/back-ldbm/monitor.c             |  10 +-

 ldap/servers/slapd/back-ldbm/perfctrs.h            |   2 +-

 ldap/servers/slapd/back-ldbm/start.c               | 113 +++----

 ldap/servers/slapd/bind.c                          |   8 +-

 ldap/servers/slapd/compare.c                       |   2 +-

 ldap/servers/slapd/connection.c                    |  72 ++--

 ldap/servers/slapd/conntable.c                     |   8 +-

 ldap/servers/slapd/control.c                       |   2 +-

 ldap/servers/slapd/daemon.c                        |  48 +--

 ldap/servers/slapd/delete.c                        |   2 +-

 ldap/servers/slapd/entry.c                         |   2 +-

 ldap/servers/slapd/extendop.c                      |   4 +-

 ldap/servers/slapd/log.c                           |  10 +-

 ldap/servers/slapd/modify.c                        |  12 +-

 ldap/servers/slapd/modrdn.c                        |   6 +-

 ldap/servers/slapd/monitor.c                       |   8 +-

 ldap/servers/slapd/operation.c                     |   6 +-

 ldap/servers/slapd/opshared.c                      |   4 +-

 ldap/servers/slapd/pagedresults.c                  |   2 +-

 ldap/servers/slapd/psearch.c                       |  10 +-

 ldap/servers/slapd/result.c                        |  12 +-

 ldap/servers/slapd/sasl_io.c                       |  52 +--

 ldap/servers/slapd/saslbind.c                      |   2 +-

 ldap/servers/slapd/search.c                        |   2 +-

 ldap/servers/slapd/slap.h                          |   9 +-

 ldap/servers/slapd/slapi-plugin.h                  |  14 +-

 ldap/servers/slapd/slapi-private.h                 |  38 ++-

 ldap/servers/slapd/slapi_pal.c                     | 311 +++++++++++++++++

 ldap/servers/slapd/slapi_pal.h                     |  62 ++++

 ldap/servers/slapd/snmp_collator.c                 |   2 +-

 ldap/servers/slapd/unbind.c                        |   6 +-

 ldap/servers/slapd/util.c                          | 376 +--------------------

 test/libslapd/spal/meminfo.c                       |  54 +++

 test/libslapd/test.c                               |   2 +

 test/test_slapd.h                                  |   5 +

 67 files changed, 870 insertions(+), 859 deletions(-)

 create mode 100644 ldap/servers/slapd/slapi_pal.c

 create mode 100644 ldap/servers/slapd/slapi_pal.h

 create mode 100644 test/libslapd/spal/meminfo.c

diff --git a/Makefile.am b/Makefile.am

index 485a460..429a345 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -481,6 +481,7 @@ dist_noinst_HEADERS = \

 	ldap/servers/slapd/pw_verify.h \

 	ldap/servers/slapd/secerrstrs.h \

 	ldap/servers/slapd/slap.h \

+	ldap/servers/slapd/slapi_pal.h \

 	ldap/servers/slapd/slapi-plugin-compat4.h \

 	ldap/servers/slapd/slapi-plugin.h \

 	ldap/servers/slapd/slapi-private.h \

@@ -850,6 +851,7 @@ pkgconfig_DATA = src/pkgconfig/dirsrv.pc \

 # header files

 #------------------------

 serverinc_HEADERS = ldap/servers/plugins/replication/repl-session-plugin.h \

+	ldap/servers/slapd/slapi_pal.h \

 	ldap/servers/slapd/slapi-plugin.h \

 	ldap/servers/plugins/replication/winsync-plugin.h \

 	src/nunc-stans/include/nunc-stans.h \

@@ -1219,6 +1221,7 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \

 	ldap/servers/slapd/value.c \

 	ldap/servers/slapd/valueset.c \

 	ldap/servers/slapd/vattr.c \

+	ldap/servers/slapd/slapi_pal.c \

 	$(libavl_a_SOURCES)

 libslapd_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(SASL_INCLUDES) @db_inc@ $(SVRCORE_INCLUDES) @kerberos_inc@ @pcre_inc@

@@ -2004,7 +2007,9 @@ test_slapd_SOURCES = test/main.c \

 	test/libslapd/counters/atomic.c \

 	test/libslapd/pblock/analytics.c \

 	test/libslapd/pblock/v3_compat.c \

-	test/libslapd/operation/v3_compat.c

+	test/libslapd/operation/v3_compat.c \

+	test/libslapd/spal/meminfo.c

+

 test_slapd_LDADD = libslapd.la

 test_slapd_LDFLAGS = $(AM_CPPFLAGS) $(CMOCKA_LINKS)

 ### WARNING: Slap.h needs cert.h, which requires the -I/lib/ldaputil!!!

diff --git a/ldap/servers/plugins/acl/acl.c b/ldap/servers/plugins/acl/acl.c

index 48b8efc..561dd91 100644

--- a/ldap/servers/plugins/acl/acl.c

+++ b/ldap/servers/plugins/acl/acl.c

@@ -276,7 +276,7 @@ acl_access_allowed(

 		 if (  !privateBackend && (be_readonly ||  slapi_config_get_readonly () )){

 			slapi_log_err(loglevel, plugin_name,

-				"acl_access_allowed - conn=%" NSPRIu64 " op=%d (main): Deny %s on entry(%s)"

+				"acl_access_allowed - conn=%" PRIu64 " op=%d (main): Deny %s on entry(%s)"

 				": readonly backend\n", 

 				o_connid, o_opid,

 				acl_access2str(access),

@@ -289,7 +289,7 @@ acl_access_allowed(

 	TNF_PROBE_0_DEBUG(acl_skipaccess_start,"ACL","");

 	if (  acl_skip_access_check ( pb, e, access )) {

 		slapi_log_err(loglevel, plugin_name,

-				"acl_access_allowed - conn=%" NSPRIu64 " op=%d (main): Allow %s on entry(%s)"

+				"acl_access_allowed - conn=%" PRIu64 " op=%d (main): Allow %s on entry(%s)"

 				": root user\n", 

 				o_connid, o_opid,

 				acl_access2str(access),

@@ -448,7 +448,7 @@ acl_access_allowed(

 		TNF_PROBE_0_DEBUG(acl_entry_first_touch_start,"ACL","");

 		slapi_log_err(loglevel, plugin_name,

-			"acl_access_allowed - #### conn=%" NSPRIu64 " op=%d binddn=\"%s\"\n",

+			"acl_access_allowed - #### conn=%" PRIu64 " op=%d binddn=\"%s\"\n",

 			o_connid, o_opid, clientDn);

 		aclpb->aclpb_stat_total_entries++;

@@ -776,7 +776,7 @@ print_access_control_summary( char *source, int ret_val, char *clientDn,

                                 null_user);

                         if (strcasecmp(right, access_str_moddn) == 0) {

                                  slapi_log_err(loglevel, plugin_name, "print_access_control_summary - "                                            

-                                        "conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) [from %s] to proxy (%s)"

+                                        "conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) [from %s] to proxy (%s)"

                                          ": %s\n",

                                         o_connid, o_opid,

                                         source,

@@ -790,7 +790,7 @@ print_access_control_summary( char *source, int ret_val, char *clientDn,

                         } else {

                                 slapi_log_err(loglevel, plugin_name, 

-                                        "print_access_control_summary - conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to proxy (%s)"

+                                        "print_access_control_summary - conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to proxy (%s)"

                                          ": %s\n",

                                         o_connid, o_opid,

                                         source,

@@ -805,7 +805,7 @@ print_access_control_summary( char *source, int ret_val, char *clientDn,

                         proxy_user = null_user;

                         if (strcasecmp(right, access_str_moddn) == 0) {

                                 slapi_log_err(loglevel, plugin_name, 

-                                        "print_access_control_summary - conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) [from %s] to proxy (%s)"

+                                        "print_access_control_summary - conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) [from %s] to proxy (%s)"

                                         ": %s\n",

                                         o_connid, o_opid,

                                         source,

@@ -819,7 +819,7 @@ print_access_control_summary( char *source, int ret_val, char *clientDn,

                         } else {

                                 slapi_log_err(loglevel, plugin_name, 

-                                        "print_access_control_summary - conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to proxy (%s)"

+                                        "print_access_control_summary - conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to proxy (%s)"

                                         ": %s\n",

                                         o_connid, o_opid,

                                         source,

@@ -834,7 +834,7 @@ print_access_control_summary( char *source, int ret_val, char *clientDn,

 	} else {

                 if (strcasecmp(right, access_str_moddn) == 0) {

                         slapi_log_err(loglevel, plugin_name, 

-                                "print_access_control_summary - conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) [from %s] to %s"

+                                "print_access_control_summary - conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) [from %s] to %s"

                                 ": %s\n",

                                 o_connid, o_opid,

                                 source,

@@ -848,7 +848,7 @@ print_access_control_summary( char *source, int ret_val, char *clientDn,

                 } else {

                         slapi_log_err(loglevel, plugin_name, 

-                                "print_access_control_summary - conn=%" NSPRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to %s"

+                                "print_access_control_summary - conn=%" PRIu64 " op=%d (%s): %s %s on entry(%s).attr(%s) to %s"

                                 ": %s\n",

                                 o_connid, o_opid,

                                 source,

diff --git a/ldap/servers/plugins/acl/acl.h b/ldap/servers/plugins/acl/acl.h

index 91f5071..8b3486c 100644

--- a/ldap/servers/plugins/acl/acl.h

+++ b/ldap/servers/plugins/acl/acl.h

@@ -20,22 +20,6 @@

 #ifndef _ACL_H_

 #define _ACL_H_

-/* Required to get portable printf/scanf format macros */

-#ifdef HAVE_INTTYPES_H

-#include <inttypes.h>

-

-/* NSPR uses the print macros a bit differently than ANSI C.  We

- * need to use ll for a 64-bit integer, even when a long is 64-bit.

- */

-#undef PRIu64

-#define PRIu64  "llu"

-#undef PRI64

-#define PRI64   "ll"

-

-#else

-#error Need to define portable format macros such as PRIu64

-#endif /* HAVE_INTTYPES_H */

-

 #include 	<stdio.h>

 #include 	<string.h>

 #include 	<sys/types.h>

diff --git a/ldap/servers/plugins/acl/aclanom.c b/ldap/servers/plugins/acl/aclanom.c

index 5462d87..96d0d9f 100644

--- a/ldap/servers/plugins/acl/aclanom.c

+++ b/ldap/servers/plugins/acl/aclanom.c

@@ -523,7 +523,7 @@ aclanom_match_profile (Slapi_PBlock *pb, struct acl_pblock *aclpb, Slapi_Entry *

 			aci_ndn = slapi_sdn_get_ndn (acl_anom_profile->anom_targetinfo[i].anom_target);

 			if (access & SLAPI_ACL_MODDN) {

 				slapi_log_err(loglevel, plugin_name, 

-					"aclanom_match_profile - conn=%" NSPRIu64 " op=%d: Allow access on entry(%s).attr(%s) (from %s) to anonymous: acidn=\"%s\"\n",

+					"aclanom_match_profile - conn=%" PRIu64 " op=%d: Allow access on entry(%s).attr(%s) (from %s) to anonymous: acidn=\"%s\"\n",

 					o_connid, o_opid,

 					ndn,

 					attr ? attr:"NULL",

@@ -532,7 +532,7 @@ aclanom_match_profile (Slapi_PBlock *pb, struct acl_pblock *aclpb, Slapi_Entry *

 			} else {

 				slapi_log_err(loglevel, plugin_name, 

-					"aclanom_match_profile - conn=%" NSPRIu64 " op=%d: Allow access on entry(%s).attr(%s) to anonymous: acidn=\"%s\"\n",

+					"aclanom_match_profile - conn=%" PRIu64 " op=%d: Allow access on entry(%s).attr(%s) to anonymous: acidn=\"%s\"\n",

 					o_connid, o_opid,

 					ndn,

 					attr ? attr:"NULL",

@@ -541,13 +541,13 @@ aclanom_match_profile (Slapi_PBlock *pb, struct acl_pblock *aclpb, Slapi_Entry *

 		} else {

 			if (access & SLAPI_ACL_MODDN) {

 				slapi_log_err(loglevel, plugin_name,

-					"aclanom_match_profile - conn=%" NSPRIu64 " op=%d: Deny access on entry(%s).attr(%s) (from %s) to anonymous\n",

+					"aclanom_match_profile - conn=%" PRIu64 " op=%d: Deny access on entry(%s).attr(%s) (from %s) to anonymous\n",

 					o_connid, o_opid,

 					ndn, attr ? attr:"NULL" ,

 					aclpb->aclpb_moddn_source_sdn ? slapi_sdn_get_dn(aclpb->aclpb_moddn_source_sdn) : "NULL");

 			} else {

 				slapi_log_err(loglevel, plugin_name,

-					"aclanom_match_profile - conn=%" NSPRIu64 " op=%d: Deny access on entry(%s).attr(%s) to anonymous\n",

+					"aclanom_match_profile - conn=%" PRIu64 " op=%d: Deny access on entry(%s).attr(%s) to anonymous\n",

 					o_connid, o_opid,

 					ndn, attr ? attr:"NULL" );

 			}

diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c

index 34011b9..a085941 100644

--- a/ldap/servers/plugins/dna/dna.c

+++ b/ldap/servers/plugins/dna/dna.c

@@ -23,14 +23,6 @@

 #include "slapi-private.h"

 #include "prclist.h"

-/* Required to get portable printf/scanf format macros */

-#ifdef HAVE_INTTYPES_H

-#include <inttypes.h>

-

-#else

-#error Need to define portable format macros such as PRIu64

-#endif /* HAVE_INTTYPES_H */

-

 #include <sys/stat.h>

 #define DNA_PLUGIN_SUBSYSTEM "dna-plugin"

@@ -997,7 +989,7 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry * e, int apply)

     }

     slapi_log_err(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,

-                    "dna_parse_config_entry - %s [%" NSPRIu64 "]\n", DNA_NEXTVAL,

+                    "dna_parse_config_entry - %s [%" PRIu64 "]\n", DNA_NEXTVAL,

                     entry->nextval);

     value = slapi_entry_attr_get_charptr(e, DNA_PREFIX);

@@ -1026,7 +1018,7 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry * e, int apply)

     }

     slapi_log_err(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,

-                    "dna_parse_config_entry - %s [%" NSPRIu64 "]\n", DNA_INTERVAL, entry->interval);

+                    "dna_parse_config_entry - %s [%" PRIu64 "]\n", DNA_INTERVAL, entry->interval);

 #endif

     value = slapi_entry_attr_get_charptr(e, DNA_GENERATE);

@@ -1126,7 +1118,7 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry * e, int apply)

     }

     slapi_log_err(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,

-                    "dna_parse_config_entry - %s [%" NSPRIu64 "]\n", DNA_MAXVAL,

+                    "dna_parse_config_entry - %s [%" PRIu64 "]\n", DNA_MAXVAL,

                     entry->maxval);

     /* get the global bind dn and password(if any) */

@@ -1256,7 +1248,7 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry * e, int apply)

     }

     slapi_log_err(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,

-                    "dna_parse_config_entry - %s [%" NSPRIu64 "]\n", DNA_THRESHOLD,

+                    "dna_parse_config_entry - %s [%" PRIu64 "]\n", DNA_THRESHOLD,

                     entry->threshold);

     value = slapi_entry_attr_get_charptr(e, DNA_RANGE_REQUEST_TIMEOUT);

@@ -1268,7 +1260,7 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry * e, int apply)

     }

     slapi_log_err(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,

-                    "dna_parse_config_entry - %s [%" NSPRIu64 "]\n", DNA_RANGE_REQUEST_TIMEOUT,

+                    "dna_parse_config_entry - %s [%" PRIu64 "]\n", DNA_RANGE_REQUEST_TIMEOUT,

                     entry->timeout);

     value = slapi_entry_attr_get_charptr(e, DNA_NEXT_RANGE);

@@ -2307,7 +2299,7 @@ dna_first_free_value(struct configEntry *config_entry,

             return LDAP_OPERATIONS_ERROR;

         }

-        filter = slapi_ch_smprintf("(&%s(&(%s>=%" NSPRIu64 ")(%s<=%" NSPRIu64 ")))",

+        filter = slapi_ch_smprintf("(&%s(&(%s>=%" PRIu64 ")(%s<=%" PRIu64 ")))",

                                    config_entry->filter,

                                    config_entry->types[0], tmpval,

                                    config_entry->types[0], config_entry->maxval);

@@ -2497,7 +2489,7 @@ static int dna_get_next_value(struct configEntry *config_entry,

     if ((config_entry->maxval == -1) ||

         (nextval <= (config_entry->maxval + config_entry->interval))) {

         /* try to set the new next value in the config entry */

-        snprintf(next_value, sizeof(next_value),"%" NSPRIu64, nextval);

+        snprintf(next_value, sizeof(next_value),"%" PRIu64, nextval);

         /* set up our replace modify operation */

         replace_val[0] = next_value;

@@ -2524,7 +2516,7 @@ static int dna_get_next_value(struct configEntry *config_entry,

     if (LDAP_SUCCESS == ret) {

         slapi_ch_free_string(next_value_ret);

-        *next_value_ret = slapi_ch_smprintf("%" NSPRIu64, setval);

+        *next_value_ret = slapi_ch_smprintf("%" PRIu64, setval);

         if (NULL == *next_value_ret) {

             ret = LDAP_OPERATIONS_ERROR;

             goto done;

@@ -2609,7 +2601,7 @@ dna_update_shared_config(struct configEntry *config_entry)

         /* We store the number of remaining assigned values

          * in the shared config entry. */

-        snprintf(remaining_vals, sizeof(remaining_vals),"%" NSPRIu64,

+        snprintf(remaining_vals, sizeof(remaining_vals),"%" PRIu64,

                 config_entry->remaining);

         /* set up our replace modify operation */

@@ -2709,7 +2701,7 @@ dna_update_next_range(struct configEntry *config_entry,

     int ret = 0;

     /* Try to set the new next range in the config entry. */

-    snprintf(nextrange_value, sizeof(nextrange_value), "%" NSPRIu64 "-%" NSPRIu64,

+    snprintf(nextrange_value, sizeof(nextrange_value), "%" PRIu64 "-%" PRIu64,

     		lower, upper);

     /* set up our replace modify operation */

@@ -2778,8 +2770,8 @@ dna_activate_next_range(struct configEntry *config_entry)

     int ret = 0;

     /* Setup the modify operation for the config entry */

-    snprintf(maxval_val, sizeof(maxval_val),"%" NSPRIu64, config_entry->next_range_upper);

-    snprintf(nextval_val, sizeof(nextval_val),"%" NSPRIu64, config_entry->next_range_lower);

+    snprintf(maxval_val, sizeof(maxval_val),"%" PRIu64, config_entry->next_range_upper);

+    snprintf(nextval_val, sizeof(nextval_val),"%" PRIu64, config_entry->next_range_lower);

     maxval_vals[0] = maxval_val;

     maxval_vals[1] = 0;

@@ -3319,7 +3311,7 @@ dna_create_valcheck_filter(struct configEntry *config_entry, PRUint64 value, cha

      * - the string length of the filter in the config

      * - the string length sum of all configured types

      * - 23 bytes for each type (20 for the max string

-     *   representation of a NSPRIu64, 3 for "(=)"

+     *   representation of a PRIu64, 3 for "(=)"

      * - 3 bytes for the beginning and end of the filter - "(&" and ")"

      * - 3 bytes to OR together multiple types (if present) - "(|" and ")"

      * - the string length of the prefix (if one is configured) for each type

@@ -3556,8 +3548,8 @@ _dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e, char **errstr)

                     (config_entry->remaining <= config_entry->threshold)) {

                     slapi_log_err(SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM,

                                     "_dna_pre_op_add - Passed threshold of %" 

-                                    NSPRIu64 " remaining values "

-                                    "for range %s. (%" NSPRIu64 " values remain)\n",

+                                    PRIu64 " remaining values "

+                                    "for range %s. (%" PRIu64 " values remain)\n",

                                     config_entry->threshold, config_entry->dn,

                                     config_entry->remaining);

                     dna_fix_maxval(config_entry, 0);

@@ -3828,8 +3820,8 @@ _dna_pre_op_modify(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Mods *smods, char **e

                     (config_entry->remaining <= config_entry->threshold)) {

                     slapi_log_err(SLAPI_LOG_ERR, DNA_PLUGIN_SUBSYSTEM,

                                     "_dna_pre_op_modify - Passed threshold of %" 

-                                    NSPRIu64 " remaining values "

-                                    "for range %s. (%" NSPRIu64 " values remain)\n",

+                                    PRIu64 " remaining values "

+                                    "for range %s. (%" PRIu64 " values remain)\n",

                                     config_entry->threshold, config_entry->dn,

                                     config_entry->remaining);

                     dna_fix_maxval(config_entry, 0);

@@ -4411,8 +4403,8 @@ static int dna_extend_exop(Slapi_PBlock *pb)

         char highstr[16];

         /* Create the exop response */

-        snprintf(lowstr, sizeof(lowstr), "%" NSPRIu64, lower);

-        snprintf(highstr, sizeof(highstr), "%" NSPRIu64, upper);

+        snprintf(lowstr, sizeof(lowstr), "%" PRIu64, lower);

+        snprintf(highstr, sizeof(highstr), "%" PRIu64, upper);

         range_low.bv_val = lowstr;

         range_low.bv_len = strlen(range_low.bv_val);

         range_high.bv_val = highstr;

@@ -4445,7 +4437,7 @@ static int dna_extend_exop(Slapi_PBlock *pb)

         ber_bvfree(respdata);

         slapi_log_err(SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM,

-                        "dna_extend_exop - Released range %" NSPRIu64 "-%" NSPRIu64 ".\n",

+                        "dna_extend_exop - Released range %" PRIu64 "-%" PRIu64 ".\n",

                         lower, upper);

     }

@@ -4588,7 +4580,7 @@ dna_release_range(char *range_dn, PRUint64 *lower, PRUint64 *upper)

                 *lower = *upper - release + 1;

                 /* try to set the new maxval in the config entry */

-                snprintf(max_value, sizeof(max_value),"%" NSPRIu64, (*lower - 1));

+                snprintf(max_value, sizeof(max_value),"%" PRIu64, (*lower - 1));

                 /* set up our replace modify operation */

                 replace_val[0] = max_value;

diff --git a/ldap/servers/plugins/posix-winsync/posix-winsync.c b/ldap/servers/plugins/posix-winsync/posix-winsync.c

index 63444e5..21e4ad0 100644

--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c

+++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c

@@ -270,7 +270,7 @@ sync_acct_disable(void *cbdata, /* the usual domain config data */

         if (update_entry) {

             slapi_entry_attr_set_ulong(update_entry, "userAccountControl", adval);

             slapi_log_err(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,

-                "<-- sync_acct_disable - %s AD account [%s] - new value is [%" NSPRIu64 "]\n",

+                "<-- sync_acct_disable - %s AD account [%s] - new value is [%" PRIu64 "]\n",

 				(ds_is_enabled) ? "enabled" : "disabled", slapi_entry_get_dn_const(update_entry), adval);

         } else {

             /* iterate through the mods - if there is already a mod

@@ -326,7 +326,7 @@ sync_acct_disable(void *cbdata, /* the usual domain config data */

                 mod_bval->bv_len = strlen(acctvalstr);

             }

             slapi_log_err(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,

-                "<-- sync_acct_disable - %s AD account [%s] - new value is [%" NSPRIu64 "]\n",

+                "<-- sync_acct_disable - %s AD account [%s] - new value is [%" PRIu64 "]\n",

 				(ds_is_enabled) ? "enabled" : "disabled", slapi_entry_get_dn_const(ad_entry), adval);

         }

     }

diff --git a/ldap/servers/plugins/replication/repl.h b/ldap/servers/plugins/replication/repl.h

index 89ad481..9460ca9 100644

--- a/ldap/servers/plugins/replication/repl.h

+++ b/ldap/servers/plugins/replication/repl.h

@@ -15,21 +15,8 @@

 #ifndef _REPL_H_

 #define _REPL_H_

-/* Required to get portable printf/scanf format macros */

-#ifdef HAVE_INTTYPES_H

-#include <inttypes.h>

-

-/* NSPR uses the print macros a bit differently than ANSI C.  We

- * need to use ll for a 64-bit integer, even when a long is 64-bit.

- */

-#undef PRIu64

-#define PRIu64  "llu"

-#undef PRI64

-#define PRI64   "ll"

-

-#else

-#error Need to define portable format macros such as PRIu64

-#endif /* HAVE_INTTYPES_H */

+/* Provides our int types and platform specific requirements. */

+#include <slapi_pal.h>

 #include <limits.h>

 #include <time.h>

diff --git a/ldap/servers/plugins/replication/repl5_inc_protocol.c b/ldap/servers/plugins/replication/repl5_inc_protocol.c

index a5ae885..36c279e 100644

--- a/ldap/servers/plugins/replication/repl5_inc_protocol.c

+++ b/ldap/servers/plugins/replication/repl5_inc_protocol.c

@@ -2104,7 +2104,7 @@ repl5_inc_stop(Private_Repl_Protocol *prp)

 		/* Isn't listening. Do something drastic. */

 		return_value = -1;

 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

-				"repl5_inc_stop - %s: Protocol does not stop after %" NSPRIu64 " seconds\n",

+				"repl5_inc_stop - %s: Protocol does not stop after %" PRIu64 " seconds\n",

 				agmt_get_long_name(prp->agmt), timeout);

 	}

 	else

diff --git a/ldap/servers/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c

index 9549dcf..edffb84 100644

--- a/ldap/servers/plugins/replication/repl5_init.c

+++ b/ldap/servers/plugins/replication/repl5_init.c

@@ -208,7 +208,7 @@ get_repl_session_id (Slapi_PBlock *pb, char *idstr, CSN **csn)

 		/* Avoid "Connection is NULL and hence cannot access SLAPI_CONN_ID" */

 		if (opid) {

 			slapi_pblock_get (pb, SLAPI_CONN_ID, &connid);

-			snprintf (idstr, REPL_SESSION_ID_SIZE, "conn=%" NSPRIu64 " op=%d",

+			snprintf (idstr, REPL_SESSION_ID_SIZE, "conn=%" PRIu64 " op=%d",

 					connid, opid);

 		}

diff --git a/ldap/servers/plugins/replication/repl5_plugins.c b/ldap/servers/plugins/replication/repl5_plugins.c

index 357c093..ebcc230 100644

--- a/ldap/servers/plugins/replication/repl5_plugins.c

+++ b/ldap/servers/plugins/replication/repl5_plugins.c

@@ -1335,7 +1335,7 @@ process_postop (Slapi_PBlock *pb)

 			{

 				slapi_log_err(SLAPI_LOG_ERR, repl_plugin_name,

 					"process_postop - Failed to apply update (%s) error (%d).  "

-					"Aborting replication session(conn=%" NSPRIu64 " op=%d)\n",

+					"Aborting replication session(conn=%" PRIu64 " op=%d)\n",

 					csn_as_string(opcsn, PR_FALSE, csn_str), retval,

 					connid, opid);

 				/*

diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c

index 5718a98..a106f8b 100644

--- a/ldap/servers/plugins/replication/repl5_replica.c

+++ b/ldap/servers/plugins/replication/repl5_replica.c

@@ -596,7 +596,7 @@ replica_get_exclusive_access(Replica *r, PRBool *isInc, PRUint64 connid, int opi

 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

 				"replica_get_exclusive_access - "

-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": "

+				"conn=%" PRIu64 " op=%d repl=\"%s\": "

 				"Replica in use locking_purl=%s\n",

 				connid, opid,

 				slapi_sdn_get_dn(r->repl_root),

@@ -620,7 +620,7 @@ replica_get_exclusive_access(Replica *r, PRBool *isInc, PRUint64 connid, int opi

 	{

         slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

         		"replica_get_exclusive_access - "

-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": Acquired replica\n",

+				"conn=%" PRIu64 " op=%d repl=\"%s\": Acquired replica\n",

 				connid, opid,

 				slapi_sdn_get_dn(r->repl_root));

 		r->repl_state_flags |= REPLICA_IN_USE;

@@ -664,13 +664,13 @@ replica_relinquish_exclusive_access(Replica *r, PRUint64 connid, int opid)

 	{

 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

 				"replica_relinquish_exclusive_access - "

-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": "

+				"conn=%" PRIu64 " op=%d repl=\"%s\": "

 				"Replica not in use\n",

 				connid, opid, slapi_sdn_get_dn(r->repl_root));

 	} else {

 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

 				"replica_relinquish_exclusive_access - "

-				"conn=%" NSPRIu64 " op=%d repl=\"%s\": "

+				"conn=%" PRIu64 " op=%d repl=\"%s\": "

 				"Released replica held by locking_purl=%s\n",

 				connid, opid,

 				slapi_sdn_get_dn(r->repl_root),	r->locking_purl);

diff --git a/ldap/servers/plugins/replication/repl5_total.c b/ldap/servers/plugins/replication/repl5_total.c

index af570a8..064a099 100644

--- a/ldap/servers/plugins/replication/repl5_total.c

+++ b/ldap/servers/plugins/replication/repl5_total.c

@@ -853,7 +853,7 @@ multimaster_extop_NSDS50ReplicationEntry(Slapi_PBlock  *pb)

            const char *dn = slapi_entry_get_dn_const(e);

            slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

                    "multimaster_extop_NSDS50ReplicationEntry - "

-                   "Error %d: could not import entry dn %s for total update operation conn=%" NSPRIu64 " op=%d\n",

+                   "Error %d: could not import entry dn %s for total update operation conn=%" PRIu64 " op=%d\n",

                    rc, dn, connid, opid);

 		   rc = -1;

 	   }

@@ -864,7 +864,7 @@ multimaster_extop_NSDS50ReplicationEntry(Slapi_PBlock  *pb)

 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

 				"multimaster_extop_NSDS50ReplicationEntry - "

 				"Error %d: could not decode the total update extop "

-				"for total update operation conn=%" NSPRIu64 " op=%d\n",

+				"for total update operation conn=%" PRIu64 " op=%d\n",

 				rc, connid, opid);

 	}

diff --git a/ldap/servers/plugins/replication/repl_connext.c b/ldap/servers/plugins/replication/repl_connext.c

index 29dc2a7..ba0fa15 100644

--- a/ldap/servers/plugins/replication/repl_connext.c

+++ b/ldap/servers/plugins/replication/repl_connext.c

@@ -84,7 +84,7 @@ void consumer_connection_extension_destructor (void *ext, void *object, void *pa

 					slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

 							"consumer_connection_extension_destructor - "

 							"Aborting total update in progress for replicated "

-							"area %s connid=%" NSPRIu64 "\n", slapi_sdn_get_dn(repl_root_sdn), connid);

+							"area %s connid=%" PRIu64 "\n", slapi_sdn_get_dn(repl_root_sdn), connid);

 					slapi_stop_bulk_import(pb);

 				}

 				else

@@ -156,7 +156,7 @@ consumer_connection_extension_acquire_exclusive_access(void* conn, PRUint64 conn

             ret = connext;

             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

             		"consumer_connection_extension_acquire_exclusive_access - "

-                    "conn=%" NSPRIu64 " op=%d Acquired consumer connection extension\n",

+                    "conn=%" PRIu64 " op=%d Acquired consumer connection extension\n",

                     connid, opid);

         }

         else if (opid == connext->in_use_opid)

@@ -164,14 +164,14 @@ consumer_connection_extension_acquire_exclusive_access(void* conn, PRUint64 conn

             ret = connext;

             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

             		"consumer_connection_extension_acquire_exclusive_access - "

-                    "conn=%" NSPRIu64 " op=%d Reacquired consumer connection extension\n",

+                    "conn=%" PRIu64 " op=%d Reacquired consumer connection extension\n",

                     connid, opid);

         }

         else

         {

             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

             		"consumer_connection_extension_acquire_exclusive_access - "

-                    "conn=%" NSPRIu64 " op=%d Could not acquire consumer connection extension; it is in use by op=%d\n",

+                    "conn=%" PRIu64 " op=%d Could not acquire consumer connection extension; it is in use by op=%d\n",

                     connid, opid, connext->in_use_opid);

         }

@@ -182,7 +182,7 @@ consumer_connection_extension_acquire_exclusive_access(void* conn, PRUint64 conn

     {

         slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

         		"consumer_connection_extension_acquire_exclusive_access - "

-                "conn=%" NSPRIu64 " op=%d Could not acquire consumer extension, it is NULL!\n",

+                "conn=%" PRIu64 " op=%d Could not acquire consumer extension, it is NULL!\n",

                 connid, opid);

     }

@@ -221,7 +221,7 @@ consumer_connection_extension_relinquish_exclusive_access(void* conn, PRUint64 c

         {

             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

             		"consumer_connection_extension_relinquish_exclusive_access - "

-                    "conn=%" NSPRIu64 " op=%d Consumer connection extension is not in use\n",

+                    "conn=%" PRIu64 " op=%d Consumer connection extension is not in use\n",

                     connid, opid);

             ret = 2;

         }

@@ -230,7 +230,7 @@ consumer_connection_extension_relinquish_exclusive_access(void* conn, PRUint64 c

             /* step 4, relinquish it (normal) */

             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

             		"consumer_connection_extension_relinquish_exclusive_access - "

-                    "conn=%" NSPRIu64 " op=%d Relinquishing consumer connection extension\n",

+                    "conn=%" PRIu64 " op=%d Relinquishing consumer connection extension\n",

                     connid, opid);

             connext->in_use_opid = -1;

             ret = 1;

@@ -240,7 +240,7 @@ consumer_connection_extension_relinquish_exclusive_access(void* conn, PRUint64 c

             /* step 4, relinquish it (forced) */

             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

             		"consumer_connection_extension_relinquish_exclusive_access - "

-                    "conn=%" NSPRIu64 " op=%d Forced to relinquish consumer connection extension held by op=%d\n",

+                    "conn=%" PRIu64 " op=%d Forced to relinquish consumer connection extension held by op=%d\n",

                     connid, opid, connext->in_use_opid);

             connext->in_use_opid = -1;

             ret = 1;

@@ -249,7 +249,7 @@ consumer_connection_extension_relinquish_exclusive_access(void* conn, PRUint64 c

         {

             slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

             		"consumer_connection_extension_relinquish_exclusive_access - "

-                    "conn=%" NSPRIu64 " op=%d Not relinquishing consumer connection extension, it is held by op=%d!\n",

+                    "conn=%" PRIu64 " op=%d Not relinquishing consumer connection extension, it is held by op=%d!\n",

                     connid, opid, connext->in_use_opid);

         }

@@ -260,7 +260,7 @@ consumer_connection_extension_relinquish_exclusive_access(void* conn, PRUint64 c

     {

         slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

         		"consumer_connection_extension_relinquish_exclusive_access - "

-                "conn=%" NSPRIu64 " op=%d Could not relinquish consumer extension, it is NULL!\n",

+                "conn=%" PRIu64 " op=%d Could not relinquish consumer extension, it is NULL!\n",

                 connid, opid);

     }

diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c

index 80580f9..412caec 100644

--- a/ldap/servers/plugins/replication/repl_extop.c

+++ b/ldap/servers/plugins/replication/repl_extop.c

@@ -668,7 +668,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)

 		connext->repl_protocol_version = REPL_PROTOCOL_50_INCREMENTAL;

 		slapi_log_err(SLAPI_LOG_REPL, repl_plugin_name,

 			"multimaster_extop_StartNSDS50ReplicationRequest - "

-			"conn=%" NSPRIu64 " op=%d repl=\"%s\": Begin incremental protocol\n",

+			"conn=%" PRIu64 " op=%d repl=\"%s\": Begin incremental protocol\n",

 			connid, opid, repl_root);

 		isInc = PR_TRUE;

 	}

@@ -695,7 +695,7 @@ multimaster_extop_StartNSDS50ReplicationRequest(Slapi_PBlock *pb)