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

authd: misc fixes

Browse source
This commit is contained in:
Elizabeth Myers 2016-03-28 16:46:52 -05:00
parent c6ebd4fdad
commit 1345a41dda
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
authd/provider.c
View file

@ -274,6 +274,9 @@ start_auth(const char *cid, const char *l_ip, const char *l_port, const char *c_
#endif #endif
((struct sockaddr_in *)&auth->c_addr)->sin_port = htons(auth->c_port); ((struct sockaddr_in *)&auth->c_addr)->sin_port = htons(auth->c_port);
rb_strlcpy(auth->hostname, "*", sizeof(auth->hostname));
rb_strlcpy(auth->username, "*", sizeof(auth->username));
memset(auth->data, 0, sizeof(auth->data)); memset(auth->data, 0, sizeof(auth->data));
auth->providers_starting = true; auth->providers_starting = true;

14
authd/providers/ident.c
View file

@ -46,6 +46,7 @@ static const char *messages[] =
"*** Got Ident response", "*** Got Ident response",
"*** No Ident response", "*** No Ident response",
"*** Cannot verify ident validity, ignoring ident", "*** Cannot verify ident validity, ignoring ident",
"*** Ident disabled, not checking ident",
}; };
typedef enum typedef enum
@ -54,6 +55,7 @@ typedef enum
REPORT_FOUND, REPORT_FOUND,
REPORT_FAIL, REPORT_FAIL,
REPORT_INVALID, REPORT_INVALID,
REPORT_DISABLED,
} ident_message; } ident_message;
static EVH timeout_ident_queries_event; static EVH timeout_ident_queries_event;
@ -321,11 +323,17 @@ static bool ident_start(struct auth_client *auth)
struct rb_sockaddr_storage l_addr, c_addr; struct rb_sockaddr_storage l_addr, c_addr;
int family = GET_SS_FAMILY(&auth->c_addr); int family = GET_SS_FAMILY(&auth->c_addr);
if(!ident_enable || auth->data[PROVIDER_IDENT] != NULL) if(auth->data[PROVIDER_IDENT] != NULL)
{ {
set_provider_done(auth, PROVIDER_IDENT); /* for blacklists */ set_provider_done(auth, PROVIDER_IDENT); /* for blacklists */
return true; return true;
} }
else if(!ident_enable)
{
notice_client(auth->cid, messages[REPORT_DISABLED]);
set_provider_done(auth, PROVIDER_IDENT);
return true;
}
notice_client(auth->cid, messages[REPORT_LOOKUP]); notice_client(auth->cid, messages[REPORT_LOOKUP]);
@ -394,9 +402,7 @@ add_conf_ident_timeout(const char *key __unused, int parc __unused, const char *
static void static void
set_ident_enabled(const char *key __unused, int parc __unused, const char **parv) set_ident_enabled(const char *key __unused, int parc __unused, const char **parv)
{ {
ident_enable = (strcasecmp(parv[0], "true") == 0 || ident_enable = (*parv[0] == '1');
strcasecmp(parv[0], "1") == 0 ||
strcasecmp(parv[0], "enable") == 0);
} }
struct auth_opts_handler ident_options[] = struct auth_opts_handler ident_options[] =