Index: ../ircu2.10.06/.cvsignore
===================================================================
RCS file: /cvsroot/ircd/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** ../ircu2.10.06/.cvsignore	1999/10/08 10:07:17	1.2
--- ../ircu2.10.06/.cvsignore	1999/10/27 11:47:45	1.3
***************
*** 1,2 ****
--- 1,3 ----
  makefile
  Makefile
+ patch.*
Index: ../ircu2.10.06/include/s_bdd.h
===================================================================
RCS file: /cvsroot/ircd/include/s_bdd.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** ../ircu2.10.06/include/s_bdd.h	1999/10/26 22:37:41	1.5
--- ../ircu2.10.06/include/s_bdd.h	1999/10/27 12:02:38	1.6
***************
*** 59,67 ****
    char *destino;
    char *clave;
    char *valor;
-   char local;
    char borrado;
-   char compactado;
    struct dbh_reg *next, *prev;
  };
  #endif /* DB_ESNET || DB_HISPANO */
--- 59,65 ----
***************
*** 81,87 ****
  extern unsigned long tabla_serie[DBH_MAX_TABLA];
  
  extern void tea(unsigned long v[], unsigned long k[], unsigned long x[]);
! extern struct dbh_reg *dbh_buscar_registro_local(char tabla, char *clave);
  int dbh_es_miembro(char tabla, char *clave, char *subcadena);
  #endif
  
--- 79,85 ----
  extern unsigned long tabla_serie[DBH_MAX_TABLA];
  
  extern void tea(unsigned long v[], unsigned long k[], unsigned long x[]);
! extern struct dbh_reg *dbh_buscar_registro(char tabla, char *clave);
  int dbh_es_miembro(char tabla, char *clave, char *subcadena);
  #endif
  
