GitHub-Mirror/NeoStats-opsb
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use match, not fnmatch

Browse source
This commit is contained in:
Fish 2004-07-07 12:45:32 +00:00
parent b964097d98
commit 04db3c46cc
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
opsb.c
View file

@ -22,7 +22,6 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <fnmatch.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -530,13 +529,13 @@ int checkcache(scaninfo *scandata) {
exempts = lnode_get(node); exempts = lnode_get(node);
if ((exempts->server == 1) && (scandata->server)) { if ((exempts->server == 1) && (scandata->server)) {
/* match a server */ /* match a server */
if (fnmatch(exempts->host, scandata->server, 0) == 0) { if (match(exempts->host, scandata->server)) {
nlog(LOG_DEBUG1, LOG_MOD, "OPSB: User %s exempt. Matched server entry %s in Exemptions", scandata->who, exempts->host); nlog(LOG_DEBUG1, LOG_MOD, "OPSB: User %s exempt. Matched server entry %s in Exemptions", scandata->who, exempts->host);
if (scandata->u) prefmsg(scandata->u->nick, s_opsb,"%s Matches a Server Exception %s", scandata->who, exempts->host); if (scandata->u) prefmsg(scandata->u->nick, s_opsb,"%s Matches a Server Exception %s", scandata->who, exempts->host);
return 1; return 1;
} }
} else { } else {
if (fnmatch(exempts->host, scandata->lookup, 0) == 0) { if (match(exempts->host, scandata->lookup)) {
nlog(LOG_DEBUG1, LOG_MOD, "OPSB: User %s exempt. Matched host entry %s in exemptions", scandata->who, exempts->host); nlog(LOG_DEBUG1, LOG_MOD, "OPSB: User %s exempt. Matched host entry %s in exemptions", scandata->who, exempts->host);
if (scandata->u) prefmsg(scandata->u->nick, s_opsb, "%s Matches a Host Exception %s", scandata->who, exempts->host); if (scandata->u) prefmsg(scandata->u->nick, s_opsb, "%s Matches a Host Exception %s", scandata->who, exempts->host);
return 2; return 2;
@ -608,7 +607,7 @@ static int ScanNick(char **av, int ac) {
exempts = lnode_get(node); exempts = lnode_get(node);
if (exempts->server == 1) { if (exempts->server == 1) {
/* match a server */ /* match a server */
if (fnmatch(exempts->host, u->server->name, 0) == 0) { if (match(exempts->host, u->server->name)) {
nlog(LOG_DEBUG1, LOG_MOD, "OPSB: User %s exempt. Matched server entry %s in Exemptions", u->nick, exempts->host); nlog(LOG_DEBUG1, LOG_MOD, "OPSB: User %s exempt. Matched server entry %s in Exemptions", u->nick, exempts->host);
return -1; return -1;
} }