From 7cb52179b891061803869b21c1000aa35a51e27c Mon Sep 17 00:00:00 2001

From: Mark Reynolds <mreynolds@redhat.com>

Date: Mon, 14 Oct 2013 13:13:24 -0400

Subject: [PATCH 181/225] Ticket 47538 - RFE: repl-monitor.pl plain text

 output, cmdline config options

RFE Description:  Request option to print report in plain text(instead of HTML), and

                  be able to add the configfuration file directives as command line

                  options.

Fix Description:  Add a new option "-s" for displaying plain text report.

                  Added new options for the config file directives:

                      -c "connection value"

                      -a "alias value"

                      -k "color value"

                  Added a new option (-W, --prompt) to prompt for passwords.

                  Added "long names" to the commandline options.

                  Updated to use:  GetOpts::Long, strict, warnings

                  Cleaned up some HTML code/colors, and indentation.

                  Update man page.

https://fedorahosted.org/389/ticket/47538

Reviewed by: nhosoi, nkinder, and rmeggins(Thanks!!!)

(cherry picked from commit 76abd736d3bf763cc0e7bc1987fe76c27159db6f)

(cherry picked from commit dae03f042334ede551a6c1972e2163a2f923f352)

---

 ldap/admin/src/scripts/repl-monitor.pl.in | 576 ++++++++++++++++++++----------

 man/man1/repl-monitor.1                   |  35 +-

 2 files changed, 415 insertions(+), 196 deletions(-)

diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in b/ldap/admin/src/scripts/repl-monitor.pl.in

index 8839ed2..45d58a1 100755

--- a/ldap/admin/src/scripts/repl-monitor.pl.in

+++ b/ldap/admin/src/scripts/repl-monitor.pl.in

@@ -41,8 +41,9 @@

 # FILE: repl-monitor.pl

 #

 # SYNOPSIS:

-#    repl-monitor.pl -f configuration-file [-h host] [-p port] [-r]

-#                    [-u refresh-url] [-t refresh-interval]

+#    repl-monitor.pl [-f configuration-file] [-h host] [-p port] [-r]

+#                    [-c connection] [-a alias] [-k color] [-u refresh-url] 

+#                    [-t refresh-interval] [-s] [-W]

 #

 #    repl-monitor.pl -v

 #

@@ -111,6 +112,22 @@

 #   If the color section or color entry is missing, the default color

 #   set is: green for [0-5) minutes lag, yellow [5-60), and red 60 and more.

 #

+#   The following three options (-c, -a, -k) are used if not providing a 

+#   configuration file:

+#

+#    -c connection

+#       The connection value is the same as the configuration file value(see above):

+#           -c "host:port:binddn:bindpwd:bindcert"

+#

+#    -a alias

+#       The alias value is the same as the configuration file value(see above):

+#           -a "alias=host:port"

+#

+#    -k color

+#       The color value is written as "lowmark:color".  Where the lowmark is in minutes.

+#       This option is ignored if printing a plain text report.

+#           -k "5=#ccffcc"

+#       

 #    -h host

 #       Initial replication supplier's host. Default to the current host.

 #

@@ -132,6 +149,10 @@

 #       the output HTML file would automatically refresh itself. This

 #       is useful for continuing monitoring. See also option -t.

 #

+#    -s Print output in plain text, instead of HTML.

+#

+#    -W Prompt for connection passwords.

+#

 #    -v Print out the version of this script

 # 

 # DIAGNOSTICS:

@@ -156,11 +177,17 @@

 # If using this script standalone, be sure to set the shared lib path and

 # the path to the perldap modules.

+use strict;

+use warnings;

 use lib qw(@perlpath@);

-$usage = "\nusage: $0 -f configuration-file [-h host] [-p port] [-r] [-u refresh-url] [-t refresh-interval]\n\nor   : $0 -v\n"; 

+my $usage = "\nusage: $0 [-f configuration-file | --configfile configuration-file] " .

+         "[-c connection, --conn connection] [-a alias, --alias alias] [-k color, --color color] " . 

+         "[-h host, --host host] [-p port, --port port] [-r, --skip-header] [-s, --text] " .

+         "[-u refresh-url, --url refresh-url] [-t refresh-interval, --interval refresh-interval ] " .

