diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-21 12:23:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-21 12:23:41 +0200 |
| commit | ff446070be16b18e119873ed56e2c96e28b98514 (patch) | |
| tree | 4639428c29cf604a3955ea487813027141a585db /runtime/nsdsel_gtls.c | |
| parent | 275595cdf8d5e18e665bfd4189f8061441595cce (diff) | |
| parent | 8cb6ec4cee79d41c30d7df38b58ab1f198ac8581 (diff) | |
| download | rsyslog-ff446070be16b18e119873ed56e2c96e28b98514.tar.gz rsyslog-ff446070be16b18e119873ed56e2c96e28b98514.tar.xz rsyslog-ff446070be16b18e119873ed56e2c96e28b98514.zip | |
Merge branch 'ietf-tls'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/nsdsel_gtls.c')
| -rw-r--r-- | runtime/nsdsel_gtls.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/nsdsel_gtls.c b/runtime/nsdsel_gtls.c index daa38929..96456564 100644 --- a/runtime/nsdsel_gtls.c +++ b/runtime/nsdsel_gtls.c @@ -129,8 +129,9 @@ doRetry(nsd_gtls_t *pNsd) case gtlsRtry_handshake: gnuRet = gnutls_handshake(pNsd->sess); if(gnuRet == 0) { + pNsd->rtryCall = gtlsRtry_None; /* we are done */ /* we got a handshake, now check authorization */ - // TODO: do it! + CHKiRet(gtlsChkFingerprint(pNsd)); } break; default: @@ -154,6 +155,8 @@ doRetry(nsd_gtls_t *pNsd) */ finalize_it: + if(iRet != RS_RET_OK) + pNsd->bAbortConn = 1; /* request abort */ RETiRet; } |