Backport convert-conf fix from head; remove bogus /dev/poll assertion.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1593 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 43bc89e27a3ba76bb5a1dc3eac3e38d213c813fe..3ce2add02cc224fcd99c033f7afd694447becab2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-30  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/engine_devpoll.c (engine_loop): Remove bogus assert.
+
+2005-12-31  Perry Lorier <isomer@undernet.org>
+
+       * convert-conf.c: Skip with a warning, H:'s that are missing a
+       corresponding C:
+
 2005-12-28  Michael Poole <mdpoole@troilus.org>
 
        * ircd-patch: Do not use [ for test, and do not use $[] for expr.

diff --git a/ircd/convert-conf.c b/ircd/convert-conf.c
index 0ff07d1b16f74e0e18b58ac8afd369a52aa2e84d..1470ec194542e928156715a9d3972b5f769c91fd 100644 (file)
--- a/ircd/convert-conf.c
+++ b/ircd/convert-conf.c
@@ -213,6 +213,15 @@ static void finish_connects(void)
     {
         for (sl = conn->origins; sl; sl = sl->next)
             fprintf(stdout, "# %s\n", sl->value);
+       if (conn->name == NULL
+            || conn->host == NULL
+            || conn->password == NULL
+            || conn->class == NULL)
+        {
+           fprintf(stderr, "H:line missing C:line for %s\n",sl->value);
+           continue;
+       }
+
         fprintf(stdout,
                 "Connect {\n\tname =\"%s\";\n\thost = \"%s\";\n"
                 "\tpassword = \"%s\";\n\tclass = \"%s\";\n",

diff --git a/ircd/engine_devpoll.c b/ircd/engine_devpoll.c
index daceb69617e4af9974253a888e81d36f9305a36c..9ef4dee0b36a77817243469d58d25dfc20defd8b 100644 (file)
--- a/ircd/engine_devpoll.c
+++ b/ircd/engine_devpoll.c
@@ -430,8 +430,6 @@ engine_loop(struct Generators* gen)
        break;
       }
 
-      assert(s_fd(sock) == polls[i].fd);
-
       gen_ref_dec(sock); /* we're done with it */
     }