From 1b8b8d46970568dcecd39231b6ee15eaba54b095 Mon Sep 17 00:00:00 2001
From: Jordi Sanfeliu <jordi@fibranet.cat>
Date: Wed, 7 Jan 2015 17:21:56 +0100
Subject: [PATCH] Added an advice in 'htpasswd.pl' and 'monitorix.conf(5)' to
 not use the character colon ':' as part of the name or password since this
 character is used as field separator.

---
 Changes                   | 3 +++
 docs/htpasswd.pl          | 3 +++
 man/man5/monitorix.conf.5 | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/Changes b/Changes
index 624572c..ba0a2a1 100644
--- a/Changes
+++ b/Changes
@@ -11,6 +11,9 @@
   the output of the 'command' parameter in the 'ps' command is used to match
   the process names.
 	(suggested by Julien Flatrès, julien_flatres AT yahoo.fr)
+- Added an advice in 'htpasswd.pl' and 'monitorix.conf(5)' to not use the
+  character colon ':' as part of the name or password since this character is
+  used as field separator.
 - Fixed some bugs in the new Makefile. [#63]
 - Fixed more messages of use of uninitialized values at fs.pm in lines 765 and
   766. This mainly happens in OpenVZ VPS where '/proc/diskstats' file does not
diff --git a/docs/htpasswd.pl b/docs/htpasswd.pl
index 5db6718..b5c9815 100755
--- a/docs/htpasswd.pl
+++ b/docs/htpasswd.pl
@@ -8,6 +8,9 @@
 # If the argument is an encrypted password it will ask the password and will
 # verify if it's valid.
 #
+# WARNING: don't use the character colon ':' as part of your name or password
+# since this character is used as field separator.
+#
 
 use strict;
 use warnings;
diff --git a/man/man5/monitorix.conf.5 b/man/man5/monitorix.conf.5
index 6774112..8497621 100644
--- a/man/man5/monitorix.conf.5
+++ b/man/man5/monitorix.conf.5
@@ -317,6 +317,8 @@ peter:HF1r7qRL4Kg6E
 .P
 Since the script uses the crypt() algorithm, only the first 8 characters of the password are used to form the password. If the supplied password is longer, the extra characters will be silently discarded.
 .P
+WARNING: don't use the character colon ':' as part of your name or password since this character is used as field separator.
+.P
 Default value: \fI/var/lib/monitorix/htpasswd\fP
 .RE
 .SS Log files pathnames