Index: /trunk/server/fedora/config/etc/nagios/check_ldap_mmr
===================================================================
--- /trunk/server/fedora/config/etc/nagios/check_ldap_mmr	(revision 1669)
+++ /trunk/server/fedora/config/etc/nagios/check_ldap_mmr	(revision 1670)
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /usr/bin/sudo -u signup /etc/nagios/check_ldap_mmr.real
+exec /usr/bin/sudo -u signup USE_NEWLINES=$USE_NEWLINES /etc/nagios/check_ldap_mmr.real
Index: /trunk/server/fedora/config/etc/nagios/check_ldap_mmr.real
===================================================================
--- /trunk/server/fedora/config/etc/nagios/check_ldap_mmr.real	(revision 1669)
+++ /trunk/server/fedora/config/etc/nagios/check_ldap_mmr.real	(revision 1670)
@@ -6,4 +6,7 @@
 use Net::LDAP;
 use strict;
+
+my $nl  = $ENV{'USE_NEWLINES'} ? "\n" : "";
+my $tab = $ENV{'USE_NEWLINES'} ? "  " : "";
 
 # Nagios codes
@@ -25,5 +28,5 @@
 my $replicaErrors = 0;
 my $conflictErrors = 0;
-my $errorstring = "Replication error(s): ";
+my $errorstring = "Replication error(s): $nl";
 foreach my $entr ( @entries ) {
     my $servername=$entr->get_value($server);
@@ -35,6 +38,6 @@
     $serverlaststart =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
     $serverlastend =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
-    print "Replication to $servername last operation $serverlaststart ";
-    print "Status: $serverstatus.     ";
+    print "Replication to $servername last operation $serverlaststart $nl";
+    print $tab . "Status: $serverstatus.     $nl";
     if ($statuscode) {
         $replicaErrors++;
@@ -42,4 +45,5 @@
     }
 }
+print "$nl";
 
 $result=LDAPSearch($ldap,"nsds5ReplConflict=*",["nsds5ReplConflict"],$replicatedBase);
@@ -48,9 +52,10 @@
     my $conflictingDN=$entr->dn();
     my $conflictDesc=$entr->get_value("nsds5ReplConflict");
-    print "Conflict found for DN $conflictingDN ";
-    print "Reason: $conflictDesc.     ";
+    print "Conflict found for DN $conflictingDN $nl";
+    print $tab . "Reason: $conflictDesc.     $nl";
     $conflictErrors++;
     $errorstring = $errorstring . $conflictDesc . ", ";
 }
+print "$nl";
 
 if ($conflictErrors > 0) {