[srvx-commits] CVS: services/src gline.c,1.36,1.37 opserv.c,1.344,1.345

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

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

Modified Files:
	gline.c opserv.c 
Log Message:
add badchan support


Index: gline.c
===================================================================
RCS file: /cvsroot/srvx/services/src/gline.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** gline.c	26 Sep 2003 15:13:59 -0000	1.36
--- gline.c	12 Oct 2003 19:20:58 -0000	1.37
***************
*** 286,290 ****
                  goto fail;
              }
!             if (!is_gline(argv[++i])) {
                  send_message(user, src, MSG_INVALID_GLINE, argv[i]);
                  goto fail;
--- 286,291 ----
                  goto fail;
              }
!             ++i;
!             if (!is_gline(argv[i]) && !IsChannelName(argv[i])) {
                  send_message(user, src, MSG_INVALID_GLINE, argv[i]);
                  goto fail;

Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.344
retrieving revision 1.345
diff -C2 -r1.344 -r1.345
*** opserv.c	12 Oct 2003 03:35:50 -0000	1.344
--- opserv.c	12 Oct 2003 19:20:58 -0000	1.345
***************
*** 797,805 ****
  
      reason = unsplit_string(argv+3, argc-3, NULL);
!     if (!is_gline(argv[1])) {
  	opserv_notice(user, MSG_INVALID_GLINE, argv[1]);
  	return 0;
      }
!     if (!argv[1][strspn(argv[1], "*?@.")] && (strlen(argv[1]) < 10)) {
          opserv_notice(user, OSMSG_STUPID_GLINE, argv[1]);
          return 0;
--- 797,805 ----
  
      reason = unsplit_string(argv+3, argc-3, NULL);
!     if (!is_gline(argv[1]) && !IsChannelName(argv[1])) {
  	opserv_notice(user, MSG_INVALID_GLINE, argv[1]);
  	return 0;
      }
!     if (!argv[1][strspn(argv[1], "#*?@.")] && (strlen(argv[1]) < 10)) {
          opserv_notice(user, OSMSG_STUPID_GLINE, argv[1]);
          return 0;