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

authd: remove unused variable id from accept_client

Browse source
This commit is contained in:
Simon Arlott 2016-05-01 11:44:04 +01:00
parent 075d4d569e
commit 2f598dacdd
No known key found for this signature in database
GPG key ID: C8975F2043CA5D24
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
authd/provider.c
View file

@ -220,7 +220,7 @@ provider_done(struct auth_client *auth, uint32_t id)
if(auth->providers_active == 0 && !auth->providers_starting) if(auth->providers_active == 0 && !auth->providers_starting)
{ {
/* All done */ /* All done */
accept_client(auth, UINT32_MAX); accept_client(auth);
return; return;
} }
@ -261,16 +261,11 @@ reject_client(struct auth_client *auth, uint32_t id, const char *data, const cha
cancel_providers(auth); cancel_providers(auth);
} }
/* Accept a client and cancel outstanding providers if any /* Accept a client and cancel outstanding providers if any */
* WARNING: do not use auth instance after calling! */
void void
accept_client(struct auth_client *auth, uint32_t id) accept_client(struct auth_client *auth)
{ {
rb_helper_write(authd_helper, "A %x %s %s", auth->cid, auth->username, auth->hostname); rb_helper_write(authd_helper, "A %x %s %s", auth->cid, auth->username, auth->hostname);
if(id != UINT32_MAX)
set_provider_done(auth, id);
cancel_providers(auth); cancel_providers(auth);
} }
@ -333,7 +328,7 @@ start_auth(const char *cid, const char *l_ip, const char *l_port, const char *c_
/* If no providers are running, accept the client */ /* If no providers are running, accept the client */
if(auth->providers_active == 0) if(auth->providers_active == 0)
accept_client(auth, UINT32_MAX); accept_client(auth);
done: done:
auth_client_unref(auth); auth_client_unref(auth);

2
authd/provider.h
View file

@ -117,7 +117,7 @@ void destroy_providers(void);
void cancel_providers(struct auth_client *auth); void cancel_providers(struct auth_client *auth);
void provider_done(struct auth_client *auth, uint32_t id); void provider_done(struct auth_client *auth, uint32_t id);
void accept_client(struct auth_client *auth, uint32_t id); void accept_client(struct auth_client *auth);
void reject_client(struct auth_client *auth, uint32_t id, const char *data, const char *fmt, ...); void reject_client(struct auth_client *auth, uint32_t id, const char *data, const char *fmt, ...);
void handle_new_connection(int parc, char *parv[]); void handle_new_connection(int parc, char *parv[]);