benson-commit Mailing List for Benson Distributed Monitoring System (Page 3)

Brought to you by: btribit, rfife

benson-commit — Benson Commit Mailing List

You can subscribe to this list here.

2001	_Jan	_Feb	_Mar	_Apr	_May (1)	_Jun (27)	_Jul (24)	_Aug (64)	_Sep (15)	_Oct (72)	_Nov (28)	_Dec (44)
2002	_Jan (72)	_Feb (58)	_Mar (33)	_Apr (3)	_May (5)	_Jun (4)	_Jul	_Aug	_Sep	_Oct (24)	_Nov (29)	_Dec (12)
2003	_Jan (37)	_Feb (44)	_Mar (13)	_Apr (23)	_May (9)	_Jun (3)	_Jul	_Aug (7)	_Sep (33)	_Oct (30)	_Nov (31)	_Dec (11)
2004	_Jan (4)	_Feb (35)	_Mar (14)	_Apr	_May (2)	_Jun	_Jul	_Aug (5)	_Sep	_Oct	_Nov	_Dec
2005	_Jan	_Feb (2)	_Mar (2)	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 2 3 4 5 .. 33 > >> (Page 3 of 33)

[Benson-commit] CVS: benson3/autom4te.cache output.0,1.15,1.16 traces.0,1.14,1.15

From: Bob T. <bt...@us...> - 2004-02-17 05:06:50

Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28705/autom4te.cache

Modified Files:
	output.0 traces.0 
Log Message:
Made some changes to check for additional dependencies.

Index: output.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/output.0,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** output.0	12 Dec 2003 19:14:27 -0000	1.15
--- output.0	17 Feb 2004 04:58:13 -0000	1.16
***************
*** 5508,5511 ****
--- 5508,5543 ----
  		
  	fi
+ 	echo "$as_me:$LINENO: checking for Perl module DBI" >&5
+ echo $ECHO_N "checking for Perl module DBI... $ECHO_C" >&6
+ 	PERL_MOD_DBI=`$perlpath -MDBI -e "print 'yes';"`
+ 	if test X"$PERL_MOD_DBI" = Xyes; then
+ 		echo "$as_me:$LINENO: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	else
+ 		echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6
+ 	fi
+ 
+ 	echo "$as_me:$LINENO: checking for Perl module DBD::Pg" >&5
+ echo $ECHO_N "checking for Perl module DBD::Pg... $ECHO_C" >&6
+ 	PERL_MOD_DBD_PG=`$perlpath -MDBD::Pg -e "print 'yes';"`
+ 	if test X"$PERL_MOD_DBD_PG" = Xyes; then
+ 		echo "$as_me:$LINENO: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	else
+ 		echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6
+ 	fi
+ 
+ 	echo "$as_me:$LINENO: checking for Perl module XML::Simple" >&5
+ echo $ECHO_N "checking for Perl module XML::Simple... $ECHO_C" >&6
+ 	PERL_MOD_XML_SIMPLE=`$perlpath -MXML::Simple -e "print 'yes';"`
+ 	if test X"$PERL_MOD_XML_SIMPLE" = Xyes; then
+ 		echo "$as_me:$LINENO: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	else
+ 		echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6
+ 	fi
  fi
  

