[Solidircd-bugs] Solid-dev/src m_gline.c,1.2,1.2.2.1 m_shun.c,1.1,1.1.2.1 s_serv.c,1.30.2.1,1.30.2.2

[Juan B. <tu...@us...>]

Update of /cvsroot/solidircd/Solid-dev/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21003/src

Modified Files:
      Tag: Solid-030110
	m_gline.c m_shun.c s_serv.c 
Log Message:
----------------------------------------------------------------------
Enter Log.  
- G-Lines and Shuns can now be set to be permanent.
 
Committing in .
 
Modified Files:
  Tag: Solid-030110
 	CHANGES src/m_gline.c src/m_shun.c src/s_serv.c 
----------------------------------------------------------------------


Index: m_gline.c
===================================================================
RCS file: /cvsroot/solidircd/Solid-dev/src/m_gline.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** m_gline.c	17 Jul 2004 00:41:20 -0000	1.2
--- m_gline.c	22 Jul 2004 17:21:24 -0000	1.2.2.1
***************
*** 151,161 ****
  	argv = parv[2];
  
      if (time_specified == 0)
      {
! 	temporary_gline_time = 30;
! 	temporary_gline_time_seconds =
! 	    (time_t) temporary_gline_time *(time_t) 60;
      }
! 
      if (parc > 2) 
      {
--- 151,161 ----
  	argv = parv[2];
  
+ #ifdef DEFAULT_KLINE_TIME
      if (time_specified == 0)
      {
! 		temporary_gline_time = 30;
! 		temporary_gline_time_seconds = (time_t) temporary_gline_time *(time_t) 60;
      }
! #endif
      if (parc > 2) 
      {

Index: m_shun.c
===================================================================
RCS file: /cvsroot/solidircd/Solid-dev/src/m_shun.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** m_shun.c	20 Jun 2004 02:28:04 -0000	1.1
--- m_shun.c	22 Jul 2004 17:21:24 -0000	1.1.2.1
***************
*** 146,154 ****
  	argv = parv[2];
  
      if (time_specified == 0)
      {
! 	temporary_shun_time = 30;
! 	temporary_shun_time_seconds = (time_t) temporary_shun_time *(time_t) 60;
      }
      if (parc > 2) 
      {
--- 146,156 ----
  	argv = parv[2];
  
+ #ifdef DEFAULT_KLINE_TIME
      if (time_specified == 0)
      {
! 		temporary_shun_time = 30;
! 		temporary_shun_time_seconds = (time_t) temporary_shun_time *(time_t) 60;
      }
+ #endif
      if (parc > 2) 
      {

Index: s_serv.c
===================================================================
RCS file: /cvsroot/solidircd/Solid-dev/src/s_serv.c,v
retrieving revision 1.30.2.1
retrieving revision 1.30.2.2
diff -C2 -d -r1.30.2.1 -r1.30.2.2
*** s_serv.c	22 Jul 2004 16:10:44 -0000	1.30.2.1
--- s_serv.c	22 Jul 2004 17:21:24 -0000	1.30.2.2
***************
*** 3763,3771 ****
       * oh, and we only do this if DEFAULT_KLINE_TIME is specified.
       */
! 	 /* Not any more we dont. - Tux` */
  
      if(result == 0)
  		result = 1;
!     
      return (result);
  }
--- 3763,3772 ----
       * oh, and we only do this if DEFAULT_KLINE_TIME is specified.
       */
! 	 /* This will also apply to all glines, and shuns - Tux` */
  
+ #ifndef DEFAULT_KLINE_TIME
      if(result == 0)
  		result = 1;
! #endif
      return (result);
  }