GLINES: fix null pointer deref in trustgline / trustungline

[irc/quakenet/newserv.git] / glines / glines_util.c

diff --git a/glines/glines_util.c b/glines/glines_util.c
index 4f6aeb986cca8e3ead004d0c79a46c92204c0650..a8410b1930b4980c0784f6a8d3509ed9cac847f6 100644 (file)
--- a/glines/glines_util.c
+++ b/glines/glines_util.c
@@ -1,37 +1,55 @@
 #include "../irc/irc.h"
+#include "../trusts/trusts.h"
 #include "glines.h"
 
 int glinebyip(const char *user, struct irc_in_addr *ip, unsigned char bits, int duration, const char *reason, int flags, const char *creator) {
   glinebuf gbuf;
   int hits;
 
-  glinebufinit(&gbuf, 1);
+  glinebufinit(&gbuf, 0);
+  glinebufcommentf(&gbuf, "on IP mask %s@%s, set by %s", user, CIDRtostr(*ip, bits), creator);
   glinebufaddbyip(&gbuf, user, ip, bits, flags, creator, reason, getnettime() + duration, getnettime(), getnettime() + duration);
 
   glinebufcounthits(&gbuf, &hits, NULL);
 
   if (flags & GLINE_SIMULATE)
-    glinebufabandon(&gbuf);
+    glinebufabort(&gbuf);
   else
-    glinebufflush(&gbuf, 1);
+    glinebufcommit(&gbuf, 1);
 
   return hits;
 }
 
-int glinebynick(nick *np, int duration, const char *reason, int flags, const char *creator) {
+glineinfo *glinebynickex(nick *np, int duration, const char *reason, int flags, const char *creator) {
+  static glineinfo info;
   glinebuf gbuf;
-  int hits;
 
-  glinebufinit(&gbuf, 1);
-  glinebufaddbynick(&gbuf, np, flags, creator, reason, getnettime() + duration, getnettime(), getnettime() + duration);
+  glinebufinit(&gbuf, 0);
+  glinebufcommentf(&gbuf, "on nick %s!%s@%s, set by %s", np->nick, np->ident, np->host->name->content, creator);
+  info.mask = glinebufaddbynick(&gbuf, np, flags, creator, reason, getnettime() + duration, getnettime(), getnettime() + duration);
 
-  glinebufcounthits(&gbuf, &hits, NULL);
+  glinebufcounthits(&gbuf, &info.hits, NULL);
 
   if (flags & GLINE_SIMULATE)
-    glinebufabandon(&gbuf);
+    glinebufabort(&gbuf);
   else
-    glinebufflush(&gbuf, 1);
+    glinebufcommit(&gbuf, 1);
 
-  return hits;
+  return &info;
 }
 
+int glinebynick(nick *np, int duration, const char *reason, int flags, const char *creator) {
+  glineinfo *result = glinebynickex(np, duration, reason, flags, creator);
+  return result->hits;
+}
+
+void glineunsetmask(const char *mask) {
+  gline *gl;
+
+  gl = findgline(mask);
+
+  if (!gl)
+    return;
+
+  gline_deactivate(gl, 0, 1);
+}