[Netpass-devel] NetPass CHANGES,1.9,1.10 MANIFEST,1.52,1.53 install,1.24,1.25

[jeff m. <jef...@us...>]

Update of /cvsroot/netpass/NetPass
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8611

Modified Files:
	CHANGES MANIFEST install 
Log Message:
bug fixes

Index: CHANGES
===================================================================
RCS file: /cvsroot/netpass/NetPass/CHANGES,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- CHANGES	3 Aug 2005 02:44:38 -0000	1.9
+++ CHANGES	10 Aug 2005 19:52:15 -0000	1.10
@@ -177,4 +177,6 @@
 	jcm lots of bugs fixed
 
 2005-08-10 2.0 released
-
+	jcm bug fixes to appstarter
+	jcm perms adjustments to ids cfg
+	jcm bug fix in netpass.pm validate code

Index: install
===================================================================
RCS file: /cvsroot/netpass/NetPass/install,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- install	4 Aug 2005 06:45:23 -0000	1.24
+++ install	10 Aug 2005 19:52:15 -0000	1.25
@@ -173,6 +173,8 @@
 	uninstallSwatch();
 
 	depatchConf("/etc", "fstab");
+	depatchConf("/etc", "inittab");
+	lsystem("/sbin/init q");
 	dropDatabase();
 
 	lprint ("NetPass uninstall finished.\n");
@@ -243,6 +245,13 @@
 }
 lsystem("/etc/init.d/syslog restart");
 
+my $smtp_server = ask("Some of the NetPass subsystems send problem alerts via email.\n\
+Enter an SMTP server here: ");
+
+patchConf("/etc", "inittab", { '%SMTPHOST%' => $smtp_server });
+lsystem("/sbin/init q");
+
+configureNPSVC($TARGET);
 
 my $squidRV = patchSquidConf($PKGDIR, "install.d/squid.conf");
 
@@ -360,6 +369,12 @@
 
 ");
 
+	my $apicli = ask("Enter the IP addresses of all of your NetPass API Clients (a netblock is OK).
+We'll use this to permit API traffic from those clients. Enter the addresses on a single line,
+separated by spaces:
+
+");
+
 	my $npvip = '';
 	my $redir1 = ''; 
 	my $redir2 = '';
@@ -415,6 +430,10 @@
 			$l =~ s/%TRAPDEVS%/$trappers/g;
 			$l =~ s/^#TRAP//;
 		}
+		if ($apicli ne "") {
+			$l =~ s/%APICLIENTS%/$apicli/g;
+			$l =~ s/^#API//;
+		}
 		$l =~ s/%MYIP%/$myip/g;
 			
 		print $fo $l;
@@ -717,7 +736,7 @@
 }
 
 sub patchConf {
-	my ($b, $f) = (shift, shift);
+	my ($b, $f, $rh) = (shift, shift, shift);
 
 	ll("Patching configuration file: $b/$f");
 
@@ -749,6 +768,14 @@
 		return;
 	}
 
+	# perform any search/replace instructions
+
+	if (ref($rh) eq "HASH") {
+		foreach my $srk (keys %$rh) {
+			searchReplace(\@d, $srk, $rh->{$srk});
+		}
+	}
+
 	# check to see if the patch is already applied
 
 	if (grep (/$marker/, @s)) {

Index: MANIFEST
===================================================================
RCS file: /cvsroot/netpass/NetPass/MANIFEST,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- MANIFEST	4 Aug 2005 20:41:17 -0000	1.52
+++ MANIFEST	10 Aug 2005 19:52:15 -0000	1.53
@@ -73,7 +73,6 @@
 doc/netfilter_conntrack_perf.txt
 etc/netpass-example.conf
 etc/oui.txt
-etc/npsvc.conf
 etc/npsvc-example.conf
 install.d/logrotate.d/apache
 install.d/logrotate.d/netpass
@@ -113,6 +112,7 @@
 install.d/sysconfig.snort
 install.d/create-indexes.sql
 install.d/sysctl.conf
+install.d/inittab
 lib/Bundle/NetPass/API.pm
 lib/Bundle/NetPass1.pm
 lib/Bundle/NetPass2.pm