Index: ../ircu2.10.06/ircd/IPcheck.c
===================================================================
RCS file: /cvsroot/ircd/ircd/IPcheck.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** ../ircu2.10.06/ircd/IPcheck.c	1999/10/21 22:44:42	1.6
--- ../ircu2.10.06/ircd/IPcheck.c	1999/10/27 12:02:38	1.7
***************
*** 485,491 ****
  {
    struct dbh_reg *reg;
  
!   reg = dbh_buscar_registro_local(ESNET_CLONESDB, host);
    if (reg == NULL)
      return -1;
    return atoi(reg->valor);
--- 485,491 ----
  {
    struct dbh_reg *reg;
  
!   reg = dbh_buscar_registro(ESNET_CLONESDB, host);
    if (reg == NULL)
      return -1;
    return atoi(reg->valor);
Index: ../ircu2.10.06/ircd/channel.c
===================================================================
RCS file: /cvsroot/ircd/ircd/channel.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** ../ircu2.10.06/ircd/channel.c	1999/10/25 17:21:25	1.19
--- ../ircu2.10.06/ircd/channel.c	1999/10/27 12:02:38	1.20
***************
*** 863,869 ****
  
    badop = 0;
  
!   r = dbh_buscar_registro_local(BDD_BOTSDB, parv[1]);
    if (r && r->valor)
      botname = r->valor;
    else
--- 863,869 ----
  
    badop = 0;
  
!   r = dbh_buscar_registro(BDD_BOTSDB, parv[1]);
    if (r && r->valor)
      botname = r->valor;
    else
***************
*** 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
--- 1415,1421 ----
  	{
  	  struct dbh_reg *reg;
  
! 	  reg = dbh_buscar_registro(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(BDD_OPERDB, sptr->name))
  	  {
  	    if (!is_chan_op(sptr, chptr))
  	      jcea_xmode_esnet = !0;
--- 1427,1433 ----
  	      reg &&
  #endif
  	      IsNickRegistered(sptr) &&
! 	      dbh_buscar_registro(BDD_OPERDB, sptr->name))
  	  {
  	    if (!is_chan_op(sptr, chptr))
  	      jcea_xmode_esnet = !0;
***************
*** 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
--- 2207,2213 ----
    {
      struct dbh_reg *reg;
  
!     reg = dbh_buscar_registro(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(BDD_OPERDB, sptr->name)
  	&& (!compall("OPER", key)))
        return 0;
  #endif
--- 2220,2226 ----
  	reg &&
  #endif
  	IsNickRegistered(sptr) &&
! 	dbh_buscar_registro(BDD_OPERDB, sptr->name)
  	&& (!compall("OPER", 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(BDD_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(BDD_CHANDB, name))
  	chptr->mode.mode |= MODE_REGCHAN;
        /* Aki debo implantar los modos por defecto sacados de la DBH */
  #endif
***************
*** 2767,2773 ****
  	  struct dbh_reg *r;
  	  char *botname;
  
! 	  if ((r = dbh_buscar_registro_local(BDD_BOTSDB, DBH_CHANSERV)) != NULL)
  	    botname = r->valor;
  	  else
  	    botname = me.name;
--- 2767,2773 ----
  	  struct dbh_reg *r;
  	  char *botname;
  
! 	  if ((r = dbh_buscar_registro(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.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** ../ircu2.10.06/ircd/s_bdd.c	1999/10/27 11:46:00	1.9
--- ../ircu2.10.06/ircd/s_bdd.c	1999/10/27 12:02:38	1.10
***************
*** 270,283 ****
    reg->destino = d;
    reg->next = reg->prev = NULL;
    reg->borrado = 0;
-   reg->compactado = 0;
  
-   /* marco como local si es para mi o broadcast */
-   if (*d == '*' || ((acptr = find_match_server(d)) && (IsMe(acptr))))
-     reg->local = 1;
-   else
-     reg->local = 0;
- 
    /* busco hash */
    hashi = dbh_hash_registro(reg->clave);
  
--- 270,276 ----
***************
*** 302,308 ****
   * busca un registro local en memoria ...
   *                                      1999/06/23 savage@apostols.org
   */
! struct dbh_reg *dbh_buscar_registro_local(char tabla, char *clave)
  {
    struct dbh_reg *reg;
    int hashi, i = 0;
--- 295,301 ----
   * busca un registro local en memoria ...
   *                                      1999/06/23 savage@apostols.org
   */
! struct dbh_reg *dbh_buscar_registro(char tabla, char *clave)
  {
    struct dbh_reg *reg;
    int hashi, i = 0;
***************
*** 330,338 ****
      if (!strcmp(reg->clave, c))
      {
        RunFree(c);
!       if (reg->local)
! 	return reg;
!       return NULL;
      }
    RunFree(c);
    return NULL;
--- 323,329 ----
      if (!strcmp(reg->clave, c))
      {
        RunFree(c);
!       return reg;
      }
    RunFree(c);
    return NULL;
***************
*** 351,357 ****
    char *buff, *f, *s = NULL;
    struct dbh_reg *reg;
  
!   if ((reg = dbh_buscar_registro_local(tabla, clave)) == NULL)
      return 0;
  
    buff = RunMalloc(strlen(reg->valor) + 1);
--- 342,348 ----
    char *buff, *f, *s = NULL;
    struct dbh_reg *reg;
  
!   if ((reg = dbh_buscar_registro(tabla, clave)) == NULL)
      return 0;
  
    buff = RunMalloc(strlen(reg->valor) + 1);
***************
*** 713,719 ****
      if (valor < p)
      {				/* Nuevo registro, no un borrado */
        *(valor - 1) = '\0';
!       reg = dbh_buscar_registro_local(que_bdd, clave);
        *(valor - 1) = ' ';
        if (reg != NULL)
        {				/* El registro sigue existiendo */
--- 704,710 ----
      if (valor < p)
      {				/* Nuevo registro, no un borrado */
        *(valor - 1) = '\0';
!       reg = dbh_buscar_registro(que_bdd, clave);
        *(valor - 1) = ' ';
        if (reg != NULL)
        {				/* El registro sigue existiendo */
***************
*** 1399,1405 ****
      return 0;
    }
  
!   reg = dbh_buscar_registro_local(tabla, clave);
    if (!reg)
    {
      if (MyUser(sptr) || Protocol(cptr) < 10)
--- 1390,1396 ----
      return 0;
    }
  
!   reg = dbh_buscar_registro(tabla, clave);
    if (!reg)
    {
      if (MyUser(sptr) || Protocol(cptr) < 10)
Index: ../ircu2.10.06/ircd/s_debug.c
===================================================================
RCS file: /cvsroot/ircd/ircd/s_debug.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -c -r1.70 -r1.71
*** ../ircu2.10.06/ircd/s_debug.c	1999/10/27 11:46:00	1.70
--- ../ircu2.10.06/ircd/s_debug.c	1999/10/27 12:02:38	1.71
***************
*** 191,197 ****
      '-',
  #endif
  #endif
!     'D','B','4','6',
  #ifdef DB_ESNET
      '+',
  #else
--- 191,197 ----
      '-',
  #endif
  #endif
!     'D','B','4','7',
  #ifdef DB_ESNET
      '+',
  #else
Index: ../ircu2.10.06/ircd/s_user.c
===================================================================
RCS file: /cvsroot/ircd/ircd/s_user.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** ../ircu2.10.06/ircd/s_user.c	1999/10/26 20:00:18	1.28
--- ../ircu2.10.06/ircd/s_user.c	1999/10/27 12:02:38	1.29
***************
*** 921,928 ****
      }
  
  #ifdef DB_ESNET
!     reg = dbh_buscar_registro_local(ESNET_NICKDB, nick);
!     regt = dbh_buscar_registro_local(BDD_MIGRACION, nick);
  #endif /* DB_ESNET */
    }
  #endif /* DB_ESNET */
--- 921,928 ----
      }
  
  #ifdef DB_ESNET
!     reg = dbh_buscar_registro(ESNET_NICKDB, nick);
!     regt = dbh_buscar_registro(BDD_MIGRACION, nick);
  #endif /* DB_ESNET */
    }
  #endif /* DB_ESNET */
***************
*** 1435,1441 ****
        SetHidden(sptr);		/* lo oculto */
        make_virtualhost(sptr);
  #endif
!       if (dbh_buscar_registro_local(BDD_OPERDB, nick))
  	SetHelpOp(sptr);
      }
      else
--- 1435,1441 ----
        SetHidden(sptr);		/* lo oculto */
        make_virtualhost(sptr);
  #endif
!       if (dbh_buscar_registro(BDD_OPERDB, nick))
  	SetHelpOp(sptr);
      }
      else
***************
*** 2898,2904 ****
  
      /* 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)))
--- 2898,2904 ----
  
      /* el modo +h solo se lopueden poner los OPER y kitar a voluntad */
      if (!(sethmodes & HMODE_HELPOP) && !(IsNickRegistered(sptr)
! 	&& dbh_buscar_registro(BDD_OPERDB, sptr->name)))
        ClearHelpOp(sptr);
  
      if (!(sethmodes & HMODE_HIDDEN) && !(IsNickRegistered(sptr)))
***************
*** 3438,3444 ****
  
    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));
--- 3438,3444 ----
  
    strcpy(acptr->user->virtualhost, acptr->user->host);
  
!   if ((reg = dbh_buscar_registro(BDD_VIRTUALDB, acptr->name)))
    {
      strncpy(acptr->user->virtualhost, reg->valor,
  	sizeof(acptr->user->virtualhost));
***************
*** 3448,3455 ****
      return;
    }
  
!   if (!(reg = dbh_buscar_registro_local(ESNET_NICKDB, acptr->name)) &&
!       !(reg = dbh_buscar_registro_local(BDD_MIGRACION, acptr->name)))
      return;
  
    strncpy(hash, reg->valor, 12);
--- 3448,3455 ----
      return;
    }
  
!   if (!(reg = dbh_buscar_registro(ESNET_NICKDB, acptr->name)) &&
!       !(reg = dbh_buscar_registro(BDD_MIGRACION, acptr->name)))
      return;
  
    strncpy(hash, reg->valor, 12);