[Solidircd-CVS] solidircd-stable/src channel.c,1.11,1.12 s_user.c,1.21,1.22

[Gabriel B. <sh...@us...>]

Update of /cvsroot/solidircd/solidircd-stable/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2097/src

Modified Files:
	channel.c s_user.c 
Log Message:
template clean up.

Index: s_user.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** s_user.c	12 Mar 2006 14:59:21 -0000	1.21
--- s_user.c	12 Mar 2006 16:05:54 -0000	1.22
***************
*** 436,443 ****
  		ircsprintf(mask, "%s-%d.c%d.usr.%s",
  			HostPrefix, sum, csum, HostDomain);
! 		/* FIXME 
  		  SetURSL(sptr);
            sendto_one(sptr, ":%s NOTICE %s :*** You have been marked has an unresolved client.",
!                                me.name, sptr->name);  */
  	}
  	strncpy(sptr->user->maskhost, mask, HOSTLEN+1);
--- 436,445 ----
  		ircsprintf(mask, "%s-%d.c%d.usr.%s",
  			HostPrefix, sum, csum, HostDomain);
! 		#ifdef ENABLE_CHANNEL_MODE_D
!          /*FIXME*/
  		  SetURSL(sptr);
            sendto_one(sptr, ":%s NOTICE %s :*** You have been marked has an unresolved client.",
!                                me.name, sptr->name);  
! 		#endif
  	}
  	strncpy(sptr->user->maskhost, mask, HOSTLEN+1);
***************
*** 2299,2304 ****
--- 2301,2309 ----
              sendto_one(sptr, rpl_str(RPL_ISSSL), me.name, parv[0], name);
  #endif
+ 
+ #ifdef ENABLE_CHANNEL_MODE_D
          if (!(IsOper(acptr)) && (IsURSL(acptr)))	 
              sendto_one(sptr, rpl_str(RPL_ISNOTRSL), me.name, parv[0], name);      
+ #endif
  
          /* don't give away that this oper is on this server if they're hidden! */

Index: channel.c
===================================================================
RCS file: /cvsroot/solidircd/solidircd-stable/src/channel.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** channel.c	7 Jan 2006 22:13:26 -0000	1.11
--- channel.c	12 Mar 2006 16:05:54 -0000	1.12
***************
*** 1095,1100 ****
--- 1095,1102 ----
          *mbuf++ = 'S';
  #endif
+ #ifdef ENABLE_CHANNEL_MODE_D
      if (chptr->mode.mode & MODE_RSL)
          *mbuf++ = 'D';
+ #endif
     if (chptr->mode.mode & MODE_NONICK)
  	*mbuf++ = 'N'; 
***************
*** 1492,1496 ****
--- 1494,1502 ----
  #define SM_ERR_SSL        0x0010 /* SSL Only*/
  #endif
+ 
+ #ifdef ENABLE_CHANNEL_MODE_D
  #define SM_ERR_RSL        0x0020 /* RSL(Resolvoled Clients) Only*/
+ #endif
+ 
  #define SM_MAXMODES MAXMODEPARAMSUSER
  
***************
*** 1505,1509 ****
          MODE_TOPICLIMIT, 't', MODE_REGONLY, 'R',
          MODE_INVITEONLY, 'i', MODE_NOCTRL, 'c', MODE_OPERONLY, 'O',
!         MODE_MODREG, 'M',     MODE_NONICK, 'N', MODE_RSL,  'D',
  #ifdef HAVE_SSL
          MODE_SSL, 'S',
--- 1511,1520 ----
          MODE_TOPICLIMIT, 't', MODE_REGONLY, 'R',
          MODE_INVITEONLY, 'i', MODE_NOCTRL, 'c', MODE_OPERONLY, 'O',
!         MODE_MODREG, 'M',     MODE_NONICK, 'N', 
! 
! #ifdef ENABLE_CHANNEL_MODE_D			
! 	MODE_RSL,  'D',
! #endif
! 
  #ifdef HAVE_SSL
          MODE_SSL, 'S',
***************
*** 1614,1617 ****
--- 1625,1629 ----
              */
  
+ #ifdef ENABLE_CHANNEL_MODE_D
  	 case 'D':
              if (!IsULine(sptr) && (check_level(level,2,chptr,sptr) && IsURSL(sptr) && !IsOper(sptr)))
***************
*** 1635,1638 ****
--- 1647,1651 ----
              }
              break;
+ #endif
  
          case 'O':
***************
*** 2413,2420 ****
--- 2426,2435 ----
  #endif
  
+ #ifdef ENABLE_CHANNEL_MODE_D
  	 if(errors & SM_ERR_RSL)
              sendto_one(sptr,":%s NOTICE %s :*** Notice -- Permission denied you may not set (+D) or join a (+D)"
  	         "channel since you have been marked has an unresolved client.",
                         me.name, sptr->name);
+ #endif
      }
      /* all done! */
***************
*** 2485,2491 ****
--- 2500,2510 ----
  #endif
  
+ #ifdef ENABLE_CHANNEL_MODE_D
+ 
  if (chptr->mode.mode & MODE_RSL && IsURSL(sptr))
          error = ERR_RSL;
  
+ #endif
+ 
  #ifdef INVITE_LISTS
      if (error && is_invited(sptr, chptr))
***************
*** 4583,4587 ****
--- 4602,4609 ----
              SJ_MODEADD('S', MODE_SSL);
  #endif
+ 
+ #ifdef ENABLE_CHANNEL_MODE_D
              SJ_MODEADD('D', MODE_RSL);
+ #endif
              SJ_MODEADD('N', MODE_NONICK);
  #ifdef USE_CHANMODE_L
***************
*** 4747,4751 ****
--- 4769,4776 ----
          SJ_MODEPLUS('S', MODE_SSL);
  #endif
+ 
+ #ifdef ENABLE_CHANNEL_MODE_D
          SJ_MODEPLUS('D', MODE_RSL);
+ #endif
          SJ_MODEPLUS('N', MODE_NONICK);
  #ifdef USE_CHANMODE_L
***************
*** 4768,4772 ****
--- 4793,4801 ----
          SJ_MODEMINUS('S', MODE_SSL);
  #endif
+ 
+ #ifdef ENABLE_CHANNEL_MODE_D
          SJ_MODEMINUS('D', MODE_RSL);
+ #endif
+ 
          SJ_MODEMINUS('N', MODE_NONICK);
  #ifdef USE_CHANMODE_L