Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2005-12-30 13:28:53 UTC
Modified files:
Tag: u2_10_12_branch
ircd/engine_devpoll.c ircd/convert-conf.c ChangeLog
Log message:
Backport convert-conf fix from head; remove bogus /dev/poll assertion.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.50 ircu2.10/ChangeLog:1.710.2.51
--- ircu2.10/ChangeLog:1.710.2.50 Wed Dec 28 19:41:56 2005
+++ ircu2.10/ChangeLog Fri Dec 30 05:28:42 2005
@@ -1,3 +1,12 @@
+2005-12-30 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/engine_devpoll.c (engine_loop): Remove bogus assert.
+
+2005-12-31 Perry Lorier <[EMAIL PROTECTED]>
+
+ * convert-conf.c: Skip with a warning, H:'s that are missing a
+ corresponding C:
+
2005-12-28 Michael Poole <[EMAIL PROTECTED]>
* ircd-patch: Do not use [ for test, and do not use $[] for expr.
Index: ircu2.10/ircd/convert-conf.c
diff -u ircu2.10/ircd/convert-conf.c:1.2.2.3
ircu2.10/ircd/convert-conf.c:1.2.2.4
--- ircu2.10/ircd/convert-conf.c:1.2.2.3 Tue Dec 13 15:12:41 2005
+++ ircu2.10/ircd/convert-conf.c Fri Dec 30 05:28:41 2005
@@ -213,6 +213,15 @@
{
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",
Index: ircu2.10/ircd/engine_devpoll.c
diff -u ircu2.10/ircd/engine_devpoll.c:1.6
ircu2.10/ircd/engine_devpoll.c:1.6.2.1
--- ircu2.10/ircd/engine_devpoll.c:1.6 Fri Dec 10 21:13:44 2004
+++ ircu2.10/ircd/engine_devpoll.c Fri Dec 30 05:28:40 2005
@@ -18,7 +18,7 @@
*/
/** @file
* @brief Solaris /dev/poll event engine.
- * @version $Id: engine_devpoll.c,v 1.6 2004/12/11 05:13:44 klmitch Exp $
+ * @version $Id: engine_devpoll.c,v 1.6.2.1 2005/12/30 13:28:40 entrope Exp $
*/
#include "config.h"
@@ -430,8 +430,6 @@
break;
}
- assert(s_fd(sock) == polls[i].fd);
-
gen_ref_dec(sock); /* we're done with it */
}
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
