[srvx-commits] CVS: services/src chanserv.c,1.361,1.362 hash.c,1.177,1.178 opserv.c,1.321,1.322

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

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

Modified Files:
	chanserv.c hash.c opserv.c 
Log Message:
allow modes for OpServ's special channels to be specified in the config file


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.361
retrieving revision 1.362
diff -C2 -r1.361 -r1.362
*** chanserv.c	8 Jul 2003 04:21:20 -0000	1.361
--- chanserv.c	12 Jul 2003 03:19:18 -0000	1.362
***************
*** 30,34 ****
  
  /* ChanServ options */
- #define KEY_DEBUG_CHANNEL	"debug_channel"
  #define KEY_SUPPORT_CHANNEL     "support_channel"
  #define KEY_DB_BACKUP_FREQ	"db_backup_freq"
--- 30,33 ----
***************
*** 427,431 ****
  static struct
  {
-     struct chanNode 	*debug_channel;
      struct chanNode     *support_channel;
  
--- 426,429 ----
***************
*** 6606,6620 ****
  	log_module(CS_LOG, LOG_ERROR, "Invalid config node `%s'.", CHANSERV_CONF_NAME);
  	return;
-     }
-     str = database_get_data(conf_node, KEY_DEBUG_CHANNEL, RECDB_QSTRING);
-     if(str)
-     {
- 	chanserv_conf.debug_channel = AddChannel(str, now, "+tinms", NULL);
-         AddChannelUser(chanserv, chanserv_conf.debug_channel);
- 	AddChannelOp(1, &chanserv, chanserv_conf.debug_channel, chanserv, 0);
-     }
-     else
-     {
- 	chanserv_conf.debug_channel = NULL;
      }
      str = database_get_data(conf_node, KEY_SUPPORT_CHANNEL, RECDB_QSTRING);
--- 6604,6607 ----

Index: hash.c
===================================================================
RCS file: /cvsroot/srvx/services/src/hash.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -C2 -r1.177 -r1.178
*** hash.c	12 Jul 2003 02:59:49 -0000	1.177
--- hash.c	12 Jul 2003 03:19:18 -0000	1.178
***************
*** 360,376 ****
          banList_init(&cNode->banlist);
          modeList_init(&cNode->members);
          dict_insert(channels, cNode->name, cNode);
          cNode->timestamp = time_;
          rel_age = 1;
      } else {
!         if (cNode->timestamp > time_) {
!             wipeout_channel(cNode, time_, modes);
!             rel_age = 1;
!         } else if (cNode->timestamp == time_) {
!             mod_chanmode(cNode, NULL, modes);
!             rel_age = 0;
!         } else {
!             rel_age = -1;
!         }
      }
  
--- 360,375 ----
          banList_init(&cNode->banlist);
          modeList_init(&cNode->members);
+         mod_chanmode(cNode, NULL, modes);
          dict_insert(channels, cNode->name, cNode);
          cNode->timestamp = time_;
          rel_age = 1;
+     } else if (cNode->timestamp > time_) {
+         wipeout_channel(cNode, time_, modes);
+         rel_age = 1;
+     } else if (cNode->timestamp == time_) {
+         mod_chanmode(cNode, NULL, modes);
+         rel_age = 0;
      } else {
!         rel_age = -1;
      }
  

Index: opserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/opserv.c,v
retrieving revision 1.321
retrieving revision 1.322
diff -C2 -r1.321 -r1.322
*** opserv.c	12 Jul 2003 02:59:49 -0000	1.321
--- opserv.c	12 Jul 2003 03:19:18 -0000	1.322
***************
*** 36,40 ****
--- 36,42 ----
  
  #define KEY_ALERT_CHANNEL "alert_channel"
+ #define KEY_ALERT_CHANNEL_MODES "alert_channel_modes"
  #define KEY_DEBUG_CHANNEL "debug_channel"
+ #define KEY_DEBUG_CHANNEL_MODES "debug_channel_modes"
  #define KEY_UNTRUSTED_MAX "untrusted_max"
  #define KEY_PURGE_LOCK_DELAY "purge_lock_delay"
***************
*** 66,69 ****
--- 68,72 ----
  #define KEY_EXPIRES "expires"
  #define KEY_STAFF_AUTH_CHANNEL "staff_auth_channel"
+ #define KEY_STAFF_AUTH_CHANNEL_MODES "staff_auth_channel_modes"
  #define KEY_CLONE_GLINE_DURATION "clone_gline_duration"
  #define KEY_BLOCK_GLINE_DURATION "block_gline_duration"
***************
*** 3825,3829 ****
      struct record_data *rd;
      dict_t conf_node, child;
!     const char *str;
      struct policer_params *pp;
      dict_iterator_t it;
--- 3828,3832 ----
      struct record_data *rd;
      dict_t conf_node, child;
!     const char *str, *str2;
      struct policer_params *pp;
      dict_iterator_t it;
***************
*** 3837,3841 ****
      str = database_get_data(conf_node, KEY_DEBUG_CHANNEL, RECDB_QSTRING);
      if (str) {
! 	opserv_conf.debug_channel = AddChannel(str, now, "+tinms", NULL);
          AddChannelUser(opserv, opserv_conf.debug_channel)->modes |= MODE_CHANOP;
      } else {
--- 3840,3846 ----
      str = database_get_data(conf_node, KEY_DEBUG_CHANNEL, RECDB_QSTRING);
      if (str) {
!         str2 = database_get_data(conf_node, KEY_DEBUG_CHANNEL_MODES, RECDB_QSTRING);
!         if (!str2) str2 = "+tinms";
! 	opserv_conf.debug_channel = AddChannel(str, now, str2, NULL);
          AddChannelUser(opserv, opserv_conf.debug_channel)->modes |= MODE_CHANOP;
      } else {
***************
*** 3844,3848 ****
      str = database_get_data(conf_node, KEY_ALERT_CHANNEL, RECDB_QSTRING);
      if (str) {
! 	opserv_conf.alert_channel = AddChannel(str, now, "+tns", NULL);
          AddChannelUser(opserv, opserv_conf.alert_channel)->modes |= MODE_CHANOP;
      } else {
--- 3849,3855 ----
      str = database_get_data(conf_node, KEY_ALERT_CHANNEL, RECDB_QSTRING);
      if (str) {
!         str2 = database_get_data(conf_node, KEY_ALERT_CHANNEL_MODES, RECDB_QSTRING);
!         if (!str2) str2 = "+tns";
! 	opserv_conf.alert_channel = AddChannel(str, now, str2, NULL);
          AddChannelUser(opserv, opserv_conf.alert_channel)->modes |= MODE_CHANOP;
      } else {
***************
*** 3851,3855 ****
      str = database_get_data(conf_node, KEY_STAFF_AUTH_CHANNEL, RECDB_QSTRING);
      if (str) {
!         opserv_conf.staff_auth_channel = AddChannel(str, now, "+timns", NULL);
          AddChannelUser(opserv, opserv_conf.staff_auth_channel)->modes |= MODE_CHANOP;
      } else {
--- 3858,3864 ----
      str = database_get_data(conf_node, KEY_STAFF_AUTH_CHANNEL, RECDB_QSTRING);
      if (str) {
!         str2 = database_get_data(conf_node, KEY_STAFF_AUTH_CHANNEL_MODES, RECDB_QSTRING);
!         if (!str2) str2 = "+timns";
!         opserv_conf.staff_auth_channel = AddChannel(str, now, str2, NULL);
          AddChannelUser(opserv, opserv_conf.staff_auth_channel)->modes |= MODE_CHANOP;
      } else {