[Netpass-devel] NetPass/www/htdocs netpass.mhtml,1.8,1.9

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

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

Modified Files:
	netpass.mhtml 
Log Message:
bug fixes, see CHANGES file, see message on netpass-users before deploying these changes

Index: netpass.mhtml
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/netpass.mhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- netpass.mhtml	1 May 2005 19:46:04 -0000	1.8
+++ netpass.mhtml	31 Aug 2005 20:09:17 -0000	1.9
@@ -15,7 +15,7 @@
 
 <%perl>
 
-_log("DEBUG", $m->session->{'_session_id'}." calling /Client/GetInfo\n");
+_log("DEBUG", "$$ ". $m->session->{'_session_id'}." calling /Client/GetInfo\n");
 $m->comp('/Client/GetInfo', %ARGS);
 
 my $mac = $m->session->{'remote_mac'};
@@ -27,10 +27,10 @@
 _log("DEBUG", "$mac $ip calling /Client/Validate\n");
 $m->comp("/Client/Validate", %ARGS);
 
-_log("DEBUG", "$mac $ip Phase: ".$m->session->{'phase'}."\n");
+_log("DEBUG", "$mac $ip ".$m->session->{'_session_id'}." Phase: ".$m->session->{'phase'}."\n");
 
 if($np->cfg->policy(-key => 'COOKIE_DETECT', -network => $ip)) {
-	return if ($m->comp('/CookieDetect', 'ip' => $ip, %ARGS) != 1);
+	return if ($m->comp('/CookieDetect', 'mac' => $mac, 'ip' => $ip, %ARGS) != 1);
 }
 
 if($m->session->{'phase'} eq 'LOGIN') {
@@ -39,7 +39,8 @@
 	$m->comp('/Client/WelcomePage', %ARGS);
 
 } elsif($m->session->{'phase'} eq 'SCAN') {
-	_log("DEBUG", "$mac $ip calling /Client/BeginScan\n");
+	_log("DEBUG", "$mac $ip calling /Client/BeginScan session ".$m->session->{'_session_id'}."\n");
+	$m->comp('/Audit', msg => [ "sessionid ".$m->session->{'_session_id'} ] );
 	$m->comp('/Client/BeginScan', %ARGS);
 
 } elsif($m->session->{'phase'} eq 'REMEDIATE') {
@@ -181,6 +182,7 @@
 
 ################################################
 
+
 return;
 
 </%perl>