[srvx-commits] CVS: services/src chanserv.c,1.383,1.384 chanserv.h,1.49,1.50 nickserv.c,1.261,1.262

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

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv2511/src

Modified Files:
	chanserv.c chanserv.h nickserv.c 
Log Message:
show DNR for account (if there is one) in accountinfo (SF#791716/694270)


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.383
retrieving revision 1.384
diff -C2 -r1.383 -r1.384
*** chanserv.c	5 Oct 2003 03:15:29 -0000	1.383
--- chanserv.c	8 Oct 2003 03:04:46 -0000	1.384
***************
*** 1658,1662 ****
  }
  
! static struct do_not_register *
  chanserv_is_dnr(const char *chan_name, struct handle_info *handle)
  {
--- 1658,1662 ----
  }
  
! struct do_not_register *
  chanserv_is_dnr(const char *chan_name, struct handle_info *handle)
  {

Index: chanserv.h
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** chanserv.h	5 Aug 2003 01:31:16 -0000	1.49
--- chanserv.h	8 Oct 2003 03:04:46 -0000	1.50
***************
*** 184,187 ****
--- 184,188 ----
  enum userLevel user_level_from_name(const char *name);
  const char *user_level_from_level(enum userLevel level);
+ struct do_not_register *chanserv_is_dnr(const char *chan_name, struct handle_info *handle);
  
  #endif

Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.261
retrieving revision 1.262
diff -C2 -r1.261 -r1.262
*** nickserv.c	5 Oct 2003 03:12:36 -0000	1.261
--- nickserv.c	8 Oct 2003 03:04:46 -0000	1.262
***************
*** 235,238 ****
--- 235,239 ----
  #define NSMSG_INVALID_OPTION	"$b%s$b is an invalid account setting."
  #define NSMSG_INVALID_ANNOUNCE	"$b%s$b is an announcements value."
+ #define NSMSG_DNR_INFO          "$b%s$b is do-not-register (by $b%s$b): %s"
  
  #define NSMSG_STR_SETTING	"$b%14s $b%s"
***************
*** 1217,1221 ****
          nickserv_notice(user, NSMSG_HANDLEINFO_VACATION);
  
!     if ((hi != user->handle_info) && (!is_valid_oper(user, 0, 1)))
          return 1;
  
--- 1218,1226 ----
          nickserv_notice(user, NSMSG_HANDLEINFO_VACATION);
  
!     if (is_valid_oper(user, 0, 1)) {
!         struct do_not_register *dnr;
!         if ((dnr = chanserv_is_dnr(NULL, hi)))
!             reply(NSMSG_DNR_INFO, hi->handle, dnr->setter, dnr->reason);
!     } else if (hi != user->handle_info)
          return 1;