? ../ircu2.10.06/patch.db36
? ../ircu2.10.06/patch.db37
? ../ircu2.10.06/patch.db38
? ../ircu2.10.06/patch.db39
? ../ircu2.10.06/patch.db40
? ../ircu2.10.06/patch.db41
Index: ../ircu2.10.06/include/s_bdd.h
===================================================================
RCS file: /cvsroot/ircd/include/s_bdd.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** ../ircu2.10.06/include/s_bdd.h	1999/10/21 22:44:42	1.1
--- ../ircu2.10.06/include/s_bdd.h	1999/10/25 17:21:23	1.2
***************
*** 36,50 ****
  #define DBH_MAX_TABLA      256
  #define DBH_PRIMERA_TABLA 'A'
  #define DBH_ULTIMA_TABLA  'Z'
- #define DBH_NICKDB        'N'
- #define DBH_OPERDB        'O'
- #define DBH_CHANDB        'C'
- #define DBH_BOTSDB        'B'
- #define DBH_VIRTUALDB     'V'
  #define ESNET_BDD         'a'
  #define ESNET_BDD_END     'z'
  #define ESNET_NICKDB      'n'
  #define ESNET_CLONESDB    'i'
  
  /* Para las features del Virtual CHaN */
  #define DBH_CHANSERV      "ChanServ"
--- 36,50 ----
  #define DBH_MAX_TABLA      256
  #define DBH_PRIMERA_TABLA 'A'
  #define DBH_ULTIMA_TABLA  'Z'
  #define ESNET_BDD         'a'
  #define ESNET_BDD_END     'z'
  #define ESNET_NICKDB      'n'
  #define ESNET_CLONESDB    'i'
+ 
+ #define BDD_OPERDB        'o'
+ #define BDD_CHANDB        'c'
+ #define BDD_BOTSDB        'b'
+ #define BDD_VIRTUALDB     'v'
  
  /* Para las features del Virtual CHaN */
  #define DBH_CHANSERV      "ChanServ"
Index: ../ircu2.10.06/ircd/Makefile.in
===================================================================
RCS file: /cvsroot/ircd/ircd/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** ../ircu2.10.06/ircd/Makefile.in	1999/10/21 22:44:42	1.9
--- ../ircu2.10.06/ircd/Makefile.in	1999/10/25 17:21:25	1.10
***************
*** 119,133 ****
  	  ${CHMOD} 700 ${DBPATH} ; \
  	  ${CHOWN} ${IRCDOWN} ${DBPATH} ; \
  	  ${CHGRP} ${IRCDGRP} ${DBPATH} ; \
! 	  for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; \
  	  do \
  		${TOUCH} ${DBPATH}/tabla.$$i ; \
  	  done; \
!           ${TOUCH} ${DBPATH}/hashes ; \
! 	  for i in A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ; \
  	  do \
  		${TOUCH} ${DBPATH}/tabla.$$i ; \
