Merge branch 'HostServ' of ssh://git.pk910.de:16110/srvx into HostServ

[srvx.git] / src / gline.h

diff --git a/src/gline.h b/src/gline.h
index d8de859ef2d0e81f9f6bb34875a3c8eef5fe2b05..65f17a216d41cc59ba0978df2dc5153e04abae7e 100644 (file)
--- a/src/gline.h
+++ b/src/gline.h
@@ -1,11 +1,12 @@
 /* gline.h - Gline database
  * Copyright 2001-2004 srvx Development Team
  *
- * This program is free software; you can redistribute it and/or modify
+ * This file is part of srvx.
+ *
+ * srvx is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.  Important limitations are
- * listed in the COPYING file that accompanies this software.
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, email srvx-maintainers@srvx.net.
+ * along with srvx; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
 
 #ifndef GLINE_H
@@ -22,10 +24,21 @@
 #include "hash.h"
 
 struct gline {
-    time_t issued;
-    time_t expires;
+    /** When the G-line was first created. */
+    unsigned long issued;
+    /** When the G-line was last modified. */
+    unsigned long lastmod;
+    /** When the G-line becomes ineffective. */
+    unsigned long expires;
+    /** When the G-line may be forgotten (the maximum "expires" value
+     * from any modification period).
+     */
+    unsigned long lifetime;
+    /** Account or nick name of the person creating the G-line. */
     char *issuer;
+    /** user@host mask covered by the G-line. */
     char *target;
+    /** What to tell affected users. */
     char *reason;
 };
 
@@ -36,12 +49,16 @@ struct gline_discrim {
     char *target_mask;
     char *alt_target_mask;
     char *reason_mask;
-    time_t max_issued;
-    time_t min_expire;
+    unsigned long max_issued;
+    unsigned long min_expire;
+    unsigned long min_lastmod;
+    unsigned long max_lastmod;
+    unsigned long min_lifetime;
+    unsigned long max_lifetime;
 };
 
 void gline_init(void);
-struct gline *gline_add(const char *issuer, const char *target, unsigned long duration, const char *reason, time_t issued, int announce);
+struct gline *gline_add(const char *issuer, const char *target, unsigned long duration, const char *reason, unsigned long issued, unsigned long lastmod, unsigned long lifetime, int announce);
 struct gline *gline_find(const char *target);
 int gline_remove(const char *target, int announce);
 void gline_refresh_server(struct server *srv);