[srvx-commits] CVS: services/src nickserv.c,1.205,1.206

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

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

Modified Files:
	nickserv.c 
Log Message:
fix NickServ search function (bug 609129)


Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -C2 -r1.205 -r1.206
*** nickserv.c	14 Sep 2002 03:49:33 -0000	1.205
--- nickserv.c	14 Sep 2002 04:01:53 -0000	1.206
***************
*** 2678,2685 ****
      NICKSERV_MIN_PARMS(3);
      sprintf(buf, "search %s", argv[1]);
!     if (!(subcmd = dict_find(nickserv_service->commands, buf, NULL))) {
!         nickserv_notice(user, NSMSG_INVALID_ACTION, argv[1]);
!         return 0;
!     }
      if (!irccasecmp(argv[1], "print")) action = search_print_func;
      else if (!irccasecmp(argv[1], "count")) action = search_count_func;
--- 2678,2682 ----
      NICKSERV_MIN_PARMS(3);
      sprintf(buf, "search %s", argv[1]);
!     subcmd = dict_find(nickserv_service->commands, buf, NULL);
      if (!irccasecmp(argv[1], "print")) action = search_print_func;
      else if (!irccasecmp(argv[1], "count")) action = search_count_func;
***************
*** 2690,2694 ****
      }
  
!     if (!svccmd_can_invoke(user, nickserv, subcmd, NULL, 0)) {
          nickserv_notice(user, NSMSG_NO_ACCESS);
          return 0;
--- 2687,2691 ----
      }
  
!     if (subcmd && !svccmd_can_invoke(user, nickserv, subcmd, NULL, 0)) {
          nickserv_notice(user, NSMSG_NO_ACCESS);
          return 0;