! 		${TOUCH} ${DBPATH}/version.$$i ; \
  	  done; \
  	  ${CHMOD} 600 ${DBPATH}/* ; \
  	  ${CHOWN} ${IRCDOWN} ${DBPATH}/* ; \
--- 119,138 ----
  	  ${CHMOD} 700 ${DBPATH} ; \
  	  ${CHOWN} ${IRCDOWN} ${DBPATH} ; \
  	  ${CHGRP} ${IRCDGRP} ${DBPATH} ; \
! 	  for i in b i n o v ; \
  	  do \
  		${TOUCH} ${DBPATH}/tabla.$$i ; \
  	  done; \
! 	  ${TOUCH} ${DBPATH}/hashes ; \
! 	  for i in a c d e f g h j k l m p q r s t u w x y z ; \
  	  do \
+ 		${RM} -f ${DBPATH}/tabla.$$i ; \
  		${TOUCH} ${DBPATH}/tabla.$$i ; \
! 	  done; \
! 	  for i in A B C D E F G H I J K L M N O P Q R S T U V W X Y Z ; \
! 	  do \
! 		${RM} -f ${DBPATH}/tabla.$$i ; \
! 		${RM} -f ${DBPATH}/version.$$i ; \
  	  done; \
  	  ${CHMOD} 600 ${DBPATH}/* ; \
  	  ${CHOWN} ${IRCDOWN} ${DBPATH}/* ; \
Index: ../ircu2.10.06/ircd/channel.c
===================================================================
RCS file: /cvsroot/ircd/ircd/channel.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** ../ircu2.10.06/ircd/channel.c	1999/10/21 22:44:42	1.18
--- ../ircu2.10.06/ircd/channel.c	1999/10/25 17:21:25	1.19
***************
*** 863,869 ****
  
    badop = 0;
  
!   r = dbh_buscar_registro_local(DBH_BOTSDB, parv[1]);
    if (r && r->valor)
      botname = r->valor;
    else
--- 863,869 ----
  
    badop = 0;
  
!   r = dbh_buscar_registro_local(BDD_BOTSDB, parv[1]);
    if (r && r->valor)
      botname = r->valor;
    else
***************
*** 1415,1421 ****
  	{
  	  struct dbh_reg *reg;
  
! 	  reg = dbh_buscar_registro_local(DBH_CHANDB, chptr->chname);
  #ifdef DBH_OPER_HACK
  	  /*
  	   * Los miembros de la BD de OPERs pueden usar los modos X
--- 1415,1421 ----
  	{
  	  struct dbh_reg *reg;
  
! 	  reg = dbh_buscar_registro_local(BDD_CHANDB, chptr->chname);
  #ifdef DBH_OPER_HACK
  	  /*
  	   * Los miembros de la BD de OPERs pueden usar los modos X
***************
*** 1427,1433 ****
  	      reg &&
  #endif
  	      IsNickRegistered(sptr) &&
! 	      dbh_buscar_registro_local(DBH_OPERDB, sptr->name))
  	  {
  	    if (!is_chan_op(sptr, chptr))
  	      jcea_xmode_esnet = !0;
--- 1427,1433 ----
  	      reg &&
  #endif
  	      IsNickRegistered(sptr) &&
! 	      dbh_buscar_registro_local(BDD_OPERDB, sptr->name))
  	  {
  	    if (!is_chan_op(sptr, chptr))
  	      jcea_xmode_esnet = !0;
***************
*** 1441,1447 ****
  	   *                              1999/06/30 savage@apostols.org
  	   */
  	  if (IsNickRegistered(sptr) &&
! 	      dbh_es_miembro(DBH_CHANDB, chptr->chname, sptr->name) == 1)
  	  {
  	    if (!is_chan_op(sptr, chptr))
  	      jcea_xmode_esnet = !0;
--- 1441,1447 ----
  	   *                              1999/06/30 savage@apostols.org
  	   */
  	  if (IsNickRegistered(sptr) &&
! 	      dbh_es_miembro(BDD_CHANDB, chptr->chname, sptr->name) == 1)
  	  {
  	    if (!is_chan_op(sptr, chptr))
  	      jcea_xmode_esnet = !0;
***************
*** 2207,2213 ****
    {
      struct dbh_reg *reg;
  
!     reg = dbh_buscar_registro_local(DBH_CHANDB, (char *)chptr->chname);
  #ifdef DBH_OPER_HACK
  /*
  * El hack de la base de datos de opers permite que estos dispongan
--- 2207,2213 ----
    {
      struct dbh_reg *reg;
  
!     reg = dbh_buscar_registro_local(BDD_CHANDB, (char *)chptr->chname);
  #ifdef DBH_OPER_HACK
  /*
  * El hack de la base de datos de opers permite que estos dispongan
***************
*** 2220,2226 ****
  	reg &&
  #endif
  	IsNickRegistered(sptr) &&
! 	dbh_buscar_registro_local(DBH_OPERDB, sptr->name)
  	&& (!compall("OPER", key)))
        return 0;
  #endif
--- 2220,2226 ----
  	reg &&
  #endif
  	IsNickRegistered(sptr) &&
! 	dbh_buscar_registro_local(BDD_OPERDB, sptr->name)
  	&& (!compall("OPER", key)))
        return 0;
  #endif
***************
*** 2234,2240 ****
   */
  
      if ((!BadPtr(key)) && IsNickRegistered(sptr)
! 	&& dbh_es_miembro(DBH_CHANDB, chptr->chname, sptr->name) == 1
  	&& (!compall("FUNDADOR", key)))
        return 0;
  #endif
--- 2234,2240 ----
   */
  
      if ((!BadPtr(key)) && IsNickRegistered(sptr)
! 	&& dbh_es_miembro(BDD_CHANDB, chptr->chname, sptr->name) == 1
  	&& (!compall("FUNDADOR", key)))
        return 0;
  #endif
***************
*** 2617,2623 ****
        }
        chptr = get_channel(sptr, name, CREATE);
  #if defined(DB_HISPANO) || defined(DB_ESNET)
!       if (chptr && dbh_buscar_registro_local(DBH_CHANDB, name))
  	chptr->mode.mode |= MODE_REGCHAN;
        /* Aki debo implantar los modos por defecto sacados de la DBH */
  #endif
--- 2617,2623 ----
        }
        chptr = get_channel(sptr, name, CREATE);
  #if defined(DB_HISPANO) || defined(DB_ESNET)
!       if (chptr && dbh_buscar_registro_local(BDD_CHANDB, name))
  	chptr->mode.mode |= MODE_REGCHAN;
        /* Aki debo implantar los modos por defecto sacados de la DBH */
  #endif
***************
*** 2668,2674 ****
  	/* asi ya lo meto en el canal con el OP puesto a nivel local */
  	if (AutoOpChannel(chptr) &&
  	    IsNickRegistered(sptr) &&
! 	    dbh_es_miembro(DBH_CHANDB, chptr->chname, sptr->name))
  	  flags = CHFL_CHANOP;
  #endif
        }
