user-* event log messages for benefit of admin users. Still need a

[disorder] / server / server.c

diff --git a/server/server.c b/server/server.c
index 6cfed04f2c30b37e5716cbf2dfe37dc8924e12bb..46647b10aabb567e7d6224d4725f384aa232f940 100644 (file)
--- a/server/server.c
+++ b/server/server.c
@@ -878,6 +878,16 @@ static void logclient(const char *msg, void *user) {
     eventlog_remove(c->lo);
     return;
   }
+  /* user-* messages are restricted */
+  if(!strncmp(msg, "user-", 5)) {
+    /* They are only sent to admin users */
+    if(!(c->rights & RIGHT_ADMIN))
+      return;
+    /* They are not sent over TCP connections unless remote user-management is
+     * enabled */
+    if(!config->remote_userman && !(c->rights & RIGHT__LOCAL))
+      return;
+  }
   sink_printf(ev_writer_sink(c->w), "%"PRIxMAX" %s\n",
              (uintmax_t)time(0), msg);
 }