diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-02 11:56:54 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-02 11:56:54 +0200 |
| commit | aeef9bbe727d80c5882cc0a883b8dfd5df461f10 (patch) | |
| tree | 292836490a6c886b7c0054a55bc41e5b0f937404 /runtime/glbl.c | |
| parent | ba35cbbfe3002e200e4561d93c234805d9a8d760 (diff) | |
| download | rsyslog-aeef9bbe727d80c5882cc0a883b8dfd5df461f10.tar.gz rsyslog-aeef9bbe727d80c5882cc0a883b8dfd5df461f10.tar.bz2 rsyslog-aeef9bbe727d80c5882cc0a883b8dfd5df461f10.zip | |
bugfix: machine certificate was required for client even in TLS anon mode
Reference: http://bugzilla.adiscon.com/show_bug.cgi?id=85
The fix also slightly improves performance by not storing certificates in
client sessions when there is no need to do so.
Diffstat (limited to 'runtime/glbl.c')
| -rw-r--r-- | runtime/glbl.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/runtime/glbl.c b/runtime/glbl.c index deb32471..11a664f8 100644 --- a/runtime/glbl.c +++ b/runtime/glbl.c @@ -42,15 +42,6 @@ #ifndef DFLT_NETSTRM_DRVR # define DFLT_NETSTRM_DRVR ((uchar*)"ptcp") #endif -#ifndef DFLT_NETSTRM_DRVR_CAF -# define DFLT_NETSTRM_DRVR_CAF ((uchar*)"ca.pem") -#endif -#ifndef DFLT_NETSTRM_DRVR_KEYFILE -# define DFLT_NETSTRM_DRVR_KEYFILE ((uchar*)"key.pem") -#endif -#ifndef DFLT_NETSTRM_DRVR_CERTFILE -# define DFLT_NETSTRM_DRVR_CERTFILE ((uchar*)"cert.pem") -#endif /* static data */ DEFobjStaticHelpers @@ -141,7 +132,7 @@ GetDfltNetstrmDrvr(void) static uchar* GetDfltNetstrmDrvrCAF(void) { - return(pszDfltNetstrmDrvrCAF == NULL ? DFLT_NETSTRM_DRVR_CAF : pszDfltNetstrmDrvrCAF); + return(pszDfltNetstrmDrvrCAF); } @@ -149,7 +140,7 @@ GetDfltNetstrmDrvrCAF(void) static uchar* GetDfltNetstrmDrvrKeyFile(void) { - return(pszDfltNetstrmDrvrKeyFile == NULL ? DFLT_NETSTRM_DRVR_KEYFILE : pszDfltNetstrmDrvrKeyFile); + return(pszDfltNetstrmDrvrKeyFile); } @@ -157,7 +148,7 @@ GetDfltNetstrmDrvrKeyFile(void) static uchar* GetDfltNetstrmDrvrCertFile(void) { - return(pszDfltNetstrmDrvrCertFile == NULL ? DFLT_NETSTRM_DRVR_CERTFILE : pszDfltNetstrmDrvrCertFile); + return(pszDfltNetstrmDrvrCertFile); } |