Skip to content

Commit b05608b

Browse files
committed
session_server: reverted some changes due to PR review
1 parent 907e46a commit b05608b

1 file changed

Lines changed: 0 additions & 8 deletions

File tree

src/session_server.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -854,11 +854,9 @@ nc_server_init(void)
854854
goto error;
855855
}
856856

857-
#ifdef HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP
858857
if (attr_p) {
859858
pthread_rwlockattr_destroy(attr_p);
860859
}
861-
#endif
862860

863861
#ifdef NC_ENABLED_SSH_TLS
864862
if (curl_global_init(CURL_GLOBAL_SSL | CURL_GLOBAL_ACK_EINTR)) {
@@ -900,11 +898,9 @@ nc_server_init(void)
900898
return 0;
901899

902900
error:
903-
#ifdef HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP
904901
if (attr_p) {
905902
pthread_rwlockattr_destroy(attr_p);
906903
}
907-
#endif
908904
return -1;
909905
}
910906

@@ -2775,9 +2771,6 @@ nc_connect_ch_endpt(struct nc_ch_endpt *endpt, nc_server_ch_session_acquire_ctx_
27752771
sock = nc_sock_connect(endpt->src_addr, endpt->src_port, endpt->dst_addr, endpt->dst_port,
27762772
NC_CH_CONNECT_TIMEOUT, &endpt->ka, &endpt->sock_pending, &ip_host);
27772773
if (sock < 0) {
2778-
if (ip_host) {
2779-
free(ip_host);
2780-
}
27812774
return NC_MSG_ERROR;
27822775
}
27832776

@@ -3997,7 +3990,6 @@ nc_server_notif_cert_exp_thread(void *arg)
39973990

39983991
/* config changed, reload the certificates and intervals */
39993992
nc_server_notif_cert_exp_dates_destroy(exp_dates, exp_date_count);
4000-
exp_dates = NULL;
40013993

40023994
nc_server_notif_cert_exp_intervals_get(default_intervals, 3, &intervals, &interval_count);
40033995

0 commit comments

Comments
 (0)