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 | 062bba07f2faedfce7612c8b4a16072fa200349e (patch) | |
| tree | e79b256a8257c2d74192c7ad5cd22f192a6d0e1c /source/smbd/ssl.c | |
| parent | 8b692d8326a1548a7dbbd2cecee9ece6aa60473a (diff) | |
| download | samba-062bba07f2faedfce7612c8b4a16072fa200349e.tar.gz samba-062bba07f2faedfce7612c8b4a16072fa200349e.tar.xz samba-062bba07f2faedfce7612c8b4a16072fa200349e.zip | |
merge from 2.2
Diffstat (limited to 'source/smbd/ssl.c')
| -rw-r--r-- | source/smbd/ssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/smbd/ssl.c b/source/smbd/ssl.c index c45afc52d53..349ca34f959 100644 --- a/source/smbd/ssl.c +++ b/source/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){ |