--- 2668,2674 ----
  	/* asi ya lo meto en el canal con el OP puesto a nivel local */
  	if (AutoOpChannel(chptr) &&
  	    IsNickRegistered(sptr) &&
! 	    dbh_es_miembro(BDD_CHANDB, chptr->chname, sptr->name))
  	  flags = CHFL_CHANOP;
  #endif
        }
***************
*** 2762,2773 ****
  	 */
  	if (chptr && AutoOpChannel(chptr)
  	    && IsNickRegistered(sptr)
! 	    && dbh_es_miembro(DBH_CHANDB, chptr->chname, sptr->name))
  	{
  	  struct dbh_reg *r;
  	  char *botname;
  
! 	  if ((r = dbh_buscar_registro_local(DBH_BOTSDB, DBH_CHANSERV)) != NULL)
  	    botname = r->valor;
  	  else
  	    botname = me.name;
--- 2762,2773 ----
  	 */
  	if (chptr && AutoOpChannel(chptr)
  	    && IsNickRegistered(sptr)
! 	    && dbh_es_miembro(BDD_CHANDB, chptr->chname, sptr->name))
  	{
  	  struct dbh_reg *r;
  	  char *botname;
  
! 	  if ((r = dbh_buscar_registro_local(BDD_BOTSDB, DBH_CHANSERV)) != NULL)
  	    botname = r->valor;
  	  else
  	    botname = me.name;
Index: ../ircu2.10.06/ircd/s_bdd.c
===================================================================
RCS file: /cvsroot/ircd/ircd/s_bdd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** ../ircu2.10.06/ircd/s_bdd.c	1999/10/21 22:44:42	1.1
--- ../ircu2.10.06/ircd/s_bdd.c	1999/10/25 17:21:25	1.2
***************
*** 953,962 ****
--- 953,968 ----
    char c;
  
    tabla_residente[ESNET_NICKDB] = 1;
+ 
  #if defined(DB_ESNET) && defined(ESNET_CLONES)
    tabla_residente[ESNET_CLONESDB] = 1;
  #endif
  
+   tabla_residente[BDD_OPERDB] = 1;
+   tabla_residente[BDD_CHANDB] = 1;
+   tabla_residente[BDD_BOTSDB] = 1;
+   tabla_residente[BDD_VIRTUALDB] = 1;
+ 
    for (c = ESNET_BDD; c <= ESNET_BDD_END; c++)
      initdb2(c);
  }
***************
*** 2178,2192 ****
    memset(tabla_version, 0, sizeof(tabla_version));
    memset(tabla_serie, 0, sizeof(tabla_serie));
    /* --------------------------------------------------- */
- 
-   /*
-    * Hago residentes las tablas necesarias para los parches
-    */
-   tabla_residente[DBH_NICKDB] = 1;
-   tabla_residente[DBH_OPERDB] = 1;
-   tabla_residente[DBH_CHANDB] = 1;
-   tabla_residente[DBH_BOTSDB] = 1;
-   tabla_residente[DBH_VIRTUALDB] = 1;
  
    /* --------------------------------------------------- */
    for (i = DBH_PRIMERA_TABLA; i <= DBH_ULTIMA_TABLA; i++)
--- 2184,2189 ----
Index: ../ircu2.10.06/ircd/s_debug.c
===================================================================
RCS file: /cvsroot/ircd/ircd/s_debug.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -c -r1.63 -r1.64
*** ../ircu2.10.06/ircd/s_debug.c	1999/10/21 22:44:42	1.63
--- ../ircu2.10.06/ircd/s_debug.c	1999/10/25 17:21:25	1.64
***************
*** 191,197 ****
      '-',
  #endif
  #endif
!     'D','B','4','0',
  #ifdef DB_ESNET
      '+',
  #else
--- 191,197 ----
      '-',
  #endif
  #endif
!     'D','B','4','1',
  #ifdef DB_ESNET
      '+',
  #else
Index: ../ircu2.10.06/ircd/s_user.c
===================================================================
RCS file: /cvsroot/ircd/ircd/s_user.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** ../ircu2.10.06/ircd/s_user.c	1999/10/21 22:44:42	1.25
--- ../ircu2.10.06/ircd/s_user.c	1999/10/25 17:21:25	1.26
***************
*** 922,934 ****
  
  #ifdef DB_ESNET
      reg = dbh_buscar_registro_local(ESNET_NICKDB, nick);
- #ifdef DB_HISPANO
-     if (reg == NULL)
- #endif /* DB_HISPANO */
  #endif /* DB_ESNET */
- #ifdef DB_HISPANO
-       reg = dbh_buscar_registro_local(DBH_NICKDB, nick);
- #endif /* DB_HISPANO */
    }
  #endif /* DB_ESNET || DB_HISPANO */
  