Index: traces.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/traces.0,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** traces.0	12 Dec 2003 19:14:28 -0000	1.14
--- traces.0	17 Feb 2004 04:58:14 -0000	1.15
***************
*** 229,234 ****
  m4trace:configure.ac:139: -1- AC_SUBST([PERL_LDFLAGS])
  m4trace:configure.ac:140: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:151: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:168: -1- AC_CONFIG_FILES([Makefile man/Makefile handlers/Makefile conf/Makefile \
  include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile \
  src/network/Makefile src/perl/Makefile src/rules/Makefile \
--- 229,234 ----
  m4trace:configure.ac:139: -1- AC_SUBST([PERL_LDFLAGS])
  m4trace:configure.ac:140: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:174: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:191: -1- AC_CONFIG_FILES([Makefile man/Makefile handlers/Makefile conf/Makefile \
  include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile \
  src/network/Makefile src/perl/Makefile src/rules/Makefile \
***************
*** 236,239 ****
  src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
  doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:168: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:168: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
--- 236,239 ----
  src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
  doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:191: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:191: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])

[Benson-commit] CVS: benson3 ChangeLog,1.34,1.35 configure,1.64,1.65 configure.ac,1.12,1.13

From: Bob T. <bt...@us...> - 2004-02-17 05:06:49

Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28705

Modified Files:
	ChangeLog configure configure.ac 
Log Message:
Made some changes to check for additional dependencies.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/benson/benson3/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** ChangeLog	22 Aug 2003 00:07:58 -0000	1.34
--- ChangeLog	17 Feb 2004 04:58:12 -0000	1.35
***************
*** 2,6 ****
--- 2,8 ----
  - Adding in the disk/vfs monitor (and then disabled it)
  - Revised the network code, actually completely overhauled the network code.
+ - Added override attribute for suppression in Benson module.
  - Added duration attribute for suppress btrap to Benson module.
+ - Major changes to the build environment.
  
  version 3.1a4

Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** configure	12 Dec 2003 19:14:27 -0000	1.64
--- configure	17 Feb 2004 04:58:12 -0000	1.65
***************
*** 5508,5511 ****
--- 5508,5543 ----
  
  	fi
+ 	echo "$as_me:$LINENO: checking for Perl module DBI" >&5
+ echo $ECHO_N "checking for Perl module DBI... $ECHO_C" >&6
+ 	PERL_MOD_DBI=`$perlpath -MDBI -e "print 'yes';"`
+ 	if test X"$PERL_MOD_DBI" = Xyes; then
+ 		echo "$as_me:$LINENO: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	else
+ 		echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6
+ 	fi
+ 
+ 	echo "$as_me:$LINENO: checking for Perl module DBD::Pg" >&5
+ echo $ECHO_N "checking for Perl module DBD::Pg... $ECHO_C" >&6
+ 	PERL_MOD_DBD_PG=`$perlpath -MDBD::Pg -e "print 'yes';"`
+ 	if test X"$PERL_MOD_DBD_PG" = Xyes; then
+ 		echo "$as_me:$LINENO: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	else
+ 		echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6
+ 	fi
+ 
+ 	echo "$as_me:$LINENO: checking for Perl module XML::Simple" >&5
+ echo $ECHO_N "checking for Perl module XML::Simple... $ECHO_C" >&6
+ 	PERL_MOD_XML_SIMPLE=`$perlpath -MXML::Simple -e "print 'yes';"`
+ 	if test X"$PERL_MOD_XML_SIMPLE" = Xyes; then
+ 		echo "$as_me:$LINENO: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+ 	else
+ 		echo "$as_me:$LINENO: result: not found" >&5
+ echo "${ECHO_T}not found" >&6
+ 	fi
  fi
  

Index: configure.ac
===================================================================
RCS file: /cvsroot/benson/benson3/configure.ac,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** configure.ac	12 Dec 2003 19:14:27 -0000	1.12
--- configure.ac	17 Feb 2004 04:58:13 -0000	1.13
***************
*** 140,143 ****
--- 140,166 ----
  		AC_SUBST(PERL_SLIBS)
  	fi
+ 	AC_MSG_CHECKING(for Perl module DBI)
+ 	PERL_MOD_DBI=`$perlpath -MDBI -e "print 'yes';"`
+ 	if test X"$PERL_MOD_DBI" = Xyes; then
+ 		AC_MSG_RESULT(ok)
+ 	else
+ 		AC_MSG_RESULT(not found)
+ 	fi
+ 
+ 	AC_MSG_CHECKING(for Perl module DBD::Pg)
+ 	PERL_MOD_DBD_PG=`$perlpath -MDBD::Pg -e "print 'yes';"`
+ 	if test X"$PERL_MOD_DBD_PG" = Xyes; then
+ 		AC_MSG_RESULT(ok)
+ 	else
+ 		AC_MSG_RESULT(not found)
+ 	fi
+ 
+ 	AC_MSG_CHECKING(for Perl module XML::Simple)
+ 	PERL_MOD_XML_SIMPLE=`$perlpath -MXML::Simple -e "print 'yes';"`
+ 	if test X"$PERL_MOD_XML_SIMPLE" = Xyes; then
+ 		AC_MSG_RESULT(ok)
+ 	else
+ 		AC_MSG_RESULT(not found)
+ 	fi
  fi

[Benson-commit] CVS: benson3/handlers A10email.pm,1.8,1.9

From: Bob T. <bt...@us...> - 2004-02-10 07:34:20

Update of /cvsroot/benson/benson3/handlers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9514/handlers

Modified Files:
	A10email.pm 
Log Message:
Added some basic xml support to A10email.pm, not quite functional, still testing.

Index: A10email.pm
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/A10email.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** A10email.pm	27 Jan 2004 07:46:44 -0000	1.8
--- A10email.pm	10 Feb 2004 07:31:12 -0000	1.9
***************
*** 4,7 ****
--- 4,8 ----
  use Benson::Constants;
  use POSIX;
+ use XML::Simple;
  
  sub match_total_count {
***************
*** 19,22 ****
--- 20,53 ----
  }
  
+ sub match_weekday_time {
+ 	my ($self, $start, $end, $weekday) = @_;
+ 	my $timestamp = time();
+ 	my $current_time = POSIX::strftime("%H%M%S", localtime($timestamp));
+ 	my $current_weekday = POSIX::strftime("%u", localtime($timestamp)); # 1-7 starting on Monday
+ 	my $current_weekday = $current_weekday - 1; # 0-6 starting on Monday
+ 
+ 	my @days;
+ 	push @days, substr($weekday, 1, 1); # Monday
+ 	push @days, substr($weekday, 2, 1); # Tuesday
+ 	push @days, substr($weekday, 3, 1); # Wednesday
+ 	push @days, substr($weekday, 4, 1); # Thursday
+ 	push @days, substr($weekday, 5, 1); # Friday
+ 	push @days, substr($weekday, 6, 1); # Saturday
+ 	push @days, substr($weekday, 0, 1); # Sunday
+ 
+ 	my $weekday_matched = 0;
+ 	if($days[$current_weekday] ne "-") {
+ 		$weekday_matched = 1;
+ 	}
+ 	my $time_matched = 0;
+ 	if(($start < $current_time) && ($end > $current_time)) {
+ 		$time_matched = 1;
+ 	}
+ 	if($weekday_matched && $time_matched) {
+ 		return 1;
+ 	}
+ 	return 0;
+ }
+ 
  sub parse_legacy_alias {
  	my ($self, $alias) = @_;
***************
*** 28,31 ****
--- 59,65 ----
  		$hash{protocol} = "legacy_file";
  		$hash{parameter} = $parameter;
+ 	} elsif($protocol eq "xml") {
+ 		$hash{protocol} = "xml_file";
+ 		$hash{parameter} = $parameter;
  	} elsif($protocol eq "email") {
  		$hash{protocol} = "email";
***************
*** 38,41 ****
--- 72,146 ----
  }
  
+ sub parse_xml_rule_block {
+ 	my ($self, $rule_name, $rule_ref) = @_;
+ 
+ 	my %hash;
+ 	$hash{line_count} = $rule_name;	
+ 	$hash{count} = $rule_ref->{rule}->{$rule_name}->{count};
+ 	$hash{starttime} = $rule_ref->{rule}->{$rule_name}->{time}->{start};
+ 	$hash{endtime} = $rule_ref->{rule}->{$rule_name}->{time}->{end};
+ 	$hash{weekday} = $rule_ref->{rule}->{$rule_name}->{time}->{weekday};
+ 
+ 	#
+ 	# Grab the agents
+ 	#
+ 	my $agents = $rule_ref->{rule}->{$rule_name}->{agent};
+ 	if(ref($agents) eq "ARRAY") { ### for multiple values
+ 		foreach my $agent (@{$agents}) {
+ 			push @{$hash{agents}}, $agent->{value};
+ 		}
+ 	} elsif(ref($agents) eq "HASH") { ### for single value  
+ 		push @{$hash{agents}}, $agents->{value};
+ 	} else { ### for no value
+ 		push @{$hash{agents}}, ".*";
+ 	}
+ 
+ 	#
+ 	# Grab the severities
+ 	#
+ 	my $severities = $rule_ref->{rule}->{$rule_name}->{severity};
+ 	if(ref($severities) eq "ARRAY") { ### for multiple values
+ 		foreach my $severity (@{$severities}) {
+ 			push @{$hash{severity}}, $severity->{value};
+ 		}
+ 	} elsif(ref($severities) eq "HASH") { ### for single value  
+ 		push @{$hash{severity}}, $severities->{value};
+ 	} else { ### for no value
+ 		push @{$hash{severity}}, ".*";
+ 	}
+ 
+ 	#
+ 	# Grab the subsystems
+ 	#
+ 	my $subsystems = $rule_ref->{rule}->{$rule_name}->{subsystem};
+ 	if(ref($subsystems) eq "ARRAY") { ### for multiple values
+ 		foreach my $subsystem (@{$subsystems}) {
+ 			push @{$hash{subsystem}}, $subsystem->{value};
+ 		}
+ 	} elsif(ref($subsystems) eq "HASH") { ### for single value  
+ 		push @{$hash{subsystem}}, $subsystems->{value};
+ 	} else { ### for no value
+ 		push @{$hash{subsystem}}, ".*";
+ 	}
+ 
+ 	#
+ 	# Grab the messages
+ 	#
+ 	my $messages = $rule_ref->{rule}->{$rule_name}->{message};
+ 	if(ref($messages) eq "ARRAY") { ### for multiple values
+ 		foreach my $subsystem (@{$messages}) {
+ 			push @{$hash{message}}, $message->{value};
+ 		}
+ 	} elsif(ref($messages) eq "HASH") { ### for single value  
+ 		push @{$hash{message}}, $messages->{value};
+ 	} else { ### for no value
+ 		push @{$hash{message}}, ".*";
+ 	}
+ 
+ 	$hash{count} = ".*";
+ 	$hash{action} = $self->parse_legacy_alias("email:btribit\@newportal.com");
+ 	return \%hash;
+ }
+ 
  sub parse_legacy_line {
  	my ($self, $line_count, $line) = @_;
***************
*** 48,51 ****
--- 153,159 ----
  	$hash{line_count} = $line_count;
  	$hash{pass} = $pass;
+ 	$hash{starttime} = "000000"; # Start at the beginning of the day
+ 	$hash{endtime} = "235961";   # Finish at the end of the day
+ 	$hash{weekday} = "SMTWTFS";  # Go all week, by default
  	push @{$hash{agents}}, $agent;
  	push @{$hash{severity}}, $severity;
***************
*** 58,61 ****
--- 166,187 ----
  }
  
+ sub parse_xml_file {
+ 	my ($self, $filename, $t) = @_;
+ 	my $s = $t->server;
+ 	my $identity = $t->identity;
+ 	my @rules;
+ 	my $xs = new XML::Simple;
+ 
+ 	$s->trace("M ($identity) A10email opening xml $filename...", 3);
+ 
+ 	my $ref = $xs->XMLin($filename);
+ 
+ 	foreach my $rule_name (keys %{$ref->{rule}}) {
+ 		push @rules, $self->parse_xml_rule_block($rule_name, $ref);
+ 	}
+ 
+ 	return \@rules;
+ }
+ 
  sub parse_legacy_file {
  	my ($self, $filename, $t) = @_;
***************
*** 66,70 ****
  	my $s = $t->server;
  
! 	$s->trace("M ($identity) A10email opening $filename...", 3);
  
  
--- 192,196 ----
  	my $s = $t->server;
  
! 	$s->trace("M ($identity) A10email opening legacy $filename...", 3);
  
  
***************
*** 114,118 ****
  				#
  				# If the rule is for a legacy_file read that.
! 				#
  				if ($rule->{action}->{protocol} eq "legacy_file") {
  					my $legacy_filename = $rule->{action}->{parameter};
--- 240,245 ----
  				#
  				# If the rule is for a legacy_file read that.
! 				# Else if the rule is for an xml_file read that.
! 				# 
  				if ($rule->{action}->{protocol} eq "legacy_file") {
  					my $legacy_filename = $rule->{action}->{parameter};
***************
*** 148,151 ****
--- 275,296 ----
  					$rule_files->{$legacy_filename} = \%hash;
  					$not_done = 1;
+ 				} elsif($rule->{action}->{protocol} eq "xml_file") {
+ 					my $xml_filename = $rule->{action}->{parameter};
+ 					if($xml_filename eq $file_key) {
+ 						next;
+ 					}
+ 					if($rule_files->{$xml_filename}->{processed} != 0) {
+ 						next;
+ 					}
+ 					my %hash;
+ 					if(($rules = $self->parse_xml_file($xml_filename, $t)) == -1) {
+ 						$hash{processed} = -1;
+ 						$s->log("M ($identity) File $xml_filename not found", WARNING);
+ 					} else {
+ 						$hash{processed} = 0;
+ 					}
+ 					$hash{rules} = $rules;
+ 					$rule_files->{$xml_filename} = \%hash;
+ 					$not_done = 1;
  				}
  			}
***************
*** 208,216 ****
  		if($agent_found && $severity_found &&
  			$subsystem_found && $message_found &&
! 				$self->match_total_count($total, $rule->{count})) {
  			$s->trace("C ($identity) matched on $filename:$line_count", 4);
  			$s->trace("C ($identity) action is ".$rule->{action}->{protocol}.":".$rule->{action}->{parameter}, 4);
  
! 			if($rule->{action}->{protocol} eq "legacy_file") {
  				my $rc;
  				if(($rc = $self->process_trap($t, $rule_files, $list, $rule->{action}->{parameter})) == -1) {
--- 353,363 ----
  		if($agent_found && $severity_found &&
  			$subsystem_found && $message_found &&
! 				$self->match_total_count($total, $rule->{count}) &&
! 				$self->match_weekday_time($rule->{starttime}, $rule->{endtime}, $rule->{weekday})) {
  			$s->trace("C ($identity) matched on $filename:$line_count", 4);
  			$s->trace("C ($identity) action is ".$rule->{action}->{protocol}.":".$rule->{action}->{parameter}, 4);
  
! 			if(($rule->{action}->{protocol} eq "legacy_file") || 
! 				($rule->{action}->{protocol} eq "xml_file")) {
  				my $rc;
  				if(($rc = $self->process_trap($t, $rule_files, $list, $rule->{action}->{parameter})) == -1) {
***************
*** 231,236 ****
  		} else {
  			my $total_matched = $agent_found + $severity_found + $subsystem_found +
! 						$message_found + $self->match_total_count($total, $rule->{count});
! 			$s->trace("C ($identity) did not match ($total_matched/5) on $filename:$line_count", 4);
  		}
  	}
--- 378,384 ----
  		} else {
  			my $total_matched = $agent_found + $severity_found + $subsystem_found +
! 						$message_found + $self->match_total_count($total, $rule->{count}) +
! 						$self->match_weekday_time($rule->{starttime}, $rule->{endtime}, $rule->{weekday});
! 			$s->trace("C ($identity) did not match ($total_matched/6) on $filename:$line_count", 4);
  		}
  	}

[Benson-commit] CVS: benson3/scripts/cgi suppress.cgi.tmpl,1.9,1.10

From: Bob T. <bt...@us...> - 2004-02-10 02:44:00

Update of /cvsroot/benson/benson3/scripts/cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15386/scripts/cgi

Modified Files:
	suppress.cgi.tmpl 
Log Message:
The latest changes.

Index: suppress.cgi.tmpl
===================================================================
RCS file: /cvsroot/benson/benson3/scripts/cgi/suppress.cgi.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** suppress.cgi.tmpl	9 Feb 2004 22:55:50 -0000	1.9
--- suppress.cgi.tmpl	9 Feb 2004 23:16:21 -0000	1.10
***************
*** 227,230 ****
--- 227,235 ----
  	my $smin = $query->param("smin");
  	my $reason = $query->param("reason");
+         my $override = "no";
+ 	if($override_query =~ m/on/i) {
+ 		$override="yes";
+ 	}
+ 
  	$| = 1;
  	print <<EOT;
***************
*** 288,291 ****
--- 293,298 ----
  <b>Reason:</b><br>
  <input type="text" name="reason" value="No reason specified." size="50">
+ <hr>   
+ <b>Override:</b><input type="checkbox" name="override">
  <hr>
  <center>

[Benson-commit] CVS: benson3/handlers S05benson.pm,1.9,1.10

From: Bob T. <bt...@us...> - 2004-02-10 01:30:03

Update of /cvsroot/benson/benson3/handlers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15386/handlers

Modified Files:
	S05benson.pm 
Log Message:
The latest changes.

Index: S05benson.pm
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/S05benson.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** S05benson.pm	16 Dec 2003 16:17:46 -0000	1.9
--- S05benson.pm	9 Feb 2004 23:16:21 -0000	1.10
***************
*** 23,26 ****
--- 23,28 ----
  	if($override =~ m/y/i) {
  		$override = "Y";
+ 	} elsif($override =~ m/n/i) {
+ 		$override = "N";
  	}
  	if(defined $hash{duration}) {

[Benson-commit] CVS: benson3/scripts/cgi alertview.cgi.tmpl,1.4,1.5

From: Bob T. <bt...@us...> - 2004-02-10 01:14:45

Update of /cvsroot/benson/benson3/scripts/cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8044

Modified Files:
	alertview.cgi.tmpl 
Log Message:
Fixed the dynamic perlpath thingy.

Index: alertview.cgi.tmpl
===================================================================
RCS file: /cvsroot/benson/benson3/scripts/cgi/alertview.cgi.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** alertview.cgi.tmpl	9 Feb 2004 22:26:46 -0000	1.4
--- alertview.cgi.tmpl	9 Feb 2004 22:47:35 -0000	1.5
***************
*** 1,3 ****
! #!/usr/local/bin/perl -I/tmp/benson3/lib/perl/
  
  use DBI;
--- 1,3 ----
! #!perlpath -Iprefixpath/lib/perl/
  
  use DBI;

[Benson-commit] CVS: benson3/scripts/cgi alertview.cgi.tmpl,1.3,1.4

From: Bob T. <bt...@us...> - 2004-02-10 01:11:54

Update of /cvsroot/benson/benson3/scripts/cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2527

Modified Files:
	alertview.cgi.tmpl 
Log Message:
Added the override stuff in.

Index: alertview.cgi.tmpl
===================================================================
RCS file: /cvsroot/benson/benson3/scripts/cgi/alertview.cgi.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** alertview.cgi.tmpl	9 Feb 2004 06:53:13 -0000	1.3
--- alertview.cgi.tmpl	9 Feb 2004 22:26:46 -0000	1.4
***************
*** 18,21 ****
--- 18,22 ----
  my $query = new CGI;
  my $dbh = DBI->connect($queue->get("DBIConnectString"), $queue->get("DBIUsername"),$queue->get("DBIPassword"));
+ my $date_and_time = POSIX::strftime("%A %B %d, %Y - %T", localtime(time()));
  
  my $webserver_url = $queue->get("WebserverURL");
***************
*** 51,56 ****
  
  
- my $date_and_time = "null";
- 
  my $sort_field = $query->param("sort_field") || "severity";
  my $sort_type = $query->param("sort_type") || "ascend";
--- 52,55 ----
***************
*** 101,105 ****
  				$queue->submit(subsystem => "Benson",
  						severity => "informational",
! 						message => "suppress_remove identity:$val");
  				print "done\n";
  			}
--- 100,104 ----
  				$queue->submit(subsystem => "Benson",
  						severity => "informational",
! 						message => "suppress_remove override:yes identity:$val");
  				print "done\n";
  			}
***************
*** 287,290 ****
--- 286,290 ----
    <td background="/images/header.gif" align="right"><font color="#FFFFFF"><b>End Time</b></font></td>
    <td background="/images/header.gif" align="right"><font color="#FFFFFF"><b>Reason</b></font></td>
+   <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>OR</b></font></td>
    <td background="/images/header.gif" align="right"><font color="#FFFFFF"><b>REM</b></font></td>
   </tr>
***************
*** 297,300 ****
--- 297,301 ----
  	starttime,
  	endtime,
+ 	override,
  	reason
  FROM
***************
*** 314,317 ****
--- 315,319 ----
  	my $endtime = $row->{endtime};
  	my $reason = $row->{reason};
+ 	my $override = $row->{override};
  	print <<EOT
   <tr>
***************
*** 321,324 ****
--- 323,327 ----
    <td>$endtime</td>
    <td>$reason</td>  
+   <td>$override</td>  
    <td><input type="checkbox" name="sup_rem:$id"></td>
   </tr>

[Benson-commit] CVS: benson3/src acknowledge.c,1.9,1.10 alertlist.c,1.12,1.13 btrap.c,1.21,1.22

From: Bob T. <bt...@us...> - 2004-02-10 00:24:40

Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15386/src

Modified Files:
	acknowledge.c alertlist.c btrap.c 
Log Message:
The latest changes.

Index: acknowledge.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/acknowledge.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** acknowledge.c	8 Nov 2003 20:43:19 -0000	1.9
--- acknowledge.c	9 Feb 2004 23:16:21 -0000	1.10
***************
*** 49,53 ****
--- 49,55 ----
  	char identity[ID_MAXSIZE];
  	char agent[AGT_MAXSIZE], subsystem[SUB_MAXSIZE];
+ #ifdef HAVE_SSL
  	char certfile[FILE_MAXSIZE], keyfile[FILE_MAXSIZE];
+ #endif
  
  	while((c = getopt(argc,argv,"Vvd:s:c:k:i:")) != -1) {

Index: alertlist.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/alertlist.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** alertlist.c	8 Nov 2003 20:43:19 -0000	1.12
--- alertlist.c	9 Feb 2004 23:16:21 -0000	1.13
***************
*** 21,26 ****
  	char temp[DVALUE_LENGTH];
  	char source[AGT_MAXSIZE], destination[DST_MAXSIZE];
  	char certfile[FILE_MAXSIZE], keyfile[FILE_MAXSIZE];
! 
  
  	while((c = getopt(argc,argv,"Vvd:s:c:k:")) != -1) {
--- 21,27 ----
  	char temp[DVALUE_LENGTH];
  	char source[AGT_MAXSIZE], destination[DST_MAXSIZE];
+ #ifdef HAVE_SSL
  	char certfile[FILE_MAXSIZE], keyfile[FILE_MAXSIZE];
! #endif
  
  	while((c = getopt(argc,argv,"Vvd:s:c:k:")) != -1) {

Index: btrap.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/btrap.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** btrap.c	8 Nov 2003 20:43:19 -0000	1.21
--- btrap.c	9 Feb 2004 23:16:21 -0000	1.22
***************
*** 22,26 ****
--- 22,28 ----
  	char source[AGT_MAXSIZE], destination[DST_MAXSIZE];
  	char severity[SEV_MAXSIZE], subsystem[SUB_MAXSIZE], message[MSG_MAXSIZE];
+ #ifdef HAVE_SSL
  	char certfile[FILE_MAXSIZE], keyfile[FILE_MAXSIZE];
+ #endif
  
  	while((c = getopt(argc,argv,"Vvd:s:c:k:")) != -1) {

[Benson-commit] CVS: benson3/scripts/cgi alertview.cgi.tmpl,1.5,1.6 suppress.cgi.tmpl,1.8,1.9

From: Bob T. <bt...@us...> - 2004-02-10 00:23:28

Update of /cvsroot/benson/benson3/scripts/cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9953

Modified Files:
	alertview.cgi.tmpl suppress.cgi.tmpl 
Log Message:
Fixed a minute bug on the suppress forms.

Index: alertview.cgi.tmpl
===================================================================
RCS file: /cvsroot/benson/benson3/scripts/cgi/alertview.cgi.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** alertview.cgi.tmpl	9 Feb 2004 22:47:35 -0000	1.5
--- alertview.cgi.tmpl	9 Feb 2004 22:55:50 -0000	1.6
***************
*** 93,97 ****
  				$queue->submit(subsystem => "Benson",
  						severity => "informational",
! 						message => "suppress agent:$val duration:3600 reason:Temporarily suppressed for problem resolution");
  				print "done\n";
  			}
--- 93,97 ----
  				$queue->submit(subsystem => "Benson",
  						severity => "informational",
! 						message => "suppress agent:$val override:no duration:3600 reason:Temporarily suppressed for problem resolution");
  				print "done\n";
  			}

Index: suppress.cgi.tmpl
===================================================================
RCS file: /cvsroot/benson/benson3/scripts/cgi/suppress.cgi.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** suppress.cgi.tmpl	27 Jun 2003 14:25:34 -0000	1.8
--- suppress.cgi.tmpl	9 Feb 2004 22:55:50 -0000	1.9
***************
*** 98,102 ****
  	my $minute = shift;
  	my $input;
! 	$input .= qq{<select name="sminute">};
  	for(my $ctr=0;$ctr<=59;$ctr++) {
  		if($ctr < 10) {
--- 98,102 ----
  	my $minute = shift;
  	my $input;
! 	$input .= qq{<select name="smin">};
  	for(my $ctr=0;$ctr<=59;$ctr++) {
  		if($ctr < 10) {

[Benson-commit] CVS: benson3/scripts/cgi alertview.cgi.tmpl,1.2,1.3

From: Bob T. <bt...@us...> - 2004-02-09 06:56:23

Update of /cvsroot/benson/benson3/scripts/cgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26165

Modified Files:
	alertview.cgi.tmpl 
Log Message:
Made quite a few changes to the alerview.cgi script.

Index: alertview.cgi.tmpl
===================================================================
RCS file: /cvsroot/benson/benson3/scripts/cgi/alertview.cgi.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** alertview.cgi.tmpl	12 Dec 2003 19:14:28 -0000	1.2
--- alertview.cgi.tmpl	9 Feb 2004 06:53:13 -0000	1.3
***************
*** 1,4 ****
--- 1,5 ----
  #!/usr/local/bin/perl -I/tmp/benson3/lib/perl/
  
+ use DBI;
  use CGI;
  use Benson;
***************
*** 16,19 ****
--- 17,21 ----
  my $queue = new Benson;
  my $query = new CGI;
+ my $dbh = DBI->connect($queue->get("DBIConnectString"), $queue->get("DBIUsername"),$queue->get("DBIPassword"));
  
  my $webserver_url = $queue->get("WebserverURL");
***************
*** 47,50 ****
--- 49,54 ----
  
  
+ 
+ 
  my $date_and_time = "null";
  
***************
*** 55,58 ****
--- 59,121 ----
  my %alertlist = %{$alerts_ref};
  
+ my $action = $query->param("action") || "alertview";
+ 
+ 
+ if($action eq "acksup") {
+ 	$| = 1;
+ 	print <<EOT;
+ Content-type: text/html
+ 
+ <html>
+ <title>Performing actions...</title>
+ <body bgcolor="#FFFFFF">
+ <h1>Performing actions...</h1>
+ <pre>
+ EOT
+ 	my @names = $query->param;
+ 	foreach my $name (sort @names) {
+ 		my $value = $query->param($name);
+ 		if($value eq "on") {
+ 			my ($attr, $val) = split /\:/, $name, 2;
+ 			if($attr eq "id") {
+ 				foreach my $key (keys %{$alerts_ref}) {
+ 					if($alerts_ref->{$key}->{first_id} eq $val) {
+ 						foreach my $sub_alert (@{$alerts_ref->{$key}->{sub_alerts}}) {
+ 							print "Acknowledging alert ($val)......";
+ 							$queue->acknowledge(identity => $sub_alert->{identity});
+ 							print "done\n";
+ 						}
+ 						last;
+ 					}
+ 				}
+ 			}
+ 			if($attr eq "sup") {
+ 				print "Suppressing host ($val)......";
+ 				$queue->submit(subsystem => "Benson",
+ 						severity => "informational",
+ 						message => "suppress agent:$val duration:3600 reason:Temporarily suppressed for problem resolution");
+ 				print "done\n";
+ 			}
+ 			if($attr eq "sup_rem") {
+ 				print "Removing suppression for host ($val)......";
+ 				$queue->submit(subsystem => "Benson",
+ 						severity => "informational",
+ 						message => "suppress_remove identity:$val");
+ 				print "done\n";
+ 			}
+ 		}
+ 	}
+ 	print <<EOT;
+ </pre>
+ <script language="JavaScript">
+ window.location = "$webserver_url/cgi-bin/alertview.cgi?sort_type=$sort_type&sort_field=$sort_field";
+ </script>
+ </body>
+ </html>
+ EOT
+ 	exit;
+ }
+ 
+ 
  sub by_field {
  	my ($a_agent, $a_severity, $a_subsystem, $a_message) = split /\:/, $a;
***************
*** 169,177 ****
  <b>Alert View</b><br>
  Current Time (as of refresh): <b>$date_and_time</b>
  <table border="1" bgcolor="#FFFFF0" width="100%">
   <tr>
    <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>+/-</b></font></td>
!   <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>ACK</b><input type="button"
!  value="X" onclick="javascript: toggle(this);"></font></td>
    <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>SUP</b></font></td>
    <td background="/images/header.gif" align="right"><font color="#FFFFFF"><b>Agent</b>$agent_img_field</font></td>
--- 232,242 ----
  <b>Alert View</b><br>
  Current Time (as of refresh): <b>$date_and_time</b>
+ <input type="hidden" name="sort_field" value="$sort_field">
+ <input type="hidden" name="sort_type" value="$sort_type">
+ <input type="hidden" name="action" value="acksup">
  <table border="1" bgcolor="#FFFFF0" width="100%">
   <tr>
    <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>+/-</b></font></td>
!   <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>ACK</b><input type="button" value="X" onclick="javascript: toggle(this);"></font></td>
    <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>SUP</b></font></td>
    <td background="/images/header.gif" align="right"><font color="#FFFFFF"><b>Agent</b>$agent_img_field</font></td>
***************
*** 214,216 ****
--- 279,354 ----
  <input type="submit" value="Acknowledge/Suppress">
  <hr>
+ <b>Suppressed Hosts</b>
+ <table bgcolor="#FFFFF0" border="1">
+  <tr>
+   <td background="/images/header.gif" align="center"><font color="#FFFFFF"><b>+/-</b></font></td>
+   <td background="/images/header.gif" align="right"><font color="#FFFFFF"><b>Agent</b></font></td>
+   <td background="/images/header.gif" align="right"><font color="#FFFFFF"><b>Start Time</b></font></td>
+   <td background="/images/header.gif" align="right"><font color="#FFFFFF"><b>End Time</b></font></td>
+   <td background="/images/header.gif" align="right"><font color="#FFFFFF"><b>Reason</b></font></td>
+   <td background="/images/header.gif" align="right"><font color="#FFFFFF"><b>REM</b></font></td>
+  </tr>
+ EOT
+ 
+ my $sql_suppress = <<EOSQL;
+ SELECT
+ 	suppress_id,
+ 	agent,
+ 	starttime,
+ 	endtime,
+ 	reason
+ FROM
+ 	suppress
+ WHERE
+ 	endtime > now()
+ AND
+ 	remove = 'N'
+ EOSQL
+         
+ my $sth = $dbh->prepare($sql_suppress);
+ my $rc = $sth->execute();
+ while(my $row = $sth->fetchrow_hashref()) {
+ 	my $id = $row->{suppress_id};
+ 	my $agent = $row->{agent};
+ 	my $starttime = $row->{starttime};
+ 	my $endtime = $row->{endtime};
+ 	my $reason = $row->{reason};
+ 	print <<EOT
+  <tr>
+   <td align="center"><b>(?)</b></td>
+   <td>$agent</td>
+   <td>$starttime</td>  
+   <td>$endtime</td>
+   <td>$reason</td>  
+   <td><input type="checkbox" name="sup_rem:$id"></td>
+  </tr>  
+ EOT
+ }
+ 
+ 
+ 	print <<EOT;
+ </table>
+ <input type="submit" value="Remove Suppression">
+ <hr>
+ <table width="100%">
+ <tr>
+ <td align="left">
+ <i><font size="1">
+ <a href="http://benson.sourceforge.net/">Benson Distributed Monitoring System</a><br>
+ Copyright &copy; 1999, 2000, 2001, 2002, 2003, 2004 by Bob Tribit<br>
+ <br>
+ This program is distributed in the hope that it will be useful,<br>
+ but WITHOUT ANY WARRANTY; without even the implied warranty of<br>
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>
+ <a href="http://www.fsf.org/">GNU</a> <a href="http://www.gnu.org/licenses/gpl.html">General Public License</a> for more 
+ details.
+ </font></i>
+ </td>
+ <td align="right">
+ fortune.pl goes here
+ </td>
+ </tr>
+ </table>
+ </body>
+ </html>
  EOT

[Benson-commit] CVS: benson3/handlers A10email.pm,1.7,1.8

From: Bob T. <bt...@us...> - 2004-01-27 07:47:44

Update of /cvsroot/benson/benson3/handlers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28927/handlers

Modified Files:
	A10email.pm 
Log Message:
A really new and improved A10email handler.

Index: A10email.pm
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/A10email.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** A10email.pm	25 Jan 2004 17:36:05 -0000	1.7
--- A10email.pm	27 Jan 2004 07:46:44 -0000	1.8
***************
*** 5,19 ****
  use POSIX;
  
! sub parse_file {
! 	my ($self, $filename, $t, $list, $emails) = @_;
  
! 	my $s = $t->server;
  	my $identity = $t->identity;
! 	my %alertlist = %{$list};
  
! 	$s->trace("($identity) A10email opening $filename...",3);
  
! 	open CONFIG, $filename || return -1;
  	while(<CONFIG>) {
  		my $line = $_;
  		if($line =~ m/^#/ || $line =~ m/^\s/) {
--- 5,75 ----
  use POSIX;
  
! sub match_total_count {
! 	my ($self, $total, $count) = @_;
  
! 	if($count eq ".*") {
! 		return 1;
! 	}
! 
! 	if($total == $count) {
! 		return 1;
! 	}
! 
! 	return 0;
! }
! 
! sub parse_legacy_alias {
! 	my ($self, $alias) = @_;
! 	my ($protocol, $parameter) = split /:/, $alias, 2;
! 
! 	my %hash;	
! 
! 	if($protocol eq "file") {
! 		$hash{protocol} = "legacy_file";
! 		$hash{parameter} = $parameter;
! 	} elsif($protocol eq "email") {
! 		$hash{protocol} = "email";
! 		$hash{parameter} = $parameter;
! 	} else {
! 		$hash{protocol} = "email";
! 		$hash{parameter} = $alias;
! 	}
! 	return \%hash;
! }
! 
! sub parse_legacy_line {
! 	my ($self, $line_count, $line) = @_;
! 
! 	my ($pass,$agent,$severity,$subsystem,$message,$count,$alias) =
! 		split /\s+/, $line, 7;
! 
! 	my %hash;
! 
! 	$hash{line_count} = $line_count;
! 	$hash{pass} = $pass;
! 	push @{$hash{agents}}, $agent;
! 	push @{$hash{severity}}, $severity;
! 	push @{$hash{subsystem}}, $subsystem;
! 	push @{$hash{message}}, $message;
! 	$hash{count} = $count;
! 	$hash{action} = $self->parse_legacy_alias($alias);
! 
! 	return \%hash;	
! }
! 
! sub parse_legacy_file {
! 	my ($self, $filename, $t) = @_;
! 
! 	my $line_count = 0;
! 	my @rules;
  	my $identity = $t->identity;
! 	my $s = $t->server;
  
! 	$s->trace("M ($identity) A10email opening $filename...", 3);
  
! 
! 	open CONFIG, $filename or return -1;
  	while(<CONFIG>) {
+ 		$line_count++;
  		my $line = $_;
  		if($line =~ m/^#/ || $line =~ m/^\s/) {
***************
*** 22,84 ****
  		$line =~ s/\*/\.\*/g;
  		chop $line;
  
! 		my ($pass,$agent,$severity,$subsystem,$message,$count,$alias) =
! 			split /\s+/, $line, 7;
! 		my $key = join ":", ($t->agent, $t->severity, $t->subsystem, $t->message);
! 		my $total = $#{$alertlist{$key}->{sub_alerts}} + 1;
! 		if(($t->agent =~ m/$agent/) &&
! 			($t->severity =~ m/$severity/) &&
! 			($t->subsystem =~ m/$subsystem/) &&
! 			($t->message =~ m/$message/) && ($total == $count)) {
! 				$s->trace("($identity) Matched for $alias",4);
! 				my ($protocol, $parameter) = split /:/, $alias, 2;
! 				if($protocol eq "file") {				
! 					if($self->parse_file($parameter, $t, $emails) == -1) {
! 						$s->log("($identity) File $parameter not found!", WARNING);
  					}
! 				} elsif($protocol eq "email") {
! 					$emails->{$parameter} = 1;
! 				} else {
! 					$emails->{$alias} = 1;
  				}
! 			
! 				if($pass eq "+") {
! 				last;
  				}
  		}
  	}
- 	close CONFIG;
  
! 	return 0;
  }
  
  sub handler {
! 	my ($self,$t) = @_;
  
  	my $s = $t->server;
! 	my $queue = new Benson();
  	my $identity = $t->identity;
  
  	my $alertlist = $queue->sorted_href_alert_list();
! 	$s->trace("($identity) A10email action handler begins...",3);
  	my $filename = $s->ServerRoot."/etc/email.conf";
! 	my %emails;
  
  	#
! 	# Populate hash of emails
  	#
! 	if($self->parse_file($filename, $t, $alertlist, \%emails) == -1) {
! 		$s->log("($identity) File $filename not found!", FATAL);
  	}
  
  	#
  	# Send emails to hash list
  	#
! 	foreach my $email (keys %emails) {
! 		$s->trace("($identity) Sending alert($identity) email to $email", 3);
! 		$self->send_email($email, $t);
! 		$queue->submit(severity => "informational",
! 				subsystem => "A10email",
! 				message => "Email for $identity sent to $email");
  	}
  
--- 78,289 ----
  		$line =~ s/\*/\.\*/g;
  		chop $line;
+ 		push @rules, $self->parse_legacy_line($line_count, $line);
+ 	}
+ 	close CONFIG;
+ 
+ 	return \@rules;
+ }
  
! sub process_rules_files {
! 	my ($self, $t, $rule_files) = @_;
! 
! 	my $identity = $t->identity;
! 	my $s = $t->server;
! 	my $not_done = 1;
! 
! 	#
! 	# Goal is to process all files, but only once.
! 	#
! 	while($not_done) {
! 		$not_done = 0;
! 		foreach my $file_key (keys %{$rule_files}) {
! 
! 			#
! 			# Don't read processed files, again.
! 			#
! 			if($rule_files->{$file_key}->{processed} != 0) {
! 				next;
! 			}
! 
! 			#
! 			# Parse the rules looking for more files to parse.
! 			#
! 			my $number_of_rules = 0;
! 			foreach my $rule (@{$rule_files->{$file_key}->{rules}}) {
! 				$number_of_rules++;
! 				#
! 				# If the rule is for a legacy_file read that.
! 				#
! 				if ($rule->{action}->{protocol} eq "legacy_file") {
! 					my $legacy_filename = $rule->{action}->{parameter};
! 
! 					#
! 					# If we're reading that file already, skip it.
! 					#
! 					if($legacy_filename eq $file_key) {
! 						next;
! 					}
! 
! 					#
! 					# If we've already read that file, skip it.
! 					#
! 					if($rule_files->{$legacy_filename}->{processed} != 0) {
! 						next;
! 					}
! 
! 					my %hash;
! 					if(($rules = $self->parse_legacy_file($legacy_filename, $t)) == -1) {
! 						#
! 						# If we can't even find the file, mark as bad.
! 						#
! 						$hash{processed} = -1;
! 						$s->log("M ($identity) File $legacy_filename not found", WARNING);
! 					} else {
! 						#
! 						# Everything is good, mark as unprocessed.
! 						#
! 						$hash{processed} = 0;
  					}
! 					$hash{rules} = $rules;
! 					$rule_files->{$legacy_filename} = \%hash;
! 					$not_done = 1;
  				}
! 			}
! 			$s->trace("M ($identity) $file_key read $number_of_rules rules.", 3);
! 			$rule_files->{$file_key}->{processed} = 1;
! 		}
! 	}
! 	return 0;
! }
! 
! sub process_trap {
! 	my ($self, $t, $rule_files, $list, $filename) = @_;
! 
! 	my $identity = $t->identity;
! 	my $s = $t->server;
! 	my %alertlist = %{$list};
! 	my $key = join ":", ($t->agent, $t->severity, $t->subsystem, $t->message);
! 	my $total = $#{$alertlist{$key}->{sub_alerts}} + 1;
! 	my $emails;
! 
! 	if($rule_files->{$filename}->{processed} != 1) {
! 		return -1;
! 	}
! 
! 	foreach my $rule (@{$rule_files->{$filename}->{rules}}) {
! 
! 		my $agent_found = 0;
! 		my $line_count = $rule->{line_count};
! 		foreach my $agents (@{$rule->{agents}}) {
! 			if($t->agent =~ m/$agents/) {
! 				$s->trace("M ($identity) Line $line_count matched agent=$agents", 4);
! 				$agent_found = 1;
! 			}
! 		}
! 
! 		my $severity_found = 0;
! 		foreach my $severity (@{$rule->{severity}}) {
! 			if($t->severity =~ m/$severity/) {
! 				$s->trace("M ($identity) Line $line_count matched severity=$severity", 4);
! 				$severity_found = 1;
! 			}
! 		}
! 
! 		my $subsystem_found = 0;
! 		foreach my $subsystem (@{$rule->{subsystem}}) {
! 			if($t->subsystem =~ m/$subsystem/) {
! 				$s->trace("M ($identity) Line $line_count matched subsystem=$subsystem", 4);
! 				$subsystem_found = 1;
! 			}
! 		}
! 
! 		my $message_found = 0;
! 		foreach my $message (@{$rule->{message}}) {
! 			if($t->message =~ m/$message/) {
! 				$s->trace("M ($identity) Line $line_count matched message=$message", 4);
! 				$message_found = 1;
! 			}
! 		}
! 
! 		if($agent_found && $severity_found &&
! 			$subsystem_found && $message_found &&
! 				$self->match_total_count($total, $rule->{count})) {
! 			$s->trace("C ($identity) matched on $filename:$line_count", 4);
! 			$s->trace("C ($identity) action is ".$rule->{action}->{protocol}.":".$rule->{action}->{parameter}, 4);
! 
! 			if($rule->{action}->{protocol} eq "legacy_file") {
! 				my $rc;
! 				if(($rc = $self->process_trap($t, $rule_files, $list, $rule->{action}->{parameter})) == -1) {
! 					$s->trace("M ($identity) rules for ".$rule->{action}->{parameter}." not found", 4);
! 				}
! 				foreach my $email (keys %{$rc}) {
! 					$emails->{$email} = 1;
  				}
+ 			} elsif($protocol eq "email") {
+ 				$emails->{$rule->{action}->{parameter}} = 1;
+ 			} else {
+ 				$emails->{$rule->{action}->{parameter}} = 1;
+ 			}
+ 
+ 			if($rule->{pass} eq "+") {
+ 				last;
+ 			}
+ 		} else {
+ 			my $total_matched = $agent_found + $severity_found + $subsystem_found +
+ 						$message_found + $self->match_total_count($total, $rule->{count});
+ 			$s->trace("C ($identity) did not match ($total_matched/5) on $filename:$line_count", 4);
  		}
  	}
  
! 	return $emails;
  }
  
  sub handler {
! 	my ($self, $t) = @_;
  
  	my $s = $t->server;
! 	my $queue = new Benson;
  	my $identity = $t->identity;
+ 	my %rule_files;
+ 
  
  	my $alertlist = $queue->sorted_href_alert_list();
! 	$s->trace("M ($identity) A10email action handler begins...",3);
  	my $filename = $s->ServerRoot."/etc/email.conf";
! 
  
  	#
! 	# Populate a list of rules. (prime the pump)
  	#
! 	if(($rules = $self->parse_legacy_file($filename, $t)) == -1) {
! 		$s->log("M ($identity) File $filename not found!", FATAL);
  	}
  
  	#
+ 	# Populate first rule file
+ 	#
+ 	my %hash;
+ 	$hash{rules} = $rules;
+ 	$hash{processed} = 0;
+ 	$rule_files{$filename} = \%hash;
+ 
+ 	#
+ 	# Process the rest of the files.
+ 	#
+ 	my $rc = $self->process_rules_files($t, \%rule_files);
+ 
+ 	$s->trace("T ($identity) agent=".$t->agent." severity=".$t->severity." subsystem=".$t->subsystem." message=".$t->message, 4);
+ 
+ 	#
+ 	# Pass the trap through the rule set
+ 	#
+ 	my $emails = $self->process_trap($t, \%rule_files, $alertlist, $filename);
+ 
+ 	#
  	# Send emails to hash list
  	#
! 	foreach my $email (keys %{$emails}) {
! 		$s->trace("M ($identity) Sending alert email to $email", 3);
! #		$self->send_email($email, $t);
  	}
  
***************
*** 86,99 ****
  }
  
- sub match_alert {
- 	my ($self, $t, $key) = @_;
- 	my ($agent, $severity, $subsystem, $message) = split /\:/, $key, 4;
- 	if(($t->agent =~ m/$agent/) &&
- 		($t->severity =~ m/$severity/) &&
- 		($t->subsystem =~ m/$subsystem/) &&
- 		($t->message =~ m/$message/)) { return 1; }
- 	return 0;
- }
- 
  sub send_email {
  	my ($self,$alias,$t) = @_;
--- 291,294 ----
***************
*** 105,109 ****
  	my $subject = $t->agent.":".$t->severity.":".$t->subsystem.":".$t->message;
  	my $message = $t->message;
! 	$t->server->log("($identity) Sending an email to $alias", INFO);
  	open MAIL, "| /usr/lib/sendmail -t -n";
  	print MAIL <<EOT;
--- 300,304 ----
  	my $subject = $t->agent.":".$t->severity.":".$t->subsystem.":".$t->message;
  	my $message = $t->message;
! 	$t->server->log("M ($identity) Sending an email to $alias", INFO);
  	open MAIL, "| /usr/lib/sendmail -t -n";
  	print MAIL <<EOT;

[Benson-commit] CVS: benson3/handlers A10email.pm,1.6,1.7

From: Bob T. <bt...@us...> - 2004-01-25 17:36:53

Update of /cvsroot/benson/benson3/handlers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11347/handlers

Modified Files:
	A10email.pm 
Log Message:
Some fixes to the A10email handler.

Index: A10email.pm
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/A10email.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** A10email.pm	19 Jan 2004 19:19:09 -0000	1.6
--- A10email.pm	25 Jan 2004 17:36:05 -0000	1.7
***************
*** 9,15 ****
  
  	my $s = $t->server;
  	my %alertlist = %{$list};
  
! 	$s->trace("A10email opening $filename...",3);
  
  	open CONFIG, $filename || return -1;
--- 9,16 ----
  
  	my $s = $t->server;
+ 	my $identity = $t->identity;
  	my %alertlist = %{$list};
  
! 	$s->trace("($identity) A10email opening $filename...",3);
  
  	open CONFIG, $filename || return -1;
***************
*** 30,38 ****
  			($t->subsystem =~ m/$subsystem/) &&
  			($t->message =~ m/$message/) && ($total == $count)) {
! 				$s->trace("Matched for $alias",4);
  				my ($protocol, $parameter) = split /:/, $alias, 2;
  				if($protocol eq "file") {				
  					if($self->parse_file($parameter, $t, $emails) == -1) {
! 						$s->log("File $parameter not found!", WARNING);
  					}
  				} elsif($protocol eq "email") {
--- 31,39 ----
  			($t->subsystem =~ m/$subsystem/) &&
  			($t->message =~ m/$message/) && ($total == $count)) {
! 				$s->trace("($identity) Matched for $alias",4);
  				my ($protocol, $parameter) = split /:/, $alias, 2;
  				if($protocol eq "file") {				
  					if($self->parse_file($parameter, $t, $emails) == -1) {
! 						$s->log("($identity) File $parameter not found!", WARNING);
  					}
  				} elsif($protocol eq "email") {
***************
*** 57,65 ****
  	my $s = $t->server;
  	my $queue = new Benson();
  
- #	my %alertlist = %{$queue->sorted_href_alert_list()};
  	my $alertlist = $queue->sorted_href_alert_list();
! 	$s->trace("A10email action handler begins...",3);
! 	my $identity = $t->identity;
  	my $filename = $s->ServerRoot."/etc/email.conf";
  	my %emails;
--- 58,65 ----
  	my $s = $t->server;
  	my $queue = new Benson();
+ 	my $identity = $t->identity;
  
  	my $alertlist = $queue->sorted_href_alert_list();
! 	$s->trace("($identity) A10email action handler begins...",3);
  	my $filename = $s->ServerRoot."/etc/email.conf";
  	my %emails;
***************
*** 69,73 ****
  	#
  	if($self->parse_file($filename, $t, $alertlist, \%emails) == -1) {
! 		$s->log("File $filename not found!", WARNING);
  	}
  
--- 69,73 ----
  	#
  	if($self->parse_file($filename, $t, $alertlist, \%emails) == -1) {
! 		$s->log("($identity) File $filename not found!", FATAL);
  	}
  
***************
*** 76,81 ****
  	#
  	foreach my $email (keys %emails) {
! 		$s->trace("Sending alert($identity) email to $email", 3);
  		$self->send_email($email, $t);
  	}
  
--- 76,84 ----
  	#
  	foreach my $email (keys %emails) {
! 		$s->trace("($identity) Sending alert($identity) email to $email", 3);
  		$self->send_email($email, $t);
+ 		$queue->submit(severity => "informational",
+ 				subsystem => "A10email",
+ 				message => "Email for $identity sent to $email");
  	}
  
***************
*** 102,106 ****
  	my $subject = $t->agent.":".$t->severity.":".$t->subsystem.":".$t->message;
  	my $message = $t->message;
! 	$t->server->log("Sending an email to $alias", INFO);
  	open MAIL, "| /usr/lib/sendmail -t -n";
  	print MAIL <<EOT;
--- 105,109 ----
  	my $subject = $t->agent.":".$t->severity.":".$t->subsystem.":".$t->message;
  	my $message = $t->message;
! 	$t->server->log("($identity) Sending an email to $alias", INFO);
  	open MAIL, "| /usr/lib/sendmail -t -n";
  	print MAIL <<EOT;

[Benson-commit] CVS: benson3/include/benson benson.h,1.26,1.27

From: Bob T. <bt...@us...> - 2004-01-20 19:18:48

Update of /cvsroot/benson/benson3/include/benson
In directory sc8-pr-cvs1:/tmp/cvs-serv9326/include/benson

Modified Files:
	benson.h 
Log Message:
Added changes to compile on RHAS

Index: benson.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/benson.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** benson.h	8 Nov 2003 21:05:15 -0000	1.26
--- benson.h	20 Jan 2004 19:18:45 -0000	1.27
***************
*** 21,28 ****
  #include "config.h"
  #include "benson/const.h"
! #ifdef HAVE_LIBSSL
!  #define HAVE_SSL
!  #include "benson/ssl.h"
! #endif
  //#include "benson/network.h"
  // #include "benson/perl_util.h"
--- 21,28 ----
  #include "config.h"
  #include "benson/const.h"
! //#ifdef HAVE_LIBSSL
! // #define HAVE_SSL
! // #include "benson/ssl.h"
! //#endif
  //#include "benson/network.h"
  // #include "benson/perl_util.h"

[Benson-commit] CVS: benson3/handlers A10email.pm,1.5,1.6

From: Bob T. <bt...@us...> - 2004-01-19 19:19:15

Update of /cvsroot/benson/benson3/handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv24653/handlers

Modified Files:
	A10email.pm 
Log Message:
Added the fixed A10email.pm module.

Index: A10email.pm
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/A10email.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** A10email.pm	16 Feb 2002 17:11:15 -0000	1.5
--- A10email.pm	19 Jan 2004 19:19:09 -0000	1.6
***************
*** 5,18 ****
  use POSIX;
  
! sub handler {
! 	my ($self,$t) = @_;
  
  	my $s = $t->server;
! 	my $queue = new Benson();
  
! 	my %alertlist = %{$queue->sorted_href_alert_list()};
! 	$s->trace("A10email action handler begins...",3);
! 	
! 	open CONFIG, $s->ServerRoot."/etc/email.conf";
  	while(<CONFIG>) {
  		my $line = $_;
--- 5,17 ----
  use POSIX;
  
! sub parse_file {
! 	my ($self, $filename, $t, $list, $emails) = @_;
  
  	my $s = $t->server;
! 	my %alertlist = %{$list};
  
! 	$s->trace("A10email opening $filename...",3);
! 
! 	open CONFIG, $filename || return -1;
  	while(<CONFIG>) {
  		my $line = $_;
***************
*** 32,36 ****
  			($t->message =~ m/$message/) && ($total == $count)) {
  				$s->trace("Matched for $alias",4);
! 				$self->send_email($alias, $t);
  			
  				if($pass eq "+") {
--- 31,44 ----
  			($t->message =~ m/$message/) && ($total == $count)) {
  				$s->trace("Matched for $alias",4);
! 				my ($protocol, $parameter) = split /:/, $alias, 2;
! 				if($protocol eq "file") {				
! 					if($self->parse_file($parameter, $t, $emails) == -1) {
! 						$s->log("File $parameter not found!", WARNING);
! 					}
! 				} elsif($protocol eq "email") {
! 					$emails->{$parameter} = 1;
! 				} else {
! 					$emails->{$alias} = 1;
! 				}
  			
  				if($pass eq "+") {
***************
*** 40,43 ****
--- 48,83 ----
  	}
  	close CONFIG;
+ 
+ 	return 0;
+ }
+ 
+ sub handler {
+ 	my ($self,$t) = @_;
+ 
+ 	my $s = $t->server;
+ 	my $queue = new Benson();
+ 
+ #	my %alertlist = %{$queue->sorted_href_alert_list()};
+ 	my $alertlist = $queue->sorted_href_alert_list();
+ 	$s->trace("A10email action handler begins...",3);
+ 	my $identity = $t->identity;
+ 	my $filename = $s->ServerRoot."/etc/email.conf";
+ 	my %emails;
+ 
+ 	#
+ 	# Populate hash of emails
+ 	#
+ 	if($self->parse_file($filename, $t, $alertlist, \%emails) == -1) {
+ 		$s->log("File $filename not found!", WARNING);
+ 	}
+ 
+ 	#
+ 	# Send emails to hash list
+ 	#
+ 	foreach my $email (keys %emails) {
+ 		$s->trace("Sending alert($identity) email to $email", 3);
+ 		$self->send_email($email, $t);
+ 	}
+ 
  	return OK;
  }
***************
*** 59,62 ****
--- 99,103 ----
  	my $from = "benson\@".$t->agent;
  	my $to = $alias;
+ 	my $identity = $t->identity;
  	my $subject = $t->agent.":".$t->severity.":".$t->subsystem.":".$t->message;
  	my $message = $t->message;
***************
*** 69,72 ****
--- 110,114 ----
  
  Message: $message
+ Identity: $identity
  Timestamp: $timestamp
  EOT

[Benson-commit] CVS: Net-Benson/t - New directory

From: Bob T. <bt...@us...> - 2003-12-21 21:04:30

Update of /cvsroot/benson/Net-Benson/t
In directory sc8-pr-cvs1:/tmp/cvs-serv12352/t

Log Message:
Directory /cvsroot/benson/Net-Benson/t added to the repository

[Benson-commit] CVS: Net-Benson - Imported sources

From: Bob T. <bt...@us...> - 2003-12-19 01:03:20

Update of /cvsroot/benson/Net-Benson
In directory sc8-pr-cvs1:/tmp/cvs-serv25042

Log Message:
Initial submission

Status:

Vendor Tag:	newportal
Release Tags:	initial
		
N Net-Benson/Benson.pm
N Net-Benson/MANIFEST
N Net-Benson/Makefile.PL
N Net-Benson/Benson/Headers.pm

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources

[Benson-commit] CVS: benson3/src bensond.h,NONE,1.1

From: Bob T. <bt...@us...> - 2003-12-18 20:09:17

Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28284

Added Files:
	bensond.h 
Log Message:
Added the header file for the benson daemon.

--- NEW FILE: bensond.h ---
int bn_monitor_daemon(int argc, char *argv[], char *env[]);
int bn_rules_daemon(int argc, char *argv[], char *env[]);
int bn_network_daemon();

[Benson-commit] CVS: benson3/src/network v31_network_request.c,1.9,1.10

From: Bob T. <bt...@us...> - 2003-12-16 16:17:49

Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv24273/src/network

Modified Files:
	v31_network_request.c 
Log Message:
A few fixes to the network code.

Index: v31_network_request.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_request.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** v31_network_request.c	8 Nov 2003 20:43:20 -0000	1.9
--- v31_network_request.c	16 Dec 2003 16:17:46 -0000	1.10
***************
*** 132,135 ****
--- 132,136 ----
  	while((alert = av_pop(alerts)) != &PL_sv_undef) {
  		bn_alertlist_response_v31 insert;
+ 		memset(&insert, 0, sizeof(bn_alertlist_response_v31));
  		fields = (HV*)SvRV(alert);
  		safe_strncpy(insert.identity, SvPVX(*hv_fetch(fields, "identity", 8, FALSE)), ID_MAXSIZE_v31);

[Benson-commit] CVS: benson3/handlers S05benson.pm,1.8,1.9

From: Bob T. <bt...@us...> - 2003-12-16 16:17:49

Update of /cvsroot/benson/benson3/handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv24273/handlers

Modified Files:
	S05benson.pm 
Log Message:
A few fixes to the network code.

Index: S05benson.pm
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/S05benson.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** S05benson.pm	11 Nov 2003 19:32:53 -0000	1.8
--- S05benson.pm	16 Dec 2003 16:17:46 -0000	1.9
***************
*** 20,23 ****
--- 20,27 ----
  	my $starttime = $hash{starttime} || $current_time;
  	my $endtime = $hash{endtime} || $default_endtime;
+ 	my $override = $hash{override} || "N";
+ 	if($override =~ m/y/i) {
+ 		$override = "Y";
+ 	}
  	if(defined $hash{duration}) {
  		# calculate startime in epoch seconds
***************
*** 43,47 ****
  	endtime,
  	reason,
! 	remove)
  VALUES
  	(NEXTVAL('suppress_sequence'),
--- 47,52 ----
  	endtime,
  	reason,
! 	remove,
! 	override)
  VALUES
  	(NEXTVAL('suppress_sequence'),
***************
*** 50,54 ****
  	to_timestamp('$endtime','yyyy-mm-dd_HH24:MI:SS'),
  	'$reason',
! 	'N')
  EOSQL
  
--- 55,60 ----
  	to_timestamp('$endtime','yyyy-mm-dd_HH24:MI:SS'),
  	'$reason',
! 	'N',
! 	'$override')
  EOSQL
  
***************
*** 71,75 ****
  	my $id = $hash{identity} || "null";
  	my $agent = $hash{agent} || "null";
! 	my $sql_remove;
  
  	if($id ne "null") {
--- 77,82 ----
  	my $id = $hash{identity} || "null";
  	my $agent = $hash{agent} || "null";
! 	my $override = $hash{override} || "no";
! 	my $current_time = POSIX::strftime("%Y-%m-%d_%H:%M:%S", localtime(time));
  
  	if($id ne "null") {
***************
*** 89,97 ****
  	remove = 'Y'
  WHERE
! 	agent = $agent
  EOSQL
  	} else {
  		return;
  	}
  
  	my $dbh = DBI->connect($s->DBIConnectString, $s->DBIUsername, $s->DBIPassword);
--- 96,114 ----
  	remove = 'Y'
  WHERE
! 	agent = '$agent'
! AND
! 	endtime > to_timestamp('$current_time', 'yyyy-mm-dd_HH24:MI:SS')
  EOSQL
  	} else {
  		return;
  	}
+ 
+ 	if($override =~ m/n/i) {
+ 		$sql_remove .= <<EOSQL;
+ AND
+ 	override = 'N'
+ EOSQL
+ 	}
+ 
  
  	my $dbh = DBI->connect($s->DBIConnectString, $s->DBIUsername, $s->DBIPassword);

[Benson-commit] CVS: benson3/scripts postgresql.sql,1.11,1.12

From: Bob T. <bt...@us...> - 2003-12-16 16:17:49

Update of /cvsroot/benson/benson3/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv24273/scripts

Modified Files:
	postgresql.sql 
Log Message:
A few fixes to the network code.

Index: postgresql.sql
===================================================================
RCS file: /cvsroot/benson/benson3/scripts/postgresql.sql,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** postgresql.sql	11 Nov 2002 05:23:56 -0000	1.11
--- postgresql.sql	16 Dec 2003 16:17:46 -0000	1.12
***************
*** 75,83 ****
  	suppress_id INTEGER,
  	agent VARCHAR(256),
! 	STARTTIME TIMESTAMP,
! 	ENDTIME TIMESTAMP,
! 	REASON VARCHAR(256),
! 	REMOVE VARCHAR(1)
  );
  
  DROP TABLE agents;
--- 75,86 ----
  	suppress_id INTEGER,
  	agent VARCHAR(256),
! 	starttime TIMESTAMP,
! 	endtime TIMESTAMP,
! 	reason VARCHAR(256),
! 	remove VARCHAR(1),
! 	override VARCHAR (1)
  );
+ 
+ ALTER TABLE suppress ALTER COLUMN override set default 'N';
  
  DROP TABLE agents;

[Benson-commit] CVS: benson3/scripts/cgi alertview.cgi.tmpl,1.1,1.2

From: Bob T. <bt...@us...> - 2003-12-12 19:14:32

Update of /cvsroot/benson/benson3/scripts/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv22671/scripts/cgi

Modified Files:
	alertview.cgi.tmpl 
Log Message:
latest changes

Index: alertview.cgi.tmpl
===================================================================
RCS file: /cvsroot/benson/benson3/scripts/cgi/alertview.cgi.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** alertview.cgi.tmpl	26 Nov 2003 23:01:03 -0000	1.1
--- alertview.cgi.tmpl	12 Dec 2003 19:14:28 -0000	1.2
***************
*** 17,20 ****
--- 17,50 ----
  my $query = new CGI;
  
+ my $webserver_url = $queue->get("WebserverURL");
+ my $config_error = "false";
+ my $error;
+ if($webserver_url eq "http://changeme") {
+ 	$config_error = "true";
+ 	$error .= <<EOT
+ <b>WebserverURL Directive</b>
+ EOT
+ }
+ 
+ if($config_error eq "true") {
+ 	print <<EOT;
+ Content-type: text/html
+ 
+ <html>
+ <head><title>Benson Configuration Error</title></head>
+ <body bgcolor="#FFFFFF">
+ <h2>Configuration Error</h2>
+ You need to change some things here in the configuration file located here<br>
+ <hr>
+ $error
+ <hr>
+ <pre>
+ </body>
+ </html>
+ EOT
+ 	exit;
+ }
+ 
+ 
  my $date_and_time = "null";
  
***************
*** 78,81 ****
--- 108,149 ----
  
  <html>
+ <head>
+  <meta content="120" http-equiv="refresh">
+  <title>Benson 3.1 Alert View</title>
+ </head>
+ <script language="JavaScript">
+ var bChk = false;
+ 
+ function openregisterwindow() 
+ {
+ window.open("$webserver_url/cgi-bin/register_host.cgi",
+ 	"Register",
+ 	"toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=520,height=100")
+ }
+         
+ function opensuppresswindow()
+ {
+ window.open("$webserver_url/cgi-bin/suppress.cgi",
+ 	"Suppress",
+ 	"toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=520,height=250")
+ }
+ 
+ function toggle(btnSender)
+ {
+ bChk = !bChk;
+ var bOK = false;
+ var e=document.forms[0].elements;
+ 
+ for (var i=0;i<e.length;i++) {
+ 	if (!bOK && e[i] == btnSender)
+ 		bOK = true;
+ 	else if (bOK && e[i].type != "checkbox")
+ 		return;   
+ 	else if (bOK && e[i].type == "checkbox" && e[i].name.substring(0,2) == "id")
+ 		e[i].checked = bChk;
+ 	}
+ }
+ 
+ </script>
  <body bgcolor="#FFFFFF">
  <map name="severity-sorted">
***************
*** 119,122 ****
--- 187,191 ----
  
  foreach my $key (@sorted_rows) {
+ 	my $total = $#{$alertlist{$key}->{sub_alerts}} + 1;
  	my $identity = $alertlist{$key}->{first_id};
  	my ($timestamp, $alerthash, $sequence) = split /\./, $identity;
***************
*** 135,140 ****
    <td align="center" bgcolor="$severity{$sev}->{color}"><font color="#FFFFFF"><b>$sev</b></font></td>
    <td align="center">$subsystem</td>
!   <td>$message</td>
!   <td>-1</td>
   </tr>
  EOT
--- 204,209 ----
    <td align="center" bgcolor="$severity{$sev}->{color}"><font color="#FFFFFF"><b>$sev</b></font></td>
    <td align="center">$subsystem</td>
!   <td align="left">$message</td>
!   <td align="center">$total</td>
   </tr>
  EOT
***************
*** 143,145 ****
--- 212,216 ----
  print <<EOT;
  </table>
+ <input type="submit" value="Acknowledge/Suppress">
+ <hr>
  EOT

[Benson-commit] CVS: benson3/src bensond.c,1.31,1.32

From: Bob T. <bt...@us...> - 2003-12-12 19:14:32

Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22671/src

Modified Files:
	bensond.c 
Log Message:
latest changes

Index: bensond.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bensond.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** bensond.c	8 Nov 2003 20:43:19 -0000	1.31
--- bensond.c	12 Dec 2003 19:14:28 -0000	1.32
***************
*** 6,12 ****
--- 6,29 ----
   */
  
+ #include "bensond.h"
  #include "benson/benson.h"
  #include "benson/cfgctl.h"
  
+ int usage(void) {
+ 	printf("Benson Distributed Monitoring System (%s %s)\n", PACKAGE, VERSION);
+ 	printf("Copyright (C) 1999, 2000, 2001, 2002, 2003 Bob Tribit\n\n");
+ 	printf("This program is distributed in the hope that it will be useful,\n");
+ 	printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
+ 	printf("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n");
+ 	printf("GNU General Public License for more details.\n\n");
+ 	printf("Usage: bensond [options]\n");
+ 	printf("Invoke the benson daemon(s). NOTE: This is usually done via bensonctl\n\n");
+ 	printf("  -D                     required for daemon to be invoked\n");
+ 	printf("  -V                     display version information\n\n");
+ 	printf("Report bugs to <ben...@ne...>\n");
+ 	
+ 	exit(EXIT_FAILURE);
+ }
+ 
  int
  start(char *filename) {
***************
*** 33,37 ****
  int main(int argc, char *argv[], char *env[])
  {
! 	int rc;
  	char benson_mode[DVALUE_LENGTH];
  
--- 50,54 ----
  int main(int argc, char *argv[], char *env[])
  {
! 	int rc = 0;
  	char benson_mode[DVALUE_LENGTH];
  
***************
*** 56,60 ****
  	if(!strcmp(argv[0], "bn_network")) {
  		bn_network_daemon();
- //		bn_network_daemon(argc,argv,env);
  		syslog(LOG_ERR, "bn_network process returned unexpectedly.");
  		closelog();
--- 73,76 ----

[Benson-commit] CVS: benson3/src/monitors/process proc_mon.h,1.2,1.3 proc_scan.c,1.2,1.3

From: Bob T. <bt...@us...> - 2003-12-12 19:14:32

Update of /cvsroot/benson/benson3/src/monitors/process
In directory sc8-pr-cvs1:/tmp/cvs-serv22671/src/monitors/process

Modified Files:
	proc_mon.h proc_scan.c 
Log Message:
latest changes

Index: proc_mon.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/monitors/process/proc_mon.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** proc_mon.h	28 Sep 2003 22:26:28 -0000	1.2
--- proc_mon.h	12 Dec 2003 19:14:28 -0000	1.3
***************
*** 1,5 ****
  #include "proc_scan.h"
  #include "proc_cfg.h"
- #include "monitor.h"
  #include <regex.h>
  
--- 1,4 ----

Index: proc_scan.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/monitors/process/proc_scan.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** proc_scan.c	24 Feb 2003 08:25:26 -0000	1.2
--- proc_scan.c	12 Dec 2003 19:14:28 -0000	1.3
***************
*** 1,3 ****
--- 1,6 ----
  #include <assert.h>
+ #include <malloc.h>
+ #include <string.h>
+ #include <stdlib.h>
  #include "proc_scan.h"

[Benson-commit] CVS: benson3 configure,1.63,1.64 configure.ac,1.11,1.12

From: Bob T. <bt...@us...> - 2003-12-12 19:14:32

Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv22671

Modified Files:
	configure configure.ac 
Log Message:
latest changes

Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** configure	8 Nov 2003 21:05:14 -0000	1.63
--- configure	12 Dec 2003 19:14:27 -0000	1.64
***************
*** 309,313 ****
  #endif"
  
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP LD_SEARCH_FLAG perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS pythonpath tclpath ALL_LIBS LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
--- 309,313 ----
  #endif"
  
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP LD_SEARCH_FLAG perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS ALL_LIBS LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
***************
*** 854,858 ****
    --with-ssl=dir          Find SSL libraries for SSL/TLS support below dir
    --with-expat=dir        Find expat libraries for XML support below dir
-   --with-db=dir           Find Berkeley DB libraries for Benson below dir
  
  Some influential environment variables:
--- 854,857 ----
***************
*** 3339,3344 ****
    with_perl=yes
  fi;
- #AC_ARG_WITH(python,      [  --with-python=dir       Find Python libraries for Python support below dir],python_dir=$withval, with_python=no)
- #AC_ARG_WITH(tcl,         [  --with-tcl=dir          Find TCL libraries for TCL support below dir],tcl_dir=$withval, with_tcl=no)
  
  # Check whether --with-ssl or --without-ssl was given.
--- 3338,3341 ----
***************
*** 3357,3368 ****
    with_expat=no
  fi;
! 
! # Check whether --with-db or --without-db was given.
! if test "${with_db+set}" = set; then
!   withval="$with_db"
!   db_dir=$withval
! else
!   with_db=no
! fi;
  # Check whether --enable-debug or --disable-debug was given.
  if test "${enable_debug+set}" = set; then
--- 3354,3358 ----
    with_expat=no
  fi;
! #AC_ARG_WITH(db,          [  --with-db=dir           Find Berkeley DB libraries for Benson below dir],db_dir=$withval, with_db=no)
  # Check whether --enable-debug or --disable-debug was given.
  if test "${enable_debug+set}" = set; then
***************
*** 3411,3418 ****
  fi
  
! if test X"$with_db" != Xno; then
! 	CPPFLAGS="$CPPFLAGS -I$db_dir/include"
! 	LDFLAGS="$LDFLAGS -R$db_dir/lib -L$db_dir/lib"
! fi
  
  
--- 3401,3408 ----
  fi
  
! #if test X"$with_db" != Xno; then
! #	CPPFLAGS="$CPPFLAGS -I$db_dir/include"
! #	LDFLAGS="$LDFLAGS -R$db_dir/lib -L$db_dir/lib"
! #fi
  
  
***************
*** 4649,4794 ****
  done
  
! 
! for ac_header in db.h
! do
! as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
! else
!   # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
! cat >conftest.$ac_ext <<_ACEOF
! #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! $ac_includes_default
! #include <$ac_header>
! _ACEOF
! rm -f conftest.$ac_objext
! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
!   (eval $ac_compile) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
!          { ac_try='test -s conftest.$ac_objext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_header_compiler=yes
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! ac_header_compiler=no
! fi
! rm -f conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
! 
! # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
! cat >conftest.$ac_ext <<_ACEOF
! #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! #include <$ac_header>
! _ACEOF
! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
!   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } >/dev/null; then
!   if test -s conftest.err; then
!     ac_cpp_err=$ac_c_preproc_warn_flag
!   else
!     ac_cpp_err=
!   fi
! else
!   ac_cpp_err=yes
! fi
! if test -z "$ac_cpp_err"; then
!   ac_header_preproc=yes
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
!   ac_header_preproc=no
! fi
! rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
! 
! # So?  What about this header?
! case $ac_header_compiler:$ac_header_preproc in
!   yes:no )
!     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
! echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
!     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------ ##
! ## Report this to bug...@gn.... ##
! ## ------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
!   no:yes )
!     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
! echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
!     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
! echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
!     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! ## ------------------------------------ ##
! ## Report this to bug...@gn.... ##
! ## ------------------------------------ ##
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
! esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   eval "$as_ac_Header=$ac_header_preproc"
! fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
! 
! fi
! if test `eval echo '${'$as_ac_Header'}'` = yes; then
!   cat >>confdefs.h <<_ACEOF
! #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
! _ACEOF
! 
! fi
! 
! done
! 
  
  echo "$as_me:$LINENO: checking for open in -lnsl" >&5
--- 4639,4643 ----
  done
  
! #AC_CHECK_HEADERS(db.h)
  
  echo "$as_me:$LINENO: checking for open in -lnsl" >&5
***************
*** 5367,5434 ****
  fi
  
! 
! echo "$as_me:$LINENO: checking for open in -ldb" >&5
! echo $ECHO_N "checking for open in -ldb... $ECHO_C" >&6
! if test "${ac_cv_lib_db_open+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_check_lib_save_LIBS=$LIBS
! LIBS="-ldb  $LIBS"
! cat >conftest.$ac_ext <<_ACEOF
! #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! 
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char open ();
! int
! main ()
! {
! open ();
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
!   (eval $ac_link) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
!          { ac_try='test -s conftest$ac_exeext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_lib_db_open=yes
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! ac_cv_lib_db_open=no
! fi
! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
! LIBS=$ac_check_lib_save_LIBS
! fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_db_open" >&5
! echo "${ECHO_T}$ac_cv_lib_db_open" >&6
! if test $ac_cv_lib_db_open = yes; then
!   cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBDB 1
! _ACEOF
! 
!   LIBS="-ldb $LIBS"
! 
! fi
! 
  
  echo "$as_me:$LINENO: checking for BN_init in -lcrypto" >&5
--- 5216,5220 ----
  fi
  
! #AC_CHECK_LIB(db, open)
  
  echo "$as_me:$LINENO: checking for BN_init in -lcrypto" >&5
***************
*** 5724,5836 ****
  fi
  
- 
- if test X"$with_python" = Xyes; then
- 	# Extract the first word of ""python"", so it can be a program name with args.
- set dummy "python"; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_pythonpath+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $pythonpath in
-   [\\/]* | ?:[\\/]*)
-   ac_cv_path_pythonpath="$pythonpath" # Let the user override the test with a path.
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_path_pythonpath="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
- 
-   ;;
- esac
- fi
- pythonpath=$ac_cv_path_pythonpath
- 
- if test -n "$pythonpath"; then
-   echo "$as_me:$LINENO: result: $pythonpath" >&5
- echo "${ECHO_T}$pythonpath" >&6
- else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- 		echo "$as_me:$LINENO: checking for Python compile flags" >&5
- echo $ECHO_N "checking for Python compile flags... $ECHO_C" >&6
- 		echo "$as_me:$LINENO: result: not found, building without Python." >&5
- echo "${ECHO_T}not found, building without Python." >&6
- fi
- 
- if test X"$with_tcl" = Xyes; then
- 	# Extract the first word of ""tclsh"", so it can be a program name with args.
- set dummy "tclsh"; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_tclpath+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $tclpath in
-   [\\/]* | ?:[\\/]*)
-   ac_cv_path_tclpath="$tclpath" # Let the user override the test with a path.
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_path_tclpath="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
- 
-   ;;
- esac
- fi
- tclpath=$ac_cv_path_tclpath
- 
- if test -n "$tclpath"; then
-   echo "$as_me:$LINENO: result: $tclpath" >&5
- echo "${ECHO_T}$tclpath" >&6
- else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- 	echo "$as_me:$LINENO: checking version" >&5
- echo $ECHO_N "checking version... $ECHO_C" >&6
- 	TCL_VERSION=`echo 'puts "$tcl_version"' | $tclpath`
- 	if test "_$TCL_VERSION" = _ ; then
- 		echo "$as_me:$LINENO: result: version not found, building without Tcl." >&5
- echo "${ECHO_T}version not found, building without Tcl." >&6
- 	else
- 			echo "$as_me:$LINENO: result: $TCL_VERSION" >&5
- echo "${ECHO_T}$TCL_VERSION" >&6
- 	fi
- 	echo "$as_me:$LINENO: checking for Tcl compile flags" >&5
- echo $ECHO_N "checking for Tcl compile flags... $ECHO_C" >&6
- 	TCL_CFLAGS="-I/usr/include/"
- 	TCL_LDFLAGS="-L/usr/lib/ -ltcl$TCL_VERSION"
- 	CFLAGS="$CFLAGS $TCL_CFLAGS"
- 	LIBS="$LIBS $TCL_LDFLAGS"
- 	echo "$as_me:$LINENO: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- #       AC_MSG_RESULT([not found, building without Tcl.])
- fi
- 
- 
  LIBS=`echo $LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
  LIBS="$LIBS $CONF_LIBS"
--- 5510,5513 ----
***************
*** 6526,6531 ****
  s,@PERL_LDFLAGS@,$PERL_LDFLAGS,;t t
  s,@PERL_SLIBS@,$PERL_SLIBS,;t t
- s,@pythonpath@,$pythonpath,;t t
- s,@tclpath@,$tclpath,;t t
  s,@ALL_LIBS@,$ALL_LIBS,;t t
  s,@LIBOBJS@,$LIBOBJS,;t t
--- 6203,6206 ----

Index: configure.ac
===================================================================
RCS file: /cvsroot/benson/benson3/configure.ac,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** configure.ac	8 Nov 2003 21:05:15 -0000	1.11
--- configure.ac	12 Dec 2003 19:14:27 -0000	1.12
***************
*** 47,55 ****
  AC_ARG_WITH(pgsql,       [  --with-pgsql=dir        Find PostgreSQL libraries for Perl support below dir],pgsql_dir=$withval, with_pgsql=yes)
  AC_ARG_WITH(perl,        [  --with-perl=dir         Find Perl libraries for Perl support below dir],perl_dir=$withval, with_perl=yes)
- #AC_ARG_WITH(python,      [  --with-python=dir       Find Python libraries for Python support below dir],python_dir=$withval, with_python=no)
- #AC_ARG_WITH(tcl,         [  --with-tcl=dir          Find TCL libraries for TCL support below dir],tcl_dir=$withval, with_tcl=no)
  AC_ARG_WITH(ssl,         [  --with-ssl=dir          Find SSL libraries for SSL/TLS support below dir],ssl_dir=$withval, with_ssl=no)
  AC_ARG_WITH(expat,       [  --with-expat=dir        Find expat libraries for XML support below dir],expat_dir=$withval, with_expat=no)
! AC_ARG_WITH(db,          [  --with-db=dir           Find Berkeley DB libraries for Benson below dir],db_dir=$withval, with_db=no)
  AC_ARG_ENABLE(debug,     [  --enable-debug          Compile using -g], use_debug=$enableval,use_debug=no)
  AC_ARG_ENABLE(profile,   [  --enable-profiling      Compile using -pg], use_profile=$enableval, use_profile=no)
--- 47,53 ----
  AC_ARG_WITH(pgsql,       [  --with-pgsql=dir        Find PostgreSQL libraries for Perl support below dir],pgsql_dir=$withval, with_pgsql=yes)
  AC_ARG_WITH(perl,        [  --with-perl=dir         Find Perl libraries for Perl support below dir],perl_dir=$withval, with_perl=yes)
  AC_ARG_WITH(ssl,         [  --with-ssl=dir          Find SSL libraries for SSL/TLS support below dir],ssl_dir=$withval, with_ssl=no)
  AC_ARG_WITH(expat,       [  --with-expat=dir        Find expat libraries for XML support below dir],expat_dir=$withval, with_expat=no)
! #AC_ARG_WITH(db,          [  --with-db=dir           Find Berkeley DB libraries for Benson below dir],db_dir=$withval, with_db=no)
  AC_ARG_ENABLE(debug,     [  --enable-debug          Compile using -g], use_debug=$enableval,use_debug=no)
  AC_ARG_ENABLE(profile,   [  --enable-profiling      Compile using -pg], use_profile=$enableval, use_profile=no)
***************
*** 74,81 ****
  fi
  
! if test X"$with_db" != Xno; then
! 	CPPFLAGS="$CPPFLAGS -I$db_dir/include"
! 	LDFLAGS="$LDFLAGS -R$db_dir/lib -L$db_dir/lib"
! fi
  
  AC_CHECK_HEADERS(expat.h)
--- 72,79 ----
  fi
  
! #if test X"$with_db" != Xno; then
! #	CPPFLAGS="$CPPFLAGS -I$db_dir/include"
! #	LDFLAGS="$LDFLAGS -R$db_dir/lib -L$db_dir/lib"
! #fi
  
  AC_CHECK_HEADERS(expat.h)
***************
*** 86,90 ****
  AC_CHECK_HEADERS(sys/stat.h)
  AC_CHECK_HEADERS(errno.h)
! AC_CHECK_HEADERS(db.h)
  AC_CHECK_LIB(nsl, open)
  AC_CHECK_LIB(resolv, open)
--- 84,88 ----
  AC_CHECK_HEADERS(sys/stat.h)
  AC_CHECK_HEADERS(errno.h)
! #AC_CHECK_HEADERS(db.h)
  AC_CHECK_LIB(nsl, open)
  AC_CHECK_LIB(resolv, open)
***************
*** 96,100 ****
  AC_CHECK_LIB(w, open)
  AC_CHECK_LIB(resolv, open)
! AC_CHECK_LIB(db, open)
  AC_CHECK_LIB(crypto, BN_init)
  AC_CHECK_LIB(ssl, SSL_library_init)
--- 94,98 ----
  AC_CHECK_LIB(w, open)
  AC_CHECK_LIB(resolv, open)
! #AC_CHECK_LIB(db, open)
  AC_CHECK_LIB(crypto, BN_init)
  AC_CHECK_LIB(ssl, SSL_library_init)
***************
*** 143,172 ****
  	fi
  fi
- 
- 	
- if test X"$with_python" = Xyes; then
- 	AC_PATH_PROG(pythonpath, "python")
- 		AC_MSG_CHECKING(for Python compile flags)
- 		AC_MSG_RESULT([not found, building without Python.])
- fi
- 	
- if test X"$with_tcl" = Xyes; then
- 	AC_PATH_PROG(tclpath, "tclsh")
- 	AC_MSG_CHECKING(version)
- 	TCL_VERSION=`echo 'puts "$tcl_version"' | $tclpath`
- 	if test "_$TCL_VERSION" = _ ; then
- 		AC_MSG_RESULT([version not found, building without Tcl.])
- 	else
- 			AC_MSG_RESULT($TCL_VERSION)
- 	fi
- 	AC_MSG_CHECKING(for Tcl compile flags)
- 	TCL_CFLAGS="-I/usr/include/"
- 	TCL_LDFLAGS="-L/usr/lib/ -ltcl$TCL_VERSION"
- 	CFLAGS="$CFLAGS $TCL_CFLAGS"
- 	LIBS="$LIBS $TCL_LDFLAGS"
- 	AC_MSG_RESULT(ok)
- #       AC_MSG_RESULT([not found, building without Tcl.])
- fi
- 
  
  LIBS=`echo $LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
--- 141,144 ----

[Benson-commit] CVS: benson3/autom4te.cache output.0,1.14,1.15 requests,1.20,1.21 traces.0,1.13,1.14

From: Bob T. <bt...@us...> - 2003-12-12 19:14:31

Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv22671/autom4te.cache

Modified Files:
	output.0 requests traces.0 
Log Message:
latest changes

Index: output.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/output.0,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** output.0	8 Nov 2003 21:05:15 -0000	1.14
--- output.0	12 Dec 2003 19:14:27 -0000	1.15
***************
*** 309,313 ****
  #endif"
  
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP LD_SEARCH_FLAG perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS pythonpath tclpath ALL_LIBS LIB@&t@OBJS LTLIBOBJS'
  ac_subst_files=''
  
--- 309,313 ----
  #endif"
  
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP LD_SEARCH_FLAG perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS ALL_LIBS LIB@&t@OBJS LTLIBOBJS'
  ac_subst_files=''
  
***************
*** 854,858 ****
    --with-ssl=dir          Find SSL libraries for SSL/TLS support below dir
    --with-expat=dir        Find expat libraries for XML support below dir
-   --with-db=dir           Find Berkeley DB libraries for Benson below dir
  
  Some influential environment variables:
--- 854,857 ----
***************
*** 3339,3344 ****
    with_perl=yes
  fi; 
- #AC_ARG_WITH(python,      [  --with-python=dir       Find Python libraries for Python support below dir],python_dir=$withval, with_python=no)
- #AC_ARG_WITH(tcl,         [  --with-tcl=dir          Find TCL libraries for TCL support below dir],tcl_dir=$withval, with_tcl=no)
  
  # Check whether --with-ssl or --without-ssl was given.
--- 3338,3341 ----
***************
*** 3357,3368 ****
    with_expat=no
  fi; 
! 
! # Check whether --with-db or --without-db was given.
! if test "${with_db+set}" = set; then
!   withval="$with_db"
!   db_dir=$withval
! else
!   with_db=no
! fi; 
  # Check whether --enable-debug or --disable-debug was given.
  if test "${enable_debug+set}" = set; then
--- 3354,3358 ----
    with_expat=no
  fi; 
! #AC_ARG_WITH(db,          [  --with-db=dir           Find Berkeley DB libraries for Benson below dir],db_dir=$withval, with_db=no)
  # Check whether --enable-debug or --disable-debug was given.
  if test "${enable_debug+set}" = set; then
***************
*** 3411,3418 ****
  fi
  
! if test X"$with_db" != Xno; then
! 	CPPFLAGS="$CPPFLAGS -I$db_dir/include"
! 	LDFLAGS="$LDFLAGS -R$db_dir/lib -L$db_dir/lib"
! fi
  
  
--- 3401,3408 ----
  fi
  
! #if test X"$with_db" != Xno; then
! #	CPPFLAGS="$CPPFLAGS -I$db_dir/include"
! #	LDFLAGS="$LDFLAGS -R$db_dir/lib -L$db_dir/lib"
! #fi
  
  
***************
*** 4649,4794 ****
  done
  
! 
! for ac_header in db.h
! do
! as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
! else
!   # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
! cat >conftest.$ac_ext <<_ACEOF
! #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! $ac_includes_default
! @%:@include <$ac_header>
! _ACEOF
! rm -f conftest.$ac_objext
! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
!   (eval $ac_compile) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
!          { ac_try='test -s conftest.$ac_objext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_header_compiler=yes
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! ac_header_compiler=no
! fi
! rm -f conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
! 
! # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
! cat >conftest.$ac_ext <<_ACEOF
! #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! @%:@include <$ac_header>
! _ACEOF
! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
!   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } >/dev/null; then
!   if test -s conftest.err; then
!     ac_cpp_err=$ac_c_preproc_warn_flag
!   else
!     ac_cpp_err=
!   fi
! else
!   ac_cpp_err=yes
! fi
! if test -z "$ac_cpp_err"; then
!   ac_header_preproc=yes
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
!   ac_header_preproc=no
! fi
! rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
! 
! # So?  What about this header?
! case $ac_header_compiler:$ac_header_preproc in
!   yes:no )
!     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
! echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
!     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! @%:@@%:@ ------------------------------------ @%:@@%:@
! @%:@@%:@ Report this to bug...@gn.... @%:@@%:@
! @%:@@%:@ ------------------------------------ @%:@@%:@
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
!   no:yes )
!     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
! echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
!     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
! echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
!     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
!     (
!       cat <<\_ASBOX
! @%:@@%:@ ------------------------------------ @%:@@%:@
! @%:@@%:@ Report this to bug...@gn.... @%:@@%:@
! @%:@@%:@ ------------------------------------ @%:@@%:@
! _ASBOX
!     ) |
!       sed "s/^/$as_me: WARNING:     /" >&2
!     ;;
! esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   eval "$as_ac_Header=$ac_header_preproc"
! fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
! 
! fi
! if test `eval echo '${'$as_ac_Header'}'` = yes; then
!   cat >>confdefs.h <<_ACEOF
! @%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
! _ACEOF
!  
! fi
! 
! done
! 
  
  echo "$as_me:$LINENO: checking for open in -lnsl" >&5
--- 4639,4643 ----
  done
  
! #AC_CHECK_HEADERS(db.h)
  
  echo "$as_me:$LINENO: checking for open in -lnsl" >&5
***************
*** 5367,5434 ****
  fi
  
! 
! echo "$as_me:$LINENO: checking for open in -ldb" >&5
! echo $ECHO_N "checking for open in -ldb... $ECHO_C" >&6
! if test "${ac_cv_lib_db_open+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_check_lib_save_LIBS=$LIBS
! LIBS="-ldb  $LIBS"
! cat >conftest.$ac_ext <<_ACEOF
! #line $LINENO "configure"
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! 
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char open ();
! int
! main ()
! {
! open ();
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
!   (eval $ac_link) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
!          { ac_try='test -s conftest$ac_exeext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_lib_db_open=yes
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! ac_cv_lib_db_open=no
! fi
! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
! LIBS=$ac_check_lib_save_LIBS
! fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_db_open" >&5
! echo "${ECHO_T}$ac_cv_lib_db_open" >&6
! if test $ac_cv_lib_db_open = yes; then
!   cat >>confdefs.h <<_ACEOF
! @%:@define HAVE_LIBDB 1
! _ACEOF
! 
!   LIBS="-ldb $LIBS"
! 
! fi
! 
  
  echo "$as_me:$LINENO: checking for BN_init in -lcrypto" >&5
--- 5216,5220 ----
  fi
  
! #AC_CHECK_LIB(db, open)
  
  echo "$as_me:$LINENO: checking for BN_init in -lcrypto" >&5
***************
*** 5724,5836 ****
  fi
  
- 	
- if test X"$with_python" = Xyes; then
- 	# Extract the first word of ""python"", so it can be a program name with args.
- set dummy "python"; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_pythonpath+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $pythonpath in
-   [\\/]* | ?:[\\/]*)
-   ac_cv_path_pythonpath="$pythonpath" # Let the user override the test with a path.
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_path_pythonpath="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
- 
-   ;;
- esac
- fi
- pythonpath=$ac_cv_path_pythonpath
- 
- if test -n "$pythonpath"; then
-   echo "$as_me:$LINENO: result: $pythonpath" >&5
- echo "${ECHO_T}$pythonpath" >&6
- else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- 		echo "$as_me:$LINENO: checking for Python compile flags" >&5
- echo $ECHO_N "checking for Python compile flags... $ECHO_C" >&6
- 		echo "$as_me:$LINENO: result: not found, building without Python." >&5
- echo "${ECHO_T}not found, building without Python." >&6
- fi
- 	
- if test X"$with_tcl" = Xyes; then
- 	# Extract the first word of ""tclsh"", so it can be a program name with args.
- set dummy "tclsh"; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_tclpath+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   case $tclpath in
-   [\\/]* | ?:[\\/]*)
-   ac_cv_path_tclpath="$tclpath" # Let the user override the test with a path.
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-     ac_cv_path_tclpath="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
- 
-   ;;
- esac
- fi
- tclpath=$ac_cv_path_tclpath
- 
- if test -n "$tclpath"; then
-   echo "$as_me:$LINENO: result: $tclpath" >&5
- echo "${ECHO_T}$tclpath" >&6
- else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- 	echo "$as_me:$LINENO: checking version" >&5
- echo $ECHO_N "checking version... $ECHO_C" >&6
- 	TCL_VERSION=`echo 'puts "$tcl_version"' | $tclpath`
- 	if test "_$TCL_VERSION" = _ ; then
- 		echo "$as_me:$LINENO: result: version not found, building without Tcl." >&5
- echo "${ECHO_T}version not found, building without Tcl." >&6
- 	else
- 			echo "$as_me:$LINENO: result: $TCL_VERSION" >&5
- echo "${ECHO_T}$TCL_VERSION" >&6
- 	fi
- 	echo "$as_me:$LINENO: checking for Tcl compile flags" >&5
- echo $ECHO_N "checking for Tcl compile flags... $ECHO_C" >&6
- 	TCL_CFLAGS="-I/usr/include/"
- 	TCL_LDFLAGS="-L/usr/lib/ -ltcl$TCL_VERSION"
- 	CFLAGS="$CFLAGS $TCL_CFLAGS"
- 	LIBS="$LIBS $TCL_LDFLAGS"
- 	echo "$as_me:$LINENO: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- #       AC_MSG_RESULT([not found, building without Tcl.])
- fi
- 
- 
  LIBS=`echo $LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
  LIBS="$LIBS $CONF_LIBS"
--- 5510,5513 ----
***************
*** 6526,6531 ****
  s,@PERL_LDFLAGS@,$PERL_LDFLAGS,;t t
  s,@PERL_SLIBS@,$PERL_SLIBS,;t t
- s,@pythonpath@,$pythonpath,;t t
- s,@tclpath@,$tclpath,;t t
  s,@ALL_LIBS@,$ALL_LIBS,;t t
  s,@LIB@&t@OBJS@,$LIB@&t@OBJS,;t t
--- 6203,6206 ----

Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** requests	8 Nov 2003 21:05:15 -0000	1.20
--- requests	12 Dec 2003 19:14:28 -0000	1.21
***************
*** 17,22 ****
                        {
                          'm4_pattern_forbid' => 1,
-                         'AC_C_VOLATILE' => 1,
                          'AC_TYPE_OFF_T' => 1,
                          'AC_FUNC_CLOSEDIR_VOID' => 1,
                          'AC_REPLACE_FNMATCH' => 1,
--- 17,22 ----
                        {
                          'm4_pattern_forbid' => 1,
                          'AC_TYPE_OFF_T' => 1,
+                         'AC_C_VOLATILE' => 1,
                          'AC_FUNC_CLOSEDIR_VOID' => 1,
                          'AC_REPLACE_FNMATCH' => 1,
***************
*** 25,33 ****
                          'AC_FUNC_WAIT3' => 1,
                          'AC_HEADER_TIME' => 1,
-                         'AC_FUNC_LSTAT' => 1,
-                         'AC_STRUCT_TM' => 1,
                          'AM_AUTOMAKE_VERSION' => 1,
!                         'AC_FUNC_GETMNTENT' => 1,
                          'AC_TYPE_MODE_T' => 1,
                          'AC_FUNC_STRTOD' => 1,
                          'AC_CHECK_HEADERS' => 1,
--- 25,33 ----
                          'AC_FUNC_WAIT3' => 1,
                          'AC_HEADER_TIME' => 1,
                          'AM_AUTOMAKE_VERSION' => 1,
!                         'AC_STRUCT_TM' => 1,
!                         'AC_FUNC_LSTAT' => 1,
                          'AC_TYPE_MODE_T' => 1,
+                         'AC_FUNC_GETMNTENT' => 1,
                          'AC_FUNC_STRTOD' => 1,
                          'AC_CHECK_HEADERS' => 1,
***************
*** 52,59 ****
                          'AC_FUNC_STRERROR_R' => 1,
                          'AC_PROG_CC' => 1,
-                         'AC_FUNC_FORK' => 1,
                          'AC_DECL_SYS_SIGLIST' => 1,
!                         'AC_FUNC_STRCOLL' => 1,
                          'AC_FUNC_VPRINTF' => 1,
                          'AC_PROG_YACC' => 1,
                          'AC_INIT' => 1,
--- 52,59 ----
                          'AC_FUNC_STRERROR_R' => 1,
                          'AC_PROG_CC' => 1,
                          'AC_DECL_SYS_SIGLIST' => 1,
!                         'AC_FUNC_FORK' => 1,
                          'AC_FUNC_VPRINTF' => 1,
+                         'AC_FUNC_STRCOLL' => 1,
                          'AC_PROG_YACC' => 1,
                          'AC_INIT' => 1,
***************
*** 80,86 ****
                          'AC_C_INLINE' => 1,
                          'AC_PROG_CPP' => 1,
-                         'AC_TYPE_PID_T' => 1,
-                         'AC_PROG_LEX' => 1,
                          'AC_C_CONST' => 1,
                          'AC_CONFIG_FILES' => 1,
                          'include' => 1,
--- 80,86 ----
                          'AC_C_INLINE' => 1,
                          'AC_PROG_CPP' => 1,
                          'AC_C_CONST' => 1,
+                         'AC_PROG_LEX' => 1,
+                         'AC_TYPE_PID_T' => 1,
                          'AC_CONFIG_FILES' => 1,
                          'include' => 1,
***************
*** 88,93 ****
                          'AC_PROG_INSTALL' => 1,
                          'AM_GNU_GETTEXT' => 1,
-                         'AC_CHECK_LIB' => 1,
                          'AC_FUNC_OBSTACK' => 1,
                          'AC_FUNC_MALLOC' => 1,
                          'AC_FUNC_GETGROUPS' => 1,
--- 88,93 ----
                          'AC_PROG_INSTALL' => 1,
                          'AM_GNU_GETTEXT' => 1,
                          'AC_FUNC_OBSTACK' => 1,
+                         'AC_CHECK_LIB' => 1,
                          'AC_FUNC_MALLOC' => 1,
                          'AC_FUNC_GETGROUPS' => 1,
***************
*** 96,106 ****
                          'AC_FUNC_FSEEKO' => 1,
                          'AM_PROG_CC_C_O' => 1,
-                         'AC_FUNC_MKTIME' => 1,
-                         'AC_CANONICAL_SYSTEM' => 1,
                          'AM_CONDITIONAL' => 1,
                          'AC_CONFIG_HEADERS' => 1,
                          'AC_HEADER_SYS_WAIT' => 1,
-                         'AC_PROG_LN_S' => 1,
                          'AC_FUNC_MEMCMP' => 1,
                          'm4_include' => 1,
                          'AC_HEADER_DIRENT' => 1,
--- 96,106 ----
                          'AC_FUNC_FSEEKO' => 1,
                          'AM_PROG_CC_C_O' => 1,
                          'AM_CONDITIONAL' => 1,
+                         'AC_CANONICAL_SYSTEM' => 1,
+                         'AC_FUNC_MKTIME' => 1,
                          'AC_CONFIG_HEADERS' => 1,
                          'AC_HEADER_SYS_WAIT' => 1,
                          'AC_FUNC_MEMCMP' => 1,
+                         'AC_PROG_LN_S' => 1,
                          'm4_include' => 1,
                          'AC_HEADER_DIRENT' => 1,
***************
*** 121,126 ****
                        {
                          'm4_pattern_forbid' => 1,
-                         'AC_C_VOLATILE' => 1,
                          'AC_TYPE_OFF_T' => 1,
                          'AC_FUNC_CLOSEDIR_VOID' => 1,
                          'AC_REPLACE_FNMATCH' => 1,
--- 121,126 ----
                        {
                          'm4_pattern_forbid' => 1,
                          'AC_TYPE_OFF_T' => 1,
+                         'AC_C_VOLATILE' => 1,
                          'AC_FUNC_CLOSEDIR_VOID' => 1,
                          'AC_REPLACE_FNMATCH' => 1,
***************
*** 129,137 ****
                          'AC_FUNC_WAIT3' => 1,
                          'AC_HEADER_TIME' => 1,
-                         'AC_FUNC_LSTAT' => 1,
-                         'AC_STRUCT_TM' => 1,
                          'AM_AUTOMAKE_VERSION' => 1,
!                         'AC_FUNC_GETMNTENT' => 1,
                          'AC_TYPE_MODE_T' => 1,
                          'AC_FUNC_STRTOD' => 1,
                          'AC_CHECK_HEADERS' => 1,
--- 129,137 ----
                          'AC_FUNC_WAIT3' => 1,
                          'AC_HEADER_TIME' => 1,
                          'AM_AUTOMAKE_VERSION' => 1,
!                         'AC_STRUCT_TM' => 1,
!                         'AC_FUNC_LSTAT' => 1,
                          'AC_TYPE_MODE_T' => 1,
+                         'AC_FUNC_GETMNTENT' => 1,
                          'AC_FUNC_STRTOD' => 1,
                          'AC_CHECK_HEADERS' => 1,
***************
*** 156,163 ****
                          'AC_FUNC_STRERROR_R' => 1,
                          'AC_PROG_CC' => 1,
-                         'AC_FUNC_FORK' => 1,
                          'AC_DECL_SYS_SIGLIST' => 1,
!                         'AC_FUNC_STRCOLL' => 1,
                          'AC_FUNC_VPRINTF' => 1,
                          'AC_PROG_YACC' => 1,
                          'AC_INIT' => 1,
--- 156,163 ----
                          'AC_FUNC_STRERROR_R' => 1,
                          'AC_PROG_CC' => 1,
                          'AC_DECL_SYS_SIGLIST' => 1,
!                         'AC_FUNC_FORK' => 1,
                          'AC_FUNC_VPRINTF' => 1,
+                         'AC_FUNC_STRCOLL' => 1,
                          'AC_PROG_YACC' => 1,
                          'AC_INIT' => 1,
***************
*** 184,190 ****
                          'AC_C_INLINE' => 1,
                          'AC_PROG_CPP' => 1,
-                         'AC_TYPE_PID_T' => 1,
-                         'AC_PROG_LEX' => 1,
                          'AC_C_CONST' => 1,
                          'AC_CONFIG_FILES' => 1,
                          'include' => 1,
--- 184,190 ----
                          'AC_C_INLINE' => 1,
                          'AC_PROG_CPP' => 1,
                          'AC_C_CONST' => 1,
+                         'AC_PROG_LEX' => 1,
+                         'AC_TYPE_PID_T' => 1,
                          'AC_CONFIG_FILES' => 1,
                          'include' => 1,
***************
*** 192,197 ****
                          'AC_PROG_INSTALL' => 1,
                          'AM_GNU_GETTEXT' => 1,
-                         'AC_CHECK_LIB' => 1,
                          'AC_FUNC_OBSTACK' => 1,
                          'AC_FUNC_MALLOC' => 1,
                          'AC_FUNC_GETGROUPS' => 1,
--- 192,197 ----
                          'AC_PROG_INSTALL' => 1,
                          'AM_GNU_GETTEXT' => 1,
                          'AC_FUNC_OBSTACK' => 1,
+                         'AC_CHECK_LIB' => 1,
                          'AC_FUNC_MALLOC' => 1,
                          'AC_FUNC_GETGROUPS' => 1,
***************
*** 200,210 ****
                          'AC_FUNC_FSEEKO' => 1,
                          'AM_PROG_CC_C_O' => 1,
-                         'AC_FUNC_MKTIME' => 1,
-                         'AC_CANONICAL_SYSTEM' => 1,
                          'AM_CONDITIONAL' => 1,
                          'AC_CONFIG_HEADERS' => 1,
                          'AC_HEADER_SYS_WAIT' => 1,
-                         'AC_PROG_LN_S' => 1,
                          'AC_FUNC_MEMCMP' => 1,
                          'm4_include' => 1,
                          'AC_HEADER_DIRENT' => 1,
--- 200,210 ----
                          'AC_FUNC_FSEEKO' => 1,
                          'AM_PROG_CC_C_O' => 1,
                          'AM_CONDITIONAL' => 1,
+                         'AC_CANONICAL_SYSTEM' => 1,
+                         'AC_FUNC_MKTIME' => 1,
                          'AC_CONFIG_HEADERS' => 1,
                          'AC_HEADER_SYS_WAIT' => 1,
                          'AC_FUNC_MEMCMP' => 1,
+                         'AC_PROG_LN_S' => 1,
                          'm4_include' => 1,
                          'AC_HEADER_DIRENT' => 1,

Index: traces.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/traces.0,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** traces.0	8 Nov 2003 21:05:15 -0000	1.13
--- traces.0	12 Dec 2003 19:14:28 -0000	1.14
***************
*** 111,243 ****
  #undef HAVE_LIBNSL])
  m4trace:configure.ac:44: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:57: -1- AC_DEFINE_TRACE_LITERAL([BENSON_HOME])
! m4trace:configure.ac:57: -1- AH_OUTPUT([BENSON_HOME], [/* "Benson home directory" */
  #undef BENSON_HOME])
! m4trace:configure.ac:58: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.ac:58: -1- AH_OUTPUT([PACKAGE], [/* "Benson package name" */
  #undef PACKAGE])
! m4trace:configure.ac:59: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.ac:59: -1- AH_OUTPUT([VERSION], [/* "Benson version number" */
  #undef VERSION])
! m4trace:configure.ac:81: -1- AC_CHECK_HEADERS([expat.h])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_EXPAT_H], [/* Define to 1 if you have the <expat.h> header file. */
  #undef HAVE_EXPAT_H])
! m4trace:configure.ac:81: -1- AC_HEADER_STDC
! m4trace:configure.ac:81: -1- AC_SUBST([EGREP])
! m4trace:configure.ac:81: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
! m4trace:configure.ac:81: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS])
! m4trace:configure.ac:81: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                    inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
  #undef HAVE_SYS_TYPES_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
  #undef HAVE_SYS_STAT_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
  #undef HAVE_STDLIB_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
  #undef HAVE_STRING_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
  #undef HAVE_MEMORY_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
  #undef HAVE_STRINGS_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
  #undef HAVE_STDINT_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
  #undef HAVE_UNISTD_H])
! m4trace:configure.ac:82: -1- AC_CHECK_HEADERS([openssl/ssl.h])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_OPENSSL_SSL_H], [/* Define to 1 if you have the <openssl/ssl.h> header file. */
  #undef HAVE_OPENSSL_SSL_H])
! m4trace:configure.ac:83: -1- AC_CHECK_HEADERS([signal.h])
! m4trace:configure.ac:83: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
  #undef HAVE_SIGNAL_H])
! m4trace:configure.ac:84: -1- AC_CHECK_HEADERS([sys/sem.h])
! m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_SYS_SEM_H], [/* Define to 1 if you have the <sys/sem.h> header file. */
  #undef HAVE_SYS_SEM_H])
! m4trace:configure.ac:85: -1- AC_CHECK_HEADERS([sys/shm.h])
! m4trace:configure.ac:85: -1- AH_OUTPUT([HAVE_SYS_SHM_H], [/* Define to 1 if you have the <sys/shm.h> header file. */
  #undef HAVE_SYS_SHM_H])
! m4trace:configure.ac:86: -1- AC_CHECK_HEADERS([sys/stat.h])
! m4trace:configure.ac:86: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
  #undef HAVE_SYS_STAT_H])
! m4trace:configure.ac:87: -1- AC_CHECK_HEADERS([errno.h])
! m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
  #undef HAVE_ERRNO_H])
! m4trace:configure.ac:88: -1- AC_CHECK_HEADERS([db.h])
! m4trace:configure.ac:88: -1- AH_OUTPUT([HAVE_DB_H], [/* Define to 1 if you have the <db.h> header file. */
! #undef HAVE_DB_H])
! m4trace:configure.ac:89: -1- AC_CHECK_LIB([nsl], [open])
! m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
  #undef HAVE_LIBNSL])
! m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:90: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
  #undef HAVE_LIBRESOLV])
! m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:91: -1- AC_CHECK_LIB([compat], [open])
! m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_LIBCOMPAT], [/* Define to 1 if you have the `compat\' library (-lcompat). */
  #undef HAVE_LIBCOMPAT])
! m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCOMPAT])
! m4trace:configure.ac:92: -1- AC_CHECK_LIB([socket], [open])
! m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define to 1 if you have the `socket\' library (-lsocket). */
  #undef HAVE_LIBSOCKET])
! m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET])
! m4trace:configure.ac:93: -1- AC_CHECK_LIB([dl], [open])
! m4trace:configure.ac:93: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
  #undef HAVE_LIBDL])
! m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
! m4trace:configure.ac:94: -1- AC_CHECK_LIB([dld], [open])
! m4trace:configure.ac:94: -1- AH_OUTPUT([HAVE_LIBDLD], [/* Define to 1 if you have the `dld\' library (-ldld). */
  #undef HAVE_LIBDLD])
! m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDLD])
! m4trace:configure.ac:95: -1- AC_CHECK_LIB([ld], [open])
! m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_LIBLD], [/* Define to 1 if you have the `ld\' library (-lld). */
  #undef HAVE_LIBLD])
! m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLD])
! m4trace:configure.ac:96: -1- AC_CHECK_LIB([w], [open])
! m4trace:configure.ac:96: -1- AH_OUTPUT([HAVE_LIBW], [/* Define to 1 if you have the `w\' library (-lw). */
  #undef HAVE_LIBW])
! m4trace:configure.ac:96: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBW])
! m4trace:configure.ac:97: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
  #undef HAVE_LIBRESOLV])
! m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:98: -1- AC_CHECK_LIB([db], [open])
! m4trace:configure.ac:98: -1- AH_OUTPUT([HAVE_LIBDB], [/* Define to 1 if you have the `db\' library (-ldb). */
! #undef HAVE_LIBDB])
! m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDB])
! m4trace:configure.ac:99: -1- AC_CHECK_LIB([crypto], [BN_init])
! m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_LIBCRYPTO], [/* Define to 1 if you have the `crypto\' library (-lcrypto). */
  #undef HAVE_LIBCRYPTO])
! m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCRYPTO])
! m4trace:configure.ac:100: -1- AC_CHECK_LIB([ssl], [SSL_library_init])
! m4trace:configure.ac:100: -1- AH_OUTPUT([HAVE_LIBSSL], [/* Define to 1 if you have the `ssl\' library (-lssl). */
  #undef HAVE_LIBSSL])
! m4trace:configure.ac:100: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSSL])
! m4trace:configure.ac:101: -1- AC_CHECK_LIB([expat], [XML_Parse])
! m4trace:configure.ac:101: -1- AH_OUTPUT([HAVE_LIBEXPAT], [/* Define to 1 if you have the `expat\' library (-lexpat). */
  #undef HAVE_LIBEXPAT])
! m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEXPAT])
! m4trace:configure.ac:107: -1- AC_DEFINE_TRACE_LITERAL([SUNOS])
! m4trace:configure.ac:107: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
  #undef SUNOS])
! m4trace:configure.ac:111: -1- AC_DEFINE_TRACE_LITERAL([LINUX])
! m4trace:configure.ac:111: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
  #undef LINUX])
! m4trace:configure.ac:115: -1- AC_SUBST([LD_SEARCH_FLAG])
! m4trace:configure.ac:116: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:116: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
  #undef TARGETOSNAME])
! m4trace:configure.ac:120: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:126: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:140: -1- AC_SUBST([PERL_LIBS])
! m4trace:configure.ac:141: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:142: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:148: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
! m4trace:configure.ac:154: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:179: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:196: -1- AC_CONFIG_FILES([Makefile man/Makefile handlers/Makefile conf/Makefile \
  include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile \
  src/network/Makefile src/perl/Makefile src/rules/Makefile \
--- 111,234 ----
  #undef HAVE_LIBNSL])
  m4trace:configure.ac:44: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:55: -1- AC_DEFINE_TRACE_LITERAL([BENSON_HOME])
! m4trace:configure.ac:55: -1- AH_OUTPUT([BENSON_HOME], [/* "Benson home directory" */
  #undef BENSON_HOME])
! m4trace:configure.ac:56: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.ac:56: -1- AH_OUTPUT([PACKAGE], [/* "Benson package name" */
  #undef PACKAGE])
! m4trace:configure.ac:57: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.ac:57: -1- AH_OUTPUT([VERSION], [/* "Benson version number" */
  #undef VERSION])
! m4trace:configure.ac:79: -1- AC_CHECK_HEADERS([expat.h])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_EXPAT_H], [/* Define to 1 if you have the <expat.h> header file. */
  #undef HAVE_EXPAT_H])
! m4trace:configure.ac:79: -1- AC_HEADER_STDC
! m4trace:configure.ac:79: -1- AC_SUBST([EGREP])
! m4trace:configure.ac:79: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
! m4trace:configure.ac:79: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS])
! m4trace:configure.ac:79: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                    inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
  #undef HAVE_SYS_TYPES_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
  #undef HAVE_SYS_STAT_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
  #undef HAVE_STDLIB_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
  #undef HAVE_STRING_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
  #undef HAVE_MEMORY_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
  #undef HAVE_STRINGS_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
  #undef HAVE_STDINT_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
  #undef HAVE_UNISTD_H])
! m4trace:configure.ac:80: -1- AC_CHECK_HEADERS([openssl/ssl.h])
! m4trace:configure.ac:80: -1- AH_OUTPUT([HAVE_OPENSSL_SSL_H], [/* Define to 1 if you have the <openssl/ssl.h> header file. */
  #undef HAVE_OPENSSL_SSL_H])
! m4trace:configure.ac:81: -1- AC_CHECK_HEADERS([signal.h])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
  #undef HAVE_SIGNAL_H])
! m4trace:configure.ac:82: -1- AC_CHECK_HEADERS([sys/sem.h])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_SYS_SEM_H], [/* Define to 1 if you have the <sys/sem.h> header file. */
  #undef HAVE_SYS_SEM_H])
! m4trace:configure.ac:83: -1- AC_CHECK_HEADERS([sys/shm.h])
! m4trace:configure.ac:83: -1- AH_OUTPUT([HAVE_SYS_SHM_H], [/* Define to 1 if you have the <sys/shm.h> header file. */
  #undef HAVE_SYS_SHM_H])
! m4trace:configure.ac:84: -1- AC_CHECK_HEADERS([sys/stat.h])
! m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
  #undef HAVE_SYS_STAT_H])
! m4trace:configure.ac:85: -1- AC_CHECK_HEADERS([errno.h])
! m4trace:configure.ac:85: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
  #undef HAVE_ERRNO_H])
! m4trace:configure.ac:87: -1- AC_CHECK_LIB([nsl], [open])
! m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
  #undef HAVE_LIBNSL])
! m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:88: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:88: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
  #undef HAVE_LIBRESOLV])
! m4trace:configure.ac:88: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:89: -1- AC_CHECK_LIB([compat], [open])
! m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_LIBCOMPAT], [/* Define to 1 if you have the `compat\' library (-lcompat). */
  #undef HAVE_LIBCOMPAT])
! m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCOMPAT])
! m4trace:configure.ac:90: -1- AC_CHECK_LIB([socket], [open])
! m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define to 1 if you have the `socket\' library (-lsocket). */
  #undef HAVE_LIBSOCKET])
! m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET])
! m4trace:configure.ac:91: -1- AC_CHECK_LIB([dl], [open])
! m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
  #undef HAVE_LIBDL])
! m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
! m4trace:configure.ac:92: -1- AC_CHECK_LIB([dld], [open])
! m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_LIBDLD], [/* Define to 1 if you have the `dld\' library (-ldld). */
  #undef HAVE_LIBDLD])
! m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDLD])
! m4trace:configure.ac:93: -1- AC_CHECK_LIB([ld], [open])
! m4trace:configure.ac:93: -1- AH_OUTPUT([HAVE_LIBLD], [/* Define to 1 if you have the `ld\' library (-lld). */
  #undef HAVE_LIBLD])
! m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLD])
! m4trace:configure.ac:94: -1- AC_CHECK_LIB([w], [open])
! m4trace:configure.ac:94: -1- AH_OUTPUT([HAVE_LIBW], [/* Define to 1 if you have the `w\' library (-lw). */
  #undef HAVE_LIBW])
! m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBW])
! m4trace:configure.ac:95: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
  #undef HAVE_LIBRESOLV])
! m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:97: -1- AC_CHECK_LIB([crypto], [BN_init])
! m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_LIBCRYPTO], [/* Define to 1 if you have the `crypto\' library (-lcrypto). */
  #undef HAVE_LIBCRYPTO])
! m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCRYPTO])
! m4trace:configure.ac:98: -1- AC_CHECK_LIB([ssl], [SSL_library_init])
! m4trace:configure.ac:98: -1- AH_OUTPUT([HAVE_LIBSSL], [/* Define to 1 if you have the `ssl\' library (-lssl). */
  #undef HAVE_LIBSSL])
! m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSSL])
! m4trace:configure.ac:99: -1- AC_CHECK_LIB([expat], [XML_Parse])
! m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_LIBEXPAT], [/* Define to 1 if you have the `expat\' library (-lexpat). */
  #undef HAVE_LIBEXPAT])
! m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEXPAT])
! m4trace:configure.ac:105: -1- AC_DEFINE_TRACE_LITERAL([SUNOS])
! m4trace:configure.ac:105: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
  #undef SUNOS])
! m4trace:configure.ac:109: -1- AC_DEFINE_TRACE_LITERAL([LINUX])
! m4trace:configure.ac:109: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
  #undef LINUX])
! m4trace:configure.ac:113: -1- AC_SUBST([LD_SEARCH_FLAG])
! m4trace:configure.ac:114: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:114: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
  #undef TARGETOSNAME])
! m4trace:configure.ac:118: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:124: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:138: -1- AC_SUBST([PERL_LIBS])
! m4trace:configure.ac:139: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:140: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:151: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:168: -1- AC_CONFIG_FILES([Makefile man/Makefile handlers/Makefile conf/Makefile \
  include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile \
  src/network/Makefile src/perl/Makefile src/rules/Makefile \
***************
*** 245,248 ****
  src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
  doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:196: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:196: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
--- 236,239 ----
  src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
  doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:168: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:168: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])

Flat | Threaded

<< < 1 2 3 4 5 .. 33 > >> (Page 3 of 33)

2001	Jan	Feb	Mar	Apr	May (1)	Jun (27)	Jul (24)	Aug (64)	Sep (15)	Oct (72)	Nov (28)	Dec (44)
2002	Jan (72)	Feb (58)	Mar (33)	Apr (3)	May (5)	Jun (4)	Jul	Aug	Sep	Oct (24)	Nov (29)	Dec (12)
2003	Jan (37)	Feb (44)	Mar (13)	Apr (23)	May (9)	Jun (3)	Jul	Aug (7)	Sep (33)	Oct (30)	Nov (31)	Dec (11)
2004	Jan (4)	Feb (35)	Mar (14)	Apr	May (2)	Jun	Jul	Aug (5)	Sep	Oct	Nov	Dec
2005	Jan	Feb (2)	Mar (2)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec