/[svn]/ircd-hybrid/trunk/src/hostmask.c
ViewVC logotype

Diff of /ircd-hybrid/trunk/src/hostmask.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1651 by michael, Sat Nov 10 19:27:13 2012 UTC revision 1652 by michael, Tue Nov 13 20:28:53 2012 UTC
# Line 480  find_conf_by_address(const char *name, s Line 480  find_conf_by_address(const char *name, s
480                arec->masktype == HM_IPV6 &&                arec->masktype == HM_IPV6 &&
481                match_ipv6(addr, &arec->Mask.ipa.addr,                match_ipv6(addr, &arec->Mask.ipa.addr,
482                           arec->Mask.ipa.bits) &&                           arec->Mask.ipa.bits) &&
483                (type & 0x1 || cmpfunc(arec->username, username) == do_match) &&                (type & 0x1 || !cmpfunc(arec->username, username)) &&
484                (IsNeedPassword(arec->conf) || arec->conf->passwd == NULL ||                (IsNeedPassword(arec->conf) || arec->conf->passwd == NULL ||
485                 match_conf_password(password, arec->conf)))                 match_conf_password(password, arec->conf)))
486            {            {
# Line 505  find_conf_by_address(const char *name, s Line 505  find_conf_by_address(const char *name, s
505                arec->masktype == HM_IPV4 &&                arec->masktype == HM_IPV4 &&
506                match_ipv4(addr, &arec->Mask.ipa.addr,                match_ipv4(addr, &arec->Mask.ipa.addr,
507                           arec->Mask.ipa.bits) &&                           arec->Mask.ipa.bits) &&
508                (type & 0x1 || cmpfunc(arec->username, username) == do_match) &&                (type & 0x1 || !cmpfunc(arec->username, username)) &&
509                (IsNeedPassword(arec->conf) || arec->conf->passwd == NULL ||                (IsNeedPassword(arec->conf) || arec->conf->passwd == NULL ||
510                 match_conf_password(password, arec->conf)))                 match_conf_password(password, arec->conf)))
511            {            {
# Line 529  find_conf_by_address(const char *name, s Line 529  find_conf_by_address(const char *name, s
529            if ((arec->type == (type & ~0x1)) &&            if ((arec->type == (type & ~0x1)) &&
530              arec->precedence > hprecv &&              arec->precedence > hprecv &&
531              (arec->masktype == HM_HOST) &&              (arec->masktype == HM_HOST) &&
532              cmpfunc(arec->Mask.hostname, name) == do_match &&              !cmpfunc(arec->Mask.hostname, name) &&
533              (type & 0x1 || cmpfunc(arec->username, username) == do_match) &&              (type & 0x1 || !cmpfunc(arec->username, username)) &&
534              (IsNeedPassword(arec->conf) || arec->conf->passwd == NULL ||              (IsNeedPassword(arec->conf) || arec->conf->passwd == NULL ||
535               match_conf_password(password, arec->conf)))               match_conf_password(password, arec->conf)))
536          {          {
# Line 551  find_conf_by_address(const char *name, s Line 551  find_conf_by_address(const char *name, s
551        if (arec->type == (type & ~0x1) &&        if (arec->type == (type & ~0x1) &&
552            arec->precedence > hprecv &&            arec->precedence > hprecv &&
553            arec->masktype == HM_HOST &&            arec->masktype == HM_HOST &&
554            cmpfunc(arec->Mask.hostname, name) == do_match &&            !cmpfunc(arec->Mask.hostname, name) &&
555            (type & 0x1 || cmpfunc(arec->username, username) == do_match) &&            (type & 0x1 || cmpfunc(arec->username, username)) &&
556            (IsNeedPassword(arec->conf) || arec->conf->passwd == NULL ||            (IsNeedPassword(arec->conf) || arec->conf->passwd == NULL ||
557             match_conf_password(password, arec->conf)))             match_conf_password(password, arec->conf)))
558        {        {

Legend:
Removed from v.1651  
changed lines
  Added in v.1652

svnadmin@ircd-hybrid.org
ViewVC Help
Powered by ViewVC 1.1.28