Fix registered channel desync; fix HelpServ crash for old cfg files

src/hash.c (AddChannelUser): Do not give ops to the first user to join
a persistent channel.

src/helpserv.c (helpserv_conf_read): Use a default description for bots.
git-archimport-id: srvx@srvx.net--2005-srvx/srvx--devo--1.3--patch-18

diff --git a/ChangeLog b/ChangeLog
index 955aa10971d7a1ae95abbfada532abf33c3368c2..77557e8f2c85089972a08ebac1f10b6c5a086f5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,22 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2005-srvx/srvx--devo--1.3
 #
 
+2005-02-17 21:42:43 GMT        Michael Poole <mdpoole@troilus.org>     patch-18
+
+    Summary:
+      Fix registered channel desync; fix HelpServ crash for old cfg files
+    Revision:
+      srvx--devo--1.3--patch-18
+
+    src/hash.c (AddChannelUser): Do not give ops to the first user to join
+    a persistent channel.
+    
+    src/helpserv.c (helpserv_conf_read): Use a default description for bots.
+
+    modified files:
+     ChangeLog src/hash.c src/mod-helpserv.c
+
+
 2005-02-11 03:10:49 GMT        Michael Poole <mdpoole@troilus.org>     patch-17
 
     Summary:

diff --git a/src/hash.c b/src/hash.c
index f179e96a88cac469d5cd189e4bae0baa93113bc6..c60ec57bdd4e4eb8eff65f181a08014235f4c6a6 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -474,7 +474,8 @@ AddChannelUser(struct userNode *user, struct chanNode* channel)
        modeList_append(&channel->members, mNode);
        modeList_append(&user->channels, mNode);
 
-        if (channel->members.used == 1)
+        if (channel->members.used == 1
+            && !(channel->modes & MODE_REGISTERED))
             mNode->modes |= MODE_CHANOP;
 
         for (n=0; n<jf_used; n++) {

diff --git a/src/mod-helpserv.c b/src/mod-helpserv.c
index 5e8a5139a5206415af674308475081973bbde587..126d0a247975af468a454e262eb59eb4024c157e 100644 (file)
--- a/src/mod-helpserv.c
+++ b/src/mod-helpserv.c
@@ -3648,7 +3648,7 @@ static void helpserv_conf_read(void) {
     helpserv_conf.db_backup_frequency = str ? ParseInterval(str) : 7200;
 
     str = database_get_data(conf_node, "description", RECDB_QSTRING);
-    helpserv_conf.description = str;
+    helpserv_conf.description = str ? str : "Help Queue Manager";
 
     str = database_get_data(conf_node, "reqlogfile", RECDB_QSTRING);
     if (str && strlen(str))