From cf167fe3c5890986caea50ef2ddfabf257749058 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 11 Oct 2001 16:44:17 +0000
Subject: merge from 2.2 (This used to be commit
 062bba07f2faedfce7612c8b4a16072fa200349e)

---
 source3/param/loadparm.c | 16 ++++++++--------
 source3/smbd/ssl.c       |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index bf0b941545..63bc16e394 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -210,8 +210,8 @@ typedef struct
 	char **sslHostsResign;
 	char *sslCaCertDir;
 	char *sslCaCertFile;
-	char *sslCert;
-	char *sslPrivKey;
+	char *sslServerCert;
+	char *sslServerPrivKey;
 	char *sslClientCert;
 	char *sslClientPrivKey;
 	char *sslCiphers;
@@ -743,8 +743,8 @@ static struct parm_struct parm_table[] = {
 	{N_("ssl hosts resign"), P_LIST, P_GLOBAL, &Globals.sslHostsResign, NULL, NULL, 0},
 	{N_("ssl CA certDir"), P_STRING, P_GLOBAL, &Globals.sslCaCertDir, NULL, NULL, 0},
 	{N_("ssl CA certFile"), P_STRING, P_GLOBAL, &Globals.sslCaCertFile, NULL, NULL, 0},
-	{N_("ssl server cert"), P_STRING, P_GLOBAL, &Globals.sslCert, NULL, NULL, 0},
-	{N_("ssl server key"), P_STRING, P_GLOBAL, &Globals.sslPrivKey, NULL, NULL, 0},
+	{N_("ssl server cert"), P_STRING, P_GLOBAL, &Globals.sslServerCert, NULL, NULL, 0},
+	{N_("ssl server key"), P_STRING, P_GLOBAL, &Globals.sslServerPrivKey, NULL, NULL, 0},
 	{N_("ssl client cert"), P_STRING, P_GLOBAL, &Globals.sslClientCert, NULL, NULL, 0},
 	{N_("ssl client key"), P_STRING, P_GLOBAL, &Globals.sslClientPrivKey, NULL, NULL, 0},
 	{N_("ssl egd socket"), P_STRING, P_GLOBAL, &Globals.sslEgdSocket, NULL, NULL, 0},
@@ -1312,8 +1312,8 @@ static void init_globals(void)
 	Globals.sslHostsResign = NULL; */
 	string_set(&Globals.sslCaCertDir, "");
 	string_set(&Globals.sslCaCertFile, "");
-	string_set(&Globals.sslCert, "");
-	string_set(&Globals.sslPrivKey, "");
+	string_set(&Globals.sslServerCert, "");
+	string_set(&Globals.sslServerPrivKey, "");
 	string_set(&Globals.sslClientCert, "");
 	string_set(&Globals.sslClientPrivKey, "");
 	string_set(&Globals.sslCiphers, "");
@@ -1523,8 +1523,8 @@ FN_GLOBAL_LIST(lp_ssl_hosts, &Globals.sslHostsRequire)
 FN_GLOBAL_LIST(lp_ssl_hosts_resign, &Globals.sslHostsResign)
 FN_GLOBAL_STRING(lp_ssl_cacertdir, &Globals.sslCaCertDir)
 FN_GLOBAL_STRING(lp_ssl_cacertfile, &Globals.sslCaCertFile)
-FN_GLOBAL_STRING(lp_ssl_cert, &Globals.sslCert)
-FN_GLOBAL_STRING(lp_ssl_privkey, &Globals.sslPrivKey)
+FN_GLOBAL_STRING(lp_ssl_server_cert, &Globals.sslServerCert)
+FN_GLOBAL_STRING(lp_ssl_server_privkey, &Globals.sslServerPrivKey)
 FN_GLOBAL_STRING(lp_ssl_client_cert, &Globals.sslClientCert)
 FN_GLOBAL_STRING(lp_ssl_client_privkey, &Globals.sslClientPrivKey)
 FN_GLOBAL_STRING(lp_ssl_ciphers, &Globals.sslCiphers)
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){
-- 
cgit