Module: check_mk
Branch: master
Commit: 3b0aadb16d56c7b8dcbdc17a65828eff3c14e846
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b0aadb16d56c7…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Mar 8 10:24:07 2012 +0100
Added dot in username check regex
---
web/htdocs/wato.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index ebba72c..da19c0e 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -6764,7 +6764,7 @@ def mode_edit_user(phase):
id = html.var("userid").strip()
if new and id in users:
raise MKUserError("userid", _("This username is already being used by another user."))
- if not re.match("^[-a-z0-9A-Z_]+$", id):
+ if not re.match("^[-a-z0-9A-Z_\.]+$", id):
raise MKUserError("userid", _("The username must consist only of letters, digit and the underscore."))
if new:
Module: check_mk
Branch: master
Commit: cce4a1a2d0e2d674913d26da1c5ea237ac1a363f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cce4a1a2d0e2d6…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Mar 7 09:52:23 2012 +0100
ps check - fixed bug introduced after cluster node implementation
---
checks/ps | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/checks/ps b/checks/ps
index e2ce176..784a53d 100644
--- a/checks/ps
+++ b/checks/ps
@@ -199,7 +199,7 @@ def check_procs(item, params, info, with_perfdata):
# correct number of DSes. To just look at the first process
# in the agent output to make sure. We assume that at least
# one process is always present.
- firstword = info[0][0]
+ firstword = info[0][1]
if firstword[0] == '(' and firstword.count(",") >= 3:
extended_perfdata = True
if extended_perfdata: