...G...PS. [ZBXNEXT-453] Resolved subissues discussed at https://support.zabbix.com/browse/ZBXNEXT-453

3 files changed, 12 insertions, 9 deletions

diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf
index 31c6d0c8653..6e631731b10 100644
--- a/conf/zabbix_agentd.conf
+++ b/conf/zabbix_agentd.conf
@@ -223,8 +223,8 @@ Hostname=Zabbix server
 
 ### Option: AllowRoot
 #	Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent
-#	will try to switch to user 'zabbix' or, if provided, the user specified by the User configuration option
-#	instead. Has no effect if started under a regular user.
+#	will try to switch to the user specified by the User configuration option instead.
+#	Has no effect if started under a regular user.
 #	0 - do not allow
 #	1 - allow
 #
@@ -235,7 +235,8 @@ Hostname=Zabbix server
 ### Option: User
 #	Drop privileges to a specific, existing user on the system. Only has effect if run as 'root' and AllowRoot is disabled.
 #	If AllowRoot is enabled and the agent is started by 'root', this option is ignored.
-#	If run as non-root and the starting user differs from the specified user, a command line error message is produced.
+#	If run as regular user and the starting user differs from the specified user, a command line error message is produced.
+#	If you want to run the agent as root, enable the AllowRoot parameter and start it from the root account.
 #
 # Mandatory: no
 # Default:
diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf
index 717ccc61e67..1d75db39ac5 100644
--- a/conf/zabbix_proxy.conf
+++ b/conf/zabbix_proxy.conf
@@ -479,8 +479,8 @@ DBUser=root
 
 ### Option: AllowRoot
 #	Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy
-#	will try to switch to user 'zabbix' or, if provided, the user specified by the User configuration option
-#	instead. Has no effect if started under a regular user.
+#	will try to switch to the user specified by the User configuration option instead.
+#	Has no effect if started under a regular user.
 #	0 - do not allow
 #	1 - allow
 #
@@ -491,7 +491,8 @@ DBUser=root
 ### Option: User
 #	Drop privileges to a specific, existing user on the system. Only has effect if run as 'root' and AllowRoot is disabled.
 #	If AllowRoot is enabled and the proxy is started by 'root', this option is ignored.
-#	If run as non-root and the starting user differs from the specified user, a command line error message is produced.
+#	If run as regular user and the starting user differs from the specified user, a command line error message is produced.
+#	If you want to run the proxy as root, enable the AllowRoot parameter and start it from the root account.
 #
 # Mandatory: no
 # Default:
diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf
index 3138ec76478..944c61064e4 100644
--- a/conf/zabbix_server.conf
+++ b/conf/zabbix_server.conf
@@ -506,8 +506,8 @@ DBUser=root
 
 ### Option: AllowRoot
 #	Allow the server to run as 'root'. If disabled and the server is started by 'root', the server
-#	will try to switch to user 'zabbix' or, if provided, the user specified by the User configuration option
-#	instead. Has no effect if started under a regular user.
+#	will try to switch to the user specified by the User configuration option instead.
+#	Has no effect if started under a regular user.
 #	0 - do not allow
 #	1 - allow
 #
@@ -518,7 +518,8 @@ DBUser=root
 ### Option: User
 #	Drop privileges to a specific, existing user on the system. Only has effect if run as 'root' and AllowRoot is disabled.
 #	If AllowRoot is enabled and the server is started by 'root', this option is ignored.
-#	If run as non-root and the starting user differs from the specified user, a command line error message is produced.
+#	If run as regular user and the starting user differs from the specified user, a command line error message is produced.
+#	If you want to run the server as root, enable the AllowRoot parameter and start it from the root account.
 #
 # Mandatory: no
 # Default: