mirror of
https://github.com/matrix-construct/construct
synced 2024-09-12 11:39:27 +02:00
s_conf: Split out a function.
This commit is contained in:
parent
df3de4e913
commit
b4a7304c94
1 changed files with 33 additions and 20 deletions
53
src/s_conf.c
53
src/s_conf.c
|
@ -86,6 +86,7 @@ FILE *conf_fbfile_in;
|
|||
extern char yytext[];
|
||||
|
||||
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 *);
|
||||
|
||||
void
|
||||
|
@ -317,27 +318,8 @@ static int
|
|||
verify_access(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);
|
||||
}
|
||||
|
||||
aconf = find_address_conf_by_client(client_p, username);
|
||||
if(aconf == NULL)
|
||||
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
|
||||
*
|
||||
|
|
Loading…
Reference in a new issue