From: M. Sean Finney Date: Tue, 6 Jun 2006 16:48:48 +0000 (+0000) Subject: modify the is_pg_dbname() function to allow databases with '-' in their name. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=73255d1551f787151a518e35b1fbc175a4150133;p=nagiosplug.git modify the is_pg_dbname() function to allow databases with '-' in their name. reference: sf tracker #1500752 git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1414 f882894a-f735-0410-b71e-b25c423dba1c --- diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c index d56ce9b..8cfc1ab 100644 --- a/plugins/check_pgsql.c +++ b/plugins/check_pgsql.c @@ -329,9 +329,9 @@ is_pg_dbname (char *dbname) return (FALSE); strncpy (txt, dbname, NAMEDATALEN - 1); txt[NAMEDATALEN - 1] = 0; - if (sscanf (txt, "%[_a-zA-Z]%[^_a-zA-Z0-9]", tmp, tmp) == 1) + if (sscanf (txt, "%[_a-zA-Z]%[^_a-zA-Z0-9-]", tmp, tmp) == 1) return (TRUE); - if (sscanf (txt, "%[_a-zA-Z]%[_a-zA-Z0-9]%[^_a-zA-Z0-9]", tmp, tmp, tmp) == + if (sscanf (txt, "%[_a-zA-Z]%[_a-zA-Z0-9-]%[^_a-zA-Z0-9-]", tmp, tmp, tmp) == 2) return (TRUE); return (FALSE); }