Commit pauls changes.

diff --git a/core/events-epoll.c b/core/events-epoll.c
index 4db945d260d9844dc191776b1aa51990c55eecde..3cb3a7a19ae4f908a6bbbac2af79d4ca7f1e788d 100644 (file)
--- a/core/events-epoll.c
+++ b/core/events-epoll.c
@@ -1,5 +1,5 @@
 /*
- * events.c: the event handling core, poll() version
+ * events.c: the event handling core, epoll() version
  */
 
 #include <stdio.h>

diff --git a/pqsql/pqsql.c b/pqsql/pqsql.c
index 295e0e66ac2f666ef5e994892fd01c873a3454a4..a219355ce82e7eb3c5a8777825afcc77709806c1 100644 (file)
--- a/pqsql/pqsql.c
+++ b/pqsql/pqsql.c
@@ -90,7 +90,7 @@ void connectdb(void) {
     return;
   }
 
-  snprintf(connectstr, sizeof(connectstr), "dbname=%s user=%s password=%s", dbdatabase->content, dbusername->content, dbpassword->content);
+  snprintf(connectstr, sizeof(connectstr), "host=%s port=%s dbname=%s user=%s password=%s", dbhost->content, dbport->content, dbdatabase->content, dbusername->content, dbpassword->content);
   
   freesstring(dbhost);
   freesstring(dbusername);

diff --git a/proxyscan/Makefile b/proxyscan/Makefile
index bce9d75eaa26ea8f3a9aa5f98f31b1c44a9feb24..c2f9997cc43a47128a6599625ef97d2ecebe4a7a 100644 (file)
--- a/proxyscan/Makefile
+++ b/proxyscan/Makefile
@@ -3,4 +3,4 @@
 all: proxyscan.so  
 
 proxyscan.so: proxyscan.o proxyscanalloc.o proxyscanconnect.o proxyscancache.o proxyscanqueue.o proxyscanhandlers.o proxyscandb.o
-       ld -shared -Bdynamic ${LIBMYSQL} -o $@ $^
+       ld -shared -Bdynamic ${LIBPGSQL} -o $@ $^

diff --git a/proxyscan/proxyscanhandlers.c b/proxyscan/proxyscanhandlers.c
index 6bde0a73e6037cbeb93fccc7e541412893329c37..92e2817112148242ecbe54736f87a667da49084c 100644 (file)
--- a/proxyscan/proxyscanhandlers.c
+++ b/proxyscan/proxyscanhandlers.c
@@ -12,6 +12,11 @@ void proxyscan_newnick(int hooknum, void *arg) {
   if (irc_in_addr_is_loopback(&np->p_ipaddr) || !irc_in_addr_is_ipv4(&np->p_ipaddr)) 
     return;
 
+
+  /* ignore newnick for first 120s */
+  if (ps_start_ts+120 > time(NULL))
+    return;
+
   unsigned int ip = irc_in_addr_v4_to_int(&np->p_ipaddr);
 
   /*