+         "[-W, --prompt]\n\nor   : $0 -v | --version\n"; 

-use Getopt::Std;		# parse command line arguments

+use Getopt::Long;		# parse command line arguments

 use Mozilla::LDAP::Conn;	# LDAP module for Perl

 use Mozilla::LDAP::Utils qw(normalizeDN);	# LULU, utilities.

 use Mozilla::LDAP::API qw(:api :ssl :apiv3 :constant); # Direct access to C API

@@ -169,29 +196,43 @@ use Time::Local; # to convert GMT Z strings to localtime

 #

 # Global variables

 #

-$product = "Directory Server Replication Monitor";

-$version = "Version 1.0";

+my $product = "Directory Server Replication Monitor";

+my $version = "Version 1.1";

 #

 # ldap servers given or discovered from the replication agreements:

-# @servers		= (host:port=shadowport:binddn:password:cert_db)

+my @servers; # = (host:port=shadowport:binddn:password:cert_db)

+my $serveridx;

 #

 # entries read from the connection section of the configuration file:

-# @allconnections	= (host:port=shadowport:binddn:password:cert_db)

+my @allconnections; # = (host:port=shadowport:binddn:password:cert_db)

 #

 # aliases of ldap servers read from the configuration file:

-# %allaliases{$host:$port}= (alias)

+my %allaliases; # = {$host:$port} = (alias)

+# colors

+my %allcolors;

+my @colorkeys;

+

 #

 # replicas discovered on all ldap servers

-# @allreplicas		= (server#:replicaroot:replicatype:serverid:replicadn)

+my @allreplicas; # = (server#:replicaroot:replicatype:serverid:replicadn)

 #

 # ruvs retrieved from all replicas

-# @allruvs{replica#:masterid} = (rawcsn:decimalcsn;mon/day/year hh:mi:ss)

+my %allruvs; # = {replica#:masterid} = (rawcsn:decimalcsn;mon/day/year hh:mi:ss)

 #

 # agreements discovered on all ldap supplier servers:

-# @allagreements	= (supplier_replica#:consumer#:conntype:schedule:status)

+my @allagreements; # = (supplier_replica#:consumer#:conntype:schedule:status)

 # the array may take another format after the consumer replicas are located:

-# @allagreements	= (supplier_replica#:consumer_replica#:conntype:schedule:status)

+# @allagreements; # = (supplier_replica#:consumer_replica#:conntype:schedule:status)

+#

+my %ld; # ldap connection hash

 #

+my ($opt_f, $opt_h, $opt_p, $opt_u, $opt_t, $opt_r, $opt_s);

+my (@conns, @alias, @color);

+my ($section, $interval, $nowraw, $now, $mm, $dd, $tt, $yy, $wday);

+my ($fn, $rc, $prompt, $last_sidx);

+my %passwords = ();

+my $passwd = "";

