{
my %regex_map = (
'%a' => [('t_appname', '([0-9a-zA-Z\.\-\_\/\[\]]*)')], # application name
- '%u' => [('t_dbuser', '([0-9a-zA-Z\_\[\]]*)')], # user name
- '%d' => [('t_dbname', '([0-9a-zA-Z\_\[\]]*)')], # database name
+ '%u' => [('t_dbuser', '([0-9a-zA-Z\_\[\]\-]*)')], # user name
+ '%d' => [('t_dbname', '([0-9a-zA-Z\_\[\]\-]*)')], # database name
'%r' => [('t_hostport', '(\[local\]|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?[\(\d\)]*')], # remote host and port
'%h' => [('t_client', '(\[local\]|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?')], # remote host
'%p' => [('t_pid', '(\d+)')], # process ID