mirror of
https://gitlab.com/openconnect/ocserv.git
synced 2024-09-21 10:27:19 +00:00
Merge branch 'repeat' into 'master'
Fix repeated words in comments See merge request openconnect/ocserv!277
This commit is contained in:
commit
78c26b6f21
@ -37,8 +37,8 @@ do { \
|
||||
if (srclen < 2) \
|
||||
return -EINVAL; \
|
||||
/* Explicit comparison with 8 to optimise it into a tautology \
|
||||
* in the the bits == 9 case, because the compiler doesn't \
|
||||
* know that bits_left can never be larger than 8. */ \
|
||||
* in the bits == 9 case, because the compiler doesn't know \
|
||||
* that bits_left can never be larger than 8. */ \
|
||||
if (bits >= 8 || bits >= bits_left) { \
|
||||
/* We need *all* the bits that are left in the current \
|
||||
* byte. Take them and bump the input pointer. */ \
|
||||
|
@ -862,7 +862,7 @@ int load_cert_files(main_server_st *s, struct vhost_cfg_st *vhost)
|
||||
ret = gnutls_privkey_init(&key);
|
||||
GNUTLS_FATAL_ERR(ret);
|
||||
|
||||
/* use use the vhost/config pool rather than main, to allow usage of the credentials
|
||||
/* use the vhost/config pool rather than main, to allow usage of the credentials
|
||||
* after freeing s.
|
||||
*/
|
||||
cdata = talloc_zero(vhost->pool, struct key_cb_data);
|
||||
|
@ -149,7 +149,7 @@ extern int syslog_open;
|
||||
/* Allow few seconds prior to cleaning up entries, to avoid any race
|
||||
* conditions when session control is enabled, as well as to allow
|
||||
* anyconnect clients to reconnect (they often drop the connection and
|
||||
* to to re-establish using the same cookie).
|
||||
* re-establish using the same cookie).
|
||||
*/
|
||||
#define AUTH_SLACK_TIME 15
|
||||
|
||||
|
@ -1244,7 +1244,7 @@ int periodic_check(worker_st * ws, struct timespec *tnow, unsigned dpd)
|
||||
/* we set an alarm at each periodic check to prevent any
|
||||
* freezes in the worker due to an unexpected block (due to worker
|
||||
* bug or kernel bug). In that case the worker will be killed due
|
||||
* the the alarm instead of hanging. */
|
||||
* the alarm instead of hanging. */
|
||||
terminate_reason = REASON_SERVER_DISCONNECT;
|
||||
alarm(1800);
|
||||
|
||||
@ -2852,4 +2852,4 @@ static int worker_event_loop(struct worker_st * ws)
|
||||
exit_worker_reason(ws, terminate_reason);
|
||||
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user