In snmpfinger also consider '-' as a valid character for a username

diff --git a/Changelog b/Changelog
index 6ed20b9abe72bbc22c3bfae1a5d9479883560ea9..16101e74aa820a0096fc11f010d628f47ed4fbbe 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,7 @@ Ver 1.60:
 * Use require_once when including lib/functions.php3 in lib/sql
 * In the buttons toolbar Edit User should not be clickable.
 * Add an arrow gif in htdocs/images to be used in the buttons page when adding multiple finger pages
+* In snmpfinger also consider '-' as a valid character for a username
 Ver 1.59:
 * Small html fixes in user_edit.php3 and password.php3
 * Show number of failed logins in the last 7 days in the user admin page

diff --git a/bin/snmpfinger b/bin/snmpfinger
index d8e24dc59c0893ce151c0b708dc31d4afed6a773..94353f9efb1ce1864018e94d6352dc5dc2505652 100755 (executable)
--- a/bin/snmpfinger
+++ b/bin/snmpfinger
@@ -7,7 +7,7 @@ $comm=shift || 'public';
 $walk =`$SNMPWALK $host $comm .iso.org.dod.internet.private.enterprises.9.2.9.2.1.18`;
 $walk.=`$SNMPWALK $host $comm .iso.org.dod.internet.private.enterprises.9.9.27.1.1.3.1.7`;
 
-while($walk=~/\"(\w+?)\"/g){
+while($walk=~/\"([\w\-]+?)\"/g){
  $user=lc($1);
  if($out) {
   $out=$out.",'$user'";