--- 922,928 ----
***************
*** 1420,1426 ****
        SetHidden(sptr);		/* lo oculto */
        make_virtualhost(sptr);
  #endif
!       if (dbh_buscar_registro_local(DBH_OPERDB, nick))
  	SetHelpOp(sptr);
      }
      else
--- 1414,1420 ----
        SetHidden(sptr);		/* lo oculto */
        make_virtualhost(sptr);
  #endif
!       if (dbh_buscar_registro_local(BDD_OPERDB, nick))
  	SetHelpOp(sptr);
      }
      else
***************
*** 2883,2889 ****
  
      /* el modo +h solo se lopueden poner los OPER y kitar a voluntad */
      if (!(sethmodes & HMODE_HELPOP) && !(IsNickRegistered(sptr)
! 	&& dbh_buscar_registro_local(DBH_OPERDB, sptr->name)))
        ClearHelpOp(sptr);
  
      if (!(sethmodes & HMODE_HIDDEN) && !(IsNickRegistered(sptr)))
--- 2877,2883 ----
  
      /* el modo +h solo se lopueden poner los OPER y kitar a voluntad */
      if (!(sethmodes & HMODE_HELPOP) && !(IsNickRegistered(sptr)
! 	&& dbh_buscar_registro_local(BDD_OPERDB, sptr->name)))
        ClearHelpOp(sptr);
  
      if (!(sethmodes & HMODE_HIDDEN) && !(IsNickRegistered(sptr)))
***************
*** 3423,3429 ****
  
    strcpy(acptr->user->virtualhost, acptr->user->host);
  
!   if ((reg = dbh_buscar_registro_local(DBH_VIRTUALDB, acptr->name)))
    {
      strncpy(acptr->user->virtualhost, reg->valor,
  	sizeof(acptr->user->virtualhost));
--- 3417,3423 ----
  
    strcpy(acptr->user->virtualhost, acptr->user->host);
  
!   if ((reg = dbh_buscar_registro_local(BDD_VIRTUALDB, acptr->name)))
    {
      strncpy(acptr->user->virtualhost, reg->valor,
  	sizeof(acptr->user->virtualhost));
***************
*** 3433,3440 ****
      return;
    }
  
!   if (!(reg = dbh_buscar_registro_local(ESNET_NICKDB, acptr->name)) &&
!       !(reg = dbh_buscar_registro_local(DBH_NICKDB, acptr->name)))
      return;
  
    strncpy(hash, reg->valor, 12);
--- 3427,3433 ----
      return;
    }
  
!   if (!(reg = dbh_buscar_registro_local(ESNET_NICKDB, acptr->name)))
      return;
  
    strncpy(hash, reg->valor, 12);