mirror of
https://repo.or.cz/socat.git
synced 2024-12-22 07:22:34 +00:00
Print CRL warning only once
This commit is contained in:
parent
c4f569e367
commit
47b98aed7a
5 changed files with 16 additions and 5 deletions
3
CHANGES
3
CHANGES
|
@ -48,6 +48,9 @@ Corrections:
|
|||
|
||||
Reworked domain name resolution, centralized IPv4/IPv6 sorting.
|
||||
|
||||
Print warning about not checking CRLs in OpenSSL only in the first
|
||||
child process.
|
||||
|
||||
Features:
|
||||
Total inactivity timeout option -T 0 now means 0.0 seconds; up to
|
||||
version 1.8.0.0 it meant no total inactivity timeout.
|
||||
|
|
|
@ -1456,7 +1456,10 @@ cont_out:
|
|||
sycSSL_CTX_set_verify(ctx,
|
||||
SSL_VERIFY_PEER| SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
|
||||
NULL);
|
||||
Warn("OpenSSL: Warning: this implementation does not check CRLs");
|
||||
if (first_child) {
|
||||
/* The first forked off process, print the warning only once */
|
||||
Warn("OpenSSL: Warning: this implementation does not check CRLs");
|
||||
}
|
||||
} else {
|
||||
sycSSL_CTX_set_verify(ctx,
|
||||
SSL_VERIFY_NONE,
|
||||
|
|
1
xio.h
1
xio.h
|
@ -471,6 +471,7 @@ extern const char *PIPESEP;
|
|||
extern xiofile_t *sock[XIO_MAXSOCK];
|
||||
|
||||
extern int num_child;
|
||||
extern bool first_child;
|
||||
|
||||
/* return values of xioopensingle */
|
||||
#define STAT_OK 0
|
||||
|
|
|
@ -15,7 +15,8 @@ static int xioinitialized;
|
|||
xiofile_t *sock[XIO_MAXSOCK];
|
||||
int (*xiohook_newchild)(void); /* xio calls this function from a new child
|
||||
process */
|
||||
int num_child = 0;
|
||||
int num_child = 0; /* actual number of "general" child processes */
|
||||
bool first_child = true; /* only first child shall print general warnings */
|
||||
|
||||
/* returns 0 on success or != if an error occurred */
|
||||
int xioinitialize(void) {
|
||||
|
@ -255,9 +256,12 @@ pid_t xio_fork(bool subchild,
|
|||
return 0;
|
||||
}
|
||||
|
||||
num_child++;
|
||||
Info1("number of children increased to %d", num_child);
|
||||
/* parent process */
|
||||
if (!subchild) {
|
||||
++num_child;
|
||||
first_child = false;
|
||||
}
|
||||
Info1("number of children increased to %d", num_child);
|
||||
Notice1("forked off child process "F_pid, pid);
|
||||
/* gdb recommends to have env controlled sleep after fork */
|
||||
if (forkwaitstring = getenv("SOCAT_FORK_WAIT")) {
|
||||
|
|
|
@ -113,7 +113,7 @@ void childdied(int signum) {
|
|||
}
|
||||
/*! indent */
|
||||
if (num_child) {
|
||||
num_child--;
|
||||
--num_child;
|
||||
Info1("number of children decreased to %d", num_child);
|
||||
}
|
||||
/* check if it was a registered child process */
|
||||
|
|
Loading…
Reference in a new issue