aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanik Rabe2019-11-16 07:16:34 +0200
committerJanik Rabe2019-11-16 07:16:34 +0200
commit3e63d3c71ae81df238c9cb57bd57b5351ac7b28c (patch)
tree20c860b1b231529ac7de9d938d82d6d7e2772ae9
parenta1219446f7693009709c1bb93b3df022865e7e11 (diff)
downloadoidentd-3e63d3c71ae81df238c9cb57bd57b5351ac7b28c.tar
oidentd-3e63d3c71ae81df238c9cb57bd57b5351ac7b28c.tar.gz
oidentd-3e63d3c71ae81df238c9cb57bd57b5351ac7b28c.tar.bz2
oidentd-3e63d3c71ae81df238c9cb57bd57b5351ac7b28c.tar.xz
oidentd-3e63d3c71ae81df238c9cb57bd57b5351ac7b28c.zip
Clarify behavior of user configuration files
-rw-r--r--ChangeLog1
-rw-r--r--doc/oidentd.conf.5.adoc4
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 35fbcbc..aac0603 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2019-11-16 Janik Rabe <oidentd@janikrabe.com>
* Revert deprecation of '--disable-masq' configure flag.
+ * Clarify behavior of user configuration files.
2019-10-27 Janik Rabe <oidentd@janikrabe.com>
diff --git a/doc/oidentd.conf.5.adoc b/doc/oidentd.conf.5.adoc
index 8548af0..5561315 100644
--- a/doc/oidentd.conf.5.adoc
+++ b/doc/oidentd.conf.5.adoc
@@ -35,11 +35,13 @@ The system-wide configuration file *{sysconfdir}/oidentd.conf* specifies the
types of responses individual users are permitted to send. By default, users
must respond with their real username.
-The user configuration file *~/.config/oidentd.conf* allows users to send
+The user configuration files *~/.config/oidentd.conf* allow users to send
custom ident responses or to hide their identities, provided that they have
been granted the necessary capabilities through the system-wide configuration
file. If this file does not exist or *oidentd* was compiled without XDG Base
Directory support, the file *~/.oidentd.conf* is used instead.
+Note that user configuration files are read only after a connection is
+determined to belong to the user in question.
SYSTEM-WIDE CONFIGURATION FILE