[srvx-commits] CVS: services/src nickserv.c,1.138.2.41,1.138.2.42

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv6703/src

Modified Files:
      Tag: rel-1_0
	nickserv.c 
Log Message:
fix search command (mostly, set default last-registered and last-seen maxima to now)


Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.138.2.41
retrieving revision 1.138.2.42
diff -C2 -r1.138.2.41 -r1.138.2.42
*** nickserv.c	2001/08/15 03:13:40	1.138.2.41
--- nickserv.c	2001/08/16 02:58:47	1.138.2.42
***************
*** 1821,1825 ****
  struct nickserv_discrim {
      unsigned int limit;
!     unsigned int flags_on, flags_off;
      time_t registered, lastseen;
      const char *nickmask;
--- 1821,1825 ----
  struct nickserv_discrim {
      unsigned int limit;
!     unsigned long flags_on, flags_off;
      time_t registered, lastseen;
      const char *nickmask;
***************
*** 1846,1849 ****
--- 1846,1851 ----
      memset(discrim, 0, sizeof(*discrim));
      discrim->limit = 50;
+     discrim->registered = now;
+     discrim->lastseen = now;
      for (i=0; i<argc; i++) {
          if (i == argc - 1) {
***************
*** 1897,1901 ****
          || (discrim->flags_off & hi->flags)
          || (discrim->registered < hi->registered)
!         || (discrim->lastseen < hi->lastseen)
          || (discrim->handlemask && !match_ircglob(hi->handle, discrim->handlemask))) {
          return 0;
--- 1899,1903 ----
          || (discrim->flags_off & hi->flags)
          || (discrim->registered < hi->registered)
!         || (discrim->lastseen < (hi->users?now:hi->lastseen))
          || (discrim->handlemask && !match_ircglob(hi->handle, discrim->handlemask))) {
          return 0;