Do not log channel keys ("passwords") for predefined channels

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 9994e65f5708592aa48150fd20aa5ea2352082b0..2d77ec9c6c7591f463b5b7095473c123dd310f60 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -139,7 +139,7 @@ Channel_InitPredefined( void )
                if (conf_chan->modes_num) {
                        /* Prepare fake request structure */
                        strlcpy(name, conf_chan->name, sizeof(name));
-                       Log(LOG_INFO, "Evaluating predefined channel modes for \"%s\".", name);
+                       LogDebug("Evaluating predefined channel modes for \"%s\" ...", name);
                        Req.argv[0] = name;
                        Req.prefix = Client_ID(Client_ThisServer());
                        Req.command = "MODE";
@@ -182,8 +182,9 @@ Channel_InitPredefined( void )
                Set_KeyFile(new_chan, conf_chan->keyfile);
 
                Log(LOG_INFO,
-                   "Created pre-defined channel \"%s\", mode \"%s\" (key \"%s\", limit %d).",
-                   new_chan->name, new_chan->modes, new_chan->key,
+                   "Created pre-defined channel \"%s\", mode \"%s\" (%s, user limit %d).",
+                   new_chan->name, new_chan->modes,
+                   new_chan->key[0] ? "channel key set" : "no channel key",
                    new_chan->maxusers);
        }