+$prompt = "";

 #main

 {

@@ -199,15 +240,23 @@ $version = "Version 1.0";

 	$| = 1;

 	# Check for legal options

-	if (!getopts('h:p:f:ru:t:v')) {

-		print $usage;

-		exit -1;

-  	}

-

-	if ($opt_v) {

-		print "$product - $version\n";

-		exit;

-	}

+  	GetOptions(

+		'h|host=s' => \$opt_h,

+		'p|port=s' => \$opt_p,

+		'f|configfile=s' => \$opt_f,

+		'c|conn=s' => \@conns,

+		'a|alias=s' => \@alias,

+		'k|color=s' => \@color,

+		'u|url=s' => \$opt_u,

+		't|interval=s' => \$opt_t,

+		'W|prompt' => sub { $prompt = "yes"; },

+		'r|skip-header' => sub { $opt_r = "1"; },

+		's|text' => sub {$opt_s = "1"; },

+		'v|version' => sub { print "$product - $version\n"; exit ;}

+	) or die "Usage error: $usage\n";

+

+	exit -1 if &validateArgs < 0;

+	exit if &read_cfg_file ($opt_f) < 0;

 	$interval = $opt_t;

 	$interval = 300 if ( !$interval || $interval <= 0 );

@@ -221,22 +270,23 @@ $version = "Version 1.0";

 	if (!$opt_r) {

 		# print the HTML header

 		&print_html_header;

-	} else {

-		# print separator for new replication set

-		print "

\n";

+	} else  {

+		if($opt_s){

+			print"\n";

+		} else {

+			# print separator for new replication set

+			print "

\n";

+		}

 	}

-	exit -1 if &validateArgs < 0;

-	exit if &read_cfg_file ($opt_f) < 0;

-

 	# Start with the given host and port

 	# The index names in %ld are defined in Mozilla::LDAP::Utils::ldapArgs()

 	&add_server ("$ld{host}:$ld{port}:$ld{bind}:$ld{pswd}:$ld{cert}");

 	$serveridx = 0;

-	while ($serveridx <= $#servers) {

+	while ($serveridx <= $#servers) { 

 		if (&get_replicas ($serveridx) != 0 && $serveridx == 0) {

-			my ($host, $port, $binddn) = split (/:/, $servers[0]);

+			my ($host, $port, $binddn) = split (/:/, $servers[$serveridx]);

 			print("Login to $host:$port as \"$binddn\" failed\n");

 			exit;

 		}

@@ -253,14 +303,19 @@ $version = "Version 1.0";

 sub validateArgs

 {

-	my ($rc) = 0;

+	$rc = 0;

 	%ld = Mozilla::LDAP::Utils::ldapArgs();

-

-	if (!$opt_v && !$opt_f) {

-		print "
Error: Missing configuration file.\n";

-		print "
If you need help on the configuration file, Please go back and click the Help button.\n";

-		#print $usage;	# Don't show usage in CGI

+	if (!$opt_f && $#conns < 0) {

+		if($opt_s){

+			print "Error: Missing configuration file or connection parameter.\n";

+			print $usage;  

+		} else {

+			print "
Error: Missing configuration file or connection paramater.\n";

+			print "
If you need help on the configuration file, or script usage, " .

+			"Please go back and click the Help button.\n";

+			#print $usage; # Don't show usage in CGI

+		}

 		$rc = -1;

 	}

 	elsif (!$opt_h) {

@@ -272,63 +327,90 @@ sub validateArgs

 sub read_cfg_file

 {

-	my ($fn) = @_;

-	unless (open(CFGFILEHANDLE, $fn)) {

-		print "
Error: Can't open \"$fn\": $!.\n";

-		print "
If you need help on the configuration file, Please go back and click the Help button.\n";

-		return -1;

+	($fn) = @_;

+	my $tmp;

+	

+	# process the command line config params

+	@allconnections = @conns;

+	if($#alias >= 0){

+		foreach $tmp (@alias){

+			$tmp =~ m/^\s*(\S.*)\s*=\s*(\S+)/;

+			$allaliases{$2} = $1;

+		}

 	}

-	$section = 0;

-	while (<CFGFILEHANDLE>) {

-		next if (/^\s*\#/ || /^\s*$/);

-		chop ($_);

-		if (m/^\[(.*)\]/) {

-			$section = $1;

+	if($#color >= 0){

+		foreach $tmp (@color){

+			$tmp =~ m/^\s*(-?\d+)\s*=\s*(\S+)/;

+			$allcolors{$1} = $2;

 		}

-		else {

-			if ( $section =~ /conn/i ) {

-				push (@allconnections, $_);

-			}

-			elsif ( $section =~ /alias/i ) {

-				m/^\s*(\S.*)\s*=\s*(\S+)/;

-				$allaliases {$2} = $1;

-			}

-			elsif ( $section =~ /color/i ) {

-				m/^\s*(-?\d+)\s*=\s*(\S+)/;

-				$allcolors {$1} = $2;

+	}

+	

+	if($opt_f){

+		unless (open(CFGFILEHANDLE, $fn)) {

+			if($opt_s){

+				print "Error: Can't open configuration file\"$fn\": $!.\n";

+			} else {

+				print "
Error: Can't open configuration file\"$fn\": $!.\n";

+				print "
If you need help on the configuration file, Please go back and click the Help button.\n";

 			}

-		}

+    			return -1;

+    		}

+    		$section = 0;

+    		while (<CFGFILEHANDLE>) {

+    			next if (/^\s*\#/ || /^\s*$/);

+			chop ($_);

+    		if (m/^\[(.*)\]/) {

+    			$section = $1;

+    		}

+    		else {

+    			if ( $section =~ /conn/i ) {

+    				push (@allconnections, $_);

+    			}

+    			elsif ( $section =~ /alias/i ) {

+    				m/^\s*(\S.*)\s*=\s*(\S+)/;

+    				$allaliases {$2} = $1;

+    			}

+    			elsif ( $section =~ /color/i ) {

+    				m/^\s*(-?\d+)\s*=\s*(\S+)/;

+    				$allcolors {$1} = $2;

+    			}

+    		}

+    	}

+    	close (CFGFILEHANDLE);

 	}

 	if ( ! keys (%allcolors) ) {

-		$allcolors {0} = "#ccffcc";	#apple green

-		$allcolors {5} = "#ffffcc";	#cream yellow

-		$allcolors {60} = "#ffcccc";	#pale pink

+		$allcolors {0} = "#ccffcc"; #apple green

+		$allcolors {5} = "#ffffcc"; #cream yellow

+		$allcolors {60} = "#ffcccc"; #pale pink

 	}

 	@colorkeys = sort (keys (%allcolors));

-	close (CFGFILEHANDLE);

+    

 	return 0;

 }

 sub get_replicas

 {

-	my ($serveridx) = @_;

+	$serveridx = $_[0];

 	my ($conn, $host, $port, $shadowport, $binddn, $bindpwd, $bindcert);

 	my ($others);

 	my ($replica, $replicadn);

 	my ($ruv, $replicaroot, $replicatype, $serverid, $masterid, $maxcsn);

 	my ($type, $flag, $i);

 	my ($myridx, $ridx, $cidx);

+	my ($lastmodifiedat, $agreement);

 	#

 	# Bind to the server

 	#

-	($host, $port, $binddn, $bindpwd, $bindcert) = split (/:/, "$servers[$serveridx]", 5);

+	if($#servers < 0 || $serveridx > $#servers + 1){

+		return -1;

+	}

+	($host, $port, $binddn, $bindpwd, $bindcert) = split (/:/, "$servers[$serveridx]", 5);

 	($port, $shadowport) = split (/=/, $port);

 	$shadowport = $port if !$shadowport;

 	$conn = new Mozilla::LDAP::Conn ($host, $shadowport, "$binddn", $bindpwd, $bindcert);

-

 	return -1 if (!$conn);

 	#

@@ -508,24 +590,21 @@ sub find_consumer_replicas

 sub process_suppliers

 {

-	my ($ridx, $mid, $maxcsn);

-

-	$mid = "";

+	my ($ridx, $mid, $maxcsn, $ismaster);

 	$ismaster = 0;

+	$mid = "";

 	$last_sidx = -1;	# global variable for print html page

 	for ($ridx = 0; $ridx <= $#allreplicas; $ridx++) {

-

 		# Handle masters and hubs

 		if ($allreplicas[$ridx] =~ /:master:(\d+):/i) {

 			$mid = $1;

 			# Skip replicas without agreements defined yet

 			next if (! grep {$_->{ridx} == $ridx} @allagreements);

-

 			$maxcsn = &print_master_header ($ridx, $mid);

-			if ( "$maxcsn" != "none" ) {

+			if ( "$maxcsn" ne "none" ) {

 				&print_consumer_header ();

 				&print_consumers ($ridx, $mid);

 			}

@@ -536,7 +615,7 @@ sub process_suppliers

 			# Skip replicas without agreements defined yet

 			next if (! grep {$_->{ridx} == $ridx} @allagreements);

-		    foreach $key (keys %allruvs) {

+		    foreach my $key (keys %allruvs) {

 				if ( $key =~ /$ridx:/) {

 					my ($myridx, $mymid) = split ( /:/, "$key" );

 					$maxcsn = &print_hub_header($myridx, $mymid);

@@ -549,7 +628,11 @@ sub process_suppliers

 	}

 	if ($mid eq "") {

-		print "
The server is not a master or a hub or it has no replication agreement\n";

+		if($opt_s){

+			print "The server is not a master or a hub or it has no replication agreement\n";

+		} else {

+			print "
The server is not a master or a hub or it has no replication agreement\n";

+		}

 	}

 }

@@ -560,34 +643,40 @@ sub print_master_header

 	my ($maxcsnval) = split ( /;/, "$myruv" );

 	my ($maxcsn) = &to_string_csn ($maxcsnval);

 	my ($sidx, $replicaroot, $replicatype, $serverid) = split (/:/, $allreplicas[$ridx]);

-

-	if ( $maxcsn == "" ) {

+    

+	if ( $maxcsn eq "" ) {

 		return $maxcsn;

 	}

 	# Print the master name

-	if ( $last_sidx != $sidx ) {

+	if ( $last_sidx ne $sidx ) {

 		my ($ldapurl) = &get_ldap_url ($sidx, $sidx);

 		&print_legend if ( $last_sidx < 0);

-		print "
\n";

-		print "\n
<center class=page-subtitle><font color=#0099cc>\n";

-		print "Master:&nbsp $ldapurl</center>\n";

+		if($opt_s){

+			print "Master: $ldapurl\n"

+		} else {

+			print "
\n";

+			print "\n
<center class=page-subtitle><font color=#0099cc>\n";

+			print "Master:&nbsp $ldapurl</center>\n";

+		}

 		$last_sidx = $sidx;

 	}

 	# Print the current replica info onthe master

-	print "\n
\n";

-

-	print "\n<center>\n";

-	print "<font class=areatitle>Replica ID: </font>";

-	print "<font class=text28>$serverid</font>\n";

-

-	print "<font class=areatitle>Replica Root: </font>";

-	print "<font class=text28>$replicaroot</font>\n";

-

-	print "<font class=areatitle>Max CSN: </font>";

-	print "<font class=text28>$maxcsn</font>\n";

-

+	if($opt_s){

+		print "Replica ID: $serverid\n";

+		print "Replica Root: $replicaroot\n";

+		print "Max CSN: $maxcsn\n";

+	} else {

+		print "\n
\n";

+		print "\n<center>\n";

+		print "<font class=areatitle>Replica ID: </font>";

+		print "<font class=text28>$serverid</font>\n";

+		print "<font class=areatitle>Replica Root: </font>";

+		print "<font class=text28>$replicaroot</font>\n";

+		print "<font class=areatitle>Max CSN: </font>";

+		print "<font class=text28>$maxcsn</font>\n";

+	}

 	return $maxcsn;

 }

@@ -597,36 +686,44 @@ sub print_hub_header

 	my ($myruv) = $allruvs {"$ridx:$mid"};

 	my ($maxcsnval) = split ( /;/, "$myruv" );

 	my ($maxcsn) = &to_string_csn ($maxcsnval);

-	my ($sidx, $replicaroot, $replicatype, $serverid) = split (/:/, $allreplicas[$ridx]);

+	my ($sidx, $last_sidx, $replicaroot, $replicatype, $serverid) = split (/:/, $allreplicas[$ridx]);

 	# Print the master name

 	if ( $last_sidx != $sidx ) {

 		my ($ldapurl) = &get_ldap_url ($sidx, $sidx);

 		&print_legend if ( $last_sidx < 0);

-		print "
\n";

-		print "\n
<center class=page-subtitle><font color=#0099cc>\n";

-		print "Hub:&nbsp $ldapurl</center>\n";

+		if($opt_s){

+			print "Hub: $ldapurl\n";

+		} else {

+			print "
\n";

+			print "\n
<center class=page-subtitle><font color=#0099cc>\n";

+			print "Hub:&nbsp $ldapurl</center>\n";

+		}

 		$last_sidx = $sidx;

 	}

 	# Print the current replica info onthe master

-	print "\n
\n";

-

-	print "\n<center>\n";

-	print "<font class=areatitle>Replica ID: </font>";

-	print "<font class=text28>$serverid</font>\n";

-

-	print "<font class=areatitle>Replica Root: </font>";

-	print "<font class=text28>$replicaroot</font>\n";

-

-	print "<font class=areatitle>Max CSN: </font>";

-	print "<font class=text28>$maxcsn</font>\n";

-

+	if($opt_s){

+		print "Replica ID: $serverid\n";

+		print "Replica Root: $replicaroot\n";

+		print "Max CSN: $maxcsn\n";

+	} else {

+		print "\n
\n";

+		print "\n<center>\n";

+		print "<font class=areatitle>Replica ID: </font>";

+		print "<font class=text28>$serverid</font>\n";

+		print "<font class=areatitle>Replica Root: </font>";

+		print "<font class=text28>$replicaroot</font>\n";

+		print "<font class=areatitle>Max CSN: </font>";

+		print "<font class=text28>$maxcsn</font>\n";

+	}

 	return $maxcsn;

 }

 sub print_consumer_header

 {

+	if($opt_s) { return; } # we'll do the text printing in "print_consumers"

+	

 	#Print the header of consumer

 	print "\n\n";

 	print "Receiver\n";

@@ -648,15 +745,16 @@ sub print_consumers

 	my ($m_ridx, $mid) = @_;

 	my ($ignore, $m_replicaroot) = split (/:/, $allreplicas[$m_ridx]);

 	my (@consumers, @ouragreements, @myagreements);

-	my ($s_ridx, $c_ridx, $conntype, $schedule, $status);

-	my ($c_maxcsn_str, $lag, $markcolor);

+	my ($s_ridx, $c_ridx, $s_sidx, $conntype, $schedule, $status);

+	my ($c_maxcsn, $c_maxcsn_str, $c_lastmodified, $c_sidx, $lag, $markcolor);

 	my ($c_replicaroot, $c_replicatype);

-	my ($first_entry);

+	my ($first_entry, $s_ldapurl, $c_ldapurl);

 	my ($nrows);

 	my ($found);

 	undef @ouragreements;

-

+	$c_lastmodified = "";

+    

 	# Collect all the consumer replicas for the current master replica

 	push (@consumers, $m_ridx);

 	foreach (@consumers) {

@@ -688,7 +786,7 @@ sub print_consumers

 			$myruv = $allruvs {"$c_ridx:$mid"};

 			($c_maxcsn, $c_lastmodified) = split ( /;/, "$myruv" );

 			($c_maxcsn_str, $lag, $markcolor) = &cacl_time_lag ($m_maxcsn, $c_maxcsn);

-			$c_maxcsn_str =~ s/ /\<br\>/;

+			if(!$opt_s){ $c_maxcsn_str =~ s/ /\<br\>/; }

 			($c_sidx, $c_replicaroot, $c_replicatype) = split (/:/, $allreplicas[$c_ridx]);

 			$c_replicaroot = "same as master" if $m_replicaroot eq $c_replicaroot;

 		}

@@ -697,7 +795,7 @@ sub print_consumers

 			$c_sidx = -$c_ridx;

 			$c_maxcsn_str = "_";

 			$lag = "n/a";

-			$markcolor = red;

+			$markcolor = "red";

 			$c_replicaroot = "_";

 			$c_replicatype = "_";

 		}

@@ -719,16 +817,27 @@ sub print_consumers

 			$s_ldapurl = &get_ldap_url ($s_sidx, "n/a");

 			# Print out the consumer's replica and ruvs

-			print "\n\n";

+			if(!$opt_s){ print "\n\n"; }

 			if ($first_entry) {

 				$first_entry = 0;

 				$c_ldapurl = &get_ldap_url ($c_sidx, $conntype);

-				print "$c_ldapurl
Type: $c_replicatype\n";

-				print "<center>$lag</center>\n";

-				print "$c_maxcsn_str\n";

-				print "$c_lastmodified\n";

+				if($opt_s){

+					print "Receiver: $c_ldapurl\nType: $c_replicatype\n";

+					print "Time Lag: $lag\n";

+					print "Max CSN: $c_maxcsn_str\n";

+					print "Last Modify Time: $c_lastmodified\n";

+				} else {

+					print "$c_ldapurl
Type: $c_replicatype\n";

+					print "<center>$lag</center>\n";

+					print "$c_maxcsn_str\n";

+					print "$c_lastmodified\n";

+				}

+			}

+			if($opt_s){ 

+				print "Supplier: $s_ldapurl\n";

+			} else {

+				print "<center>$s_ldapurl</center>\n";

 			}

-			print "<center>$s_ldapurl</center>\n";

 			my $changecount = $_->{nsds5replicaChangesSentSinceStartup};

 			if ( $changecount =~ /^$mid:(\d+)\/(\d+) / || $changecount =~ / $mid:(\d+)\/(\d+) / ) {

 				$changecount = "$1 / $2";

@@ -739,7 +848,11 @@ sub print_consumers

 			else {

 				$changecount = "0 / 0";

 			}

-			print "$changecount\n";       

+			if($opt_s){

+				print "Sent/Skipped: $changecount\n";

+			} else {

+				print "$changecount\n";

+			}   

 			my $redfontstart = "";

 			my $redfontend = "";

 			if ($status =~ /error/i) {

@@ -753,22 +866,44 @@ sub print_consumers

 					$redfontend = "</font>";

 				}

 			}

-			print "$redfontstart$status$redfontend\n";

-			print "", &format_z_time($_->{nsds5replicaLastUpdateStart}), "\n";

-			print "", &format_z_time($_->{nsds5replicaLastUpdateEnd}), "\n";

+			if($opt_s){

+				print "Update Status: $status\n";

+				print "Update Started: ", &format_z_time($_->{nsds5replicaLastUpdateStart}), "\n";

+				print "Update Ended: ", &format_z_time($_->{nsds5replicaLastUpdateEnd}), "\n";			

+			} else {

+				print "$redfontstart$status$redfontend\n";

+				print "", &format_z_time($_->{nsds5replicaLastUpdateStart}), "\n";

+				print "", &format_z_time($_->{nsds5replicaLastUpdateEnd}), "\n";

+			}

 			if ( $schedule =~ /always/i ) {

-				print "$schedule\n";

+				if($opt_s){

+					print "Schedule: $schedule\n";

+				} else {

+					print "$schedule\n";

+				}

 			}

 			else {

 				my ($ndays, @days);

 				$schedule =~ /(\d\d)(\d\d)-(\d\d)(\d\d) (\d+)/;

-				print "$1:$2-$3:$4\n";

+				if($opt_s){

+				    print "Schedule: $1:$2-$3:$4 ";

+				} else {

+				    print "$1:$2-$3:$4\n";

+				}

 				$ndays = $5;

 				$ndays =~ s/(\d)/$1,/g;

-				@days = (Sun,Mon,Tue,Wed,Thu,Fri,Sat)[eval $ndays];

-				print "@days\n";

+				@days = ("Sun","Mon","Tue","Wed","Thu","Fri","Sat")[eval $ndays];

+				if($opt_s){

+				    print "@days\n";

+				} else {

+				    print "@days\n";

+				}

+			}

+			if($opt_s){

+				print "SSL: $conntype\n";

+			} else {

+				print "$conntype\n";

 			}

-			print "$conntype\n";

 		}

 	}

 }

@@ -778,7 +913,7 @@ sub cacl_time_lag

 	my ($s_maxcsn, $c_maxcsn) = @_;

 	my ($markcolor);

 	my ($csn_str);

-	my ($s_tm, $c_tm, $lag_tm, $lag_str, $hours, $minute);

+	my ($s_tm, $c_tm, $lag_tm, $lag_str, $hours, $minutes);

 	$csn_str = &to_string_csn ($c_maxcsn);

@@ -831,7 +966,7 @@ sub cacl_time_lag

 #

 sub add_server

 {

-	my ($host, $port, $binddn, $bindpwd, $bindcert) = split (/:/, "@_");

+	my ($host, $port, $binddn, $bindpwd, $bindcert) = split (/:/, "$_[0]");

 	my ($shadowport) = $port;

 	my ($domainpattern) = '\.[^:]+';

 	my ($i);

@@ -846,7 +981,7 @@ sub add_server

 	$hostnode = $1 if $host =~ /^(.+?)\./;

 	# new host:port

-	if ($binddn eq "" || $bindpwd eq "" && $bindcert eq "") {

+	if (!$binddn || $binddn eq "" || !$bindpwd || $bindpwd eq "" || !$bindcert || $bindcert eq "") {

 		#

 		# Look up connection parameter in the order of

 		#	host:port

@@ -855,17 +990,25 @@ sub add_server

 		#	*:*

 		#

 		my (@myconfig, $h, $p, $d, $w, $c);

-		(@myconfig = grep (/^$hostnode($domainpattern)*:$port\D/i, @allconnections)) ||

+		$h = ""; $p = ""; $d = ""; $w = ""; $c = "";

+		(@myconfig = grep (/^$hostnode($domainpattern)*:[0-9]+\D/i, @allconnections)) ||