9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s_conf: Split out a function.

Browse source
This commit is contained in:
Jilles Tjoelker 2015-05-22 21:42:36 +02:00
parent df3de4e913
commit b4a7304c94
1 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/s_conf.c
View file

@ -86,6 +86,7 @@ FILE *conf_fbfile_in;
extern char yytext[]; extern char yytext[];
static int verify_access(struct Client *client_p, const char *username); static int verify_access(struct Client *client_p, const char *username);
static struct ConfItem *find_address_conf_by_client(struct Client *client_p, const char *username);
static int attach_iline(struct Client *, struct ConfItem *); static int attach_iline(struct Client *, struct ConfItem *);
void void
@ -317,27 +318,8 @@ static int
verify_access(struct Client *client_p, const char *username) verify_access(struct Client *client_p, const char *username)
{ {
struct ConfItem *aconf; struct ConfItem *aconf;
char non_ident[USERLEN + 1];
if(IsGotId(client_p))
{
aconf = find_address_conf(client_p->host, client_p->sockhost,
client_p->username, client_p->username,
(struct sockaddr *) &client_p->localClient->ip,
client_p->localClient->ip.ss_family,
client_p->localClient->auth_user);
}
else
{
rb_strlcpy(non_ident, "~", sizeof(non_ident));
rb_strlcat(non_ident, username, sizeof(non_ident));
aconf = find_address_conf(client_p->host, client_p->sockhost,
non_ident, client_p->username,
(struct sockaddr *) &client_p->localClient->ip,
client_p->localClient->ip.ss_family,
client_p->localClient->auth_user);
}
aconf = find_address_conf_by_client(client_p, username);
if(aconf == NULL) if(aconf == NULL)
return NOT_AUTHORISED; return NOT_AUTHORISED;
@ -399,6 +381,37 @@ verify_access(struct Client *client_p, const char *username)
} }
/*
* find_address_conf_by_client
*/
static struct ConfItem *
find_address_conf_by_client(struct Client *client_p, const char *username)
{
struct ConfItem *aconf;
char non_ident[USERLEN + 1];
if(IsGotId(client_p))
{
aconf = find_address_conf(client_p->host, client_p->sockhost,
client_p->username, client_p->username,
(struct sockaddr *) &client_p->localClient->ip,
client_p->localClient->ip.ss_family,
client_p->localClient->auth_user);
}
else
{
rb_strlcpy(non_ident, "~", sizeof(non_ident));
rb_strlcat(non_ident, username, sizeof(non_ident));
aconf = find_address_conf(client_p->host, client_p->sockhost,
non_ident, client_p->username,
(struct sockaddr *) &client_p->localClient->ip,
client_p->localClient->ip.ss_family,
client_p->localClient->auth_user);
}
return aconf;
}
/* /*
* add_ip_limit * add_ip_limit
* *