diff options
| author | Gerald Carter <jerry@samba.org> | 2001-10-11 16:44:17 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2001-10-11 16:44:17 +0000 |
| commit | cf167fe3c5890986caea50ef2ddfabf257749058 (patch) | |
| tree | a3d9d54e7204a5ab5031a8ff846dc5ec5048fa0d /source3/smbd/ssl.c | |
| parent | 2b09ef2a2d8a94fb146a17a50604f0e0081fe09d (diff) | |
| download | samba-cf167fe3c5890986caea50ef2ddfabf257749058.tar.gz samba-cf167fe3c5890986caea50ef2ddfabf257749058.tar.bz2 samba-cf167fe3c5890986caea50ef2ddfabf257749058.zip | |
merge from 2.2
(This used to be commit 062bba07f2faedfce7612c8b4a16072fa200349e)
Diffstat (limited to 'source3/smbd/ssl.c')
| -rw-r--r-- | source3/smbd/ssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/ssl.c b/source3/smbd/ssl.c index c45afc52d5..349ca34f95 100644 --- a/source3/smbd/ssl.c +++ b/source3/smbd/ssl.c @@ -118,13 +118,13 @@ char *egdsocket, *entropyfile; if(lp_ssl_compatibility()){ SSL_CTX_set_options(sslContext, SSL_OP_ALL); } - certfile = isServer ? lp_ssl_cert() : lp_ssl_client_cert(); + certfile = isServer ? lp_ssl_server_cert() : lp_ssl_client_cert(); if((certfile == NULL || *certfile == 0) && isServer){ fprintf(stderr, "SSL: No cert file specified in config file!\n"); fprintf(stderr, "The server MUST have a certificate!\n"); exit(1); } - keyfile = isServer ? lp_ssl_privkey() : lp_ssl_client_privkey(); + keyfile = isServer ? lp_ssl_server_privkey() : lp_ssl_client_privkey(); if(keyfile == NULL || *keyfile == 0) keyfile = certfile; if(certfile != NULL && *certfile != 0){ |