svn commit: samba r7012 - in branches/SAMBA_4_0/source/param: .

[tridge at samba.org]

Author: tridge
Date: 2005-05-27 11:55:30 +0000 (Fri, 27 May 2005)
New Revision: 7012

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7012

Log:
added smb.conf parameters 
  web tls keyfile  
  web tls certfile
  web tls cafile
  web tls crlfile

Modified:
   branches/SAMBA_4_0/source/param/loadparm.c


Changeset:
Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c	2005-05-27 11:54:29 UTC (rev 7011)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2005-05-27 11:55:30 UTC (rev 7012)
@@ -179,6 +179,10 @@
 	char *szIDMapBackend;
 	char *szGuestaccount;
 	char *swat_directory;
+	char *web_keyfile;
+	char *web_certfile;
+	char *web_cafile;
+	char *web_crlfile;
 	int max_mux;
 	int max_xmit;
 	int pwordlevel;
@@ -591,6 +595,10 @@
 	{"dgram port", P_INTEGER, P_GLOBAL, &Globals.dgram_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"cldap port", P_INTEGER, P_GLOBAL, &Globals.cldap_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"web port", P_INTEGER, P_GLOBAL, &Globals.web_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+	{"web tls keyfile", P_STRING, P_GLOBAL, &Globals.web_keyfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+	{"web tls certfile", P_STRING, P_GLOBAL, &Globals.web_certfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+	{"web tls cafile", P_STRING, P_GLOBAL, &Globals.web_cafile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+	{"web tls crlfile", P_STRING, P_GLOBAL, &Globals.web_crlfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"swat directory", P_STRING, P_GLOBAL, &Globals.swat_directory, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"large readwrite", P_BOOL, P_GLOBAL, &Globals.bLargeReadwrite, NULL, NULL, FLAG_DEVELOPER},
 	{"max protocol", P_ENUM, P_GLOBAL, &Globals.maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
@@ -1035,6 +1043,10 @@
 
 	do_parameter("max wins ttl", "432000");
 	do_parameter("min wins ttl", "10");
+
+	do_parameter_var("web tls keyfile", "%s/tls/key.pem", dyn_PRIVATE_DIR);
+	do_parameter_var("web tls certfile", "%s/tls/cert.pem", dyn_PRIVATE_DIR);
+	do_parameter_var("web tls cafile", "%s/tls/ca.pem", dyn_PRIVATE_DIR);
 }
 
 static TALLOC_CTX *lp_talloc;
@@ -1136,6 +1148,10 @@
 FN_GLOBAL_INTEGER(lp_web_port, &Globals.web_port)
 FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset)
 FN_GLOBAL_STRING(lp_swat_directory, &Globals.swat_directory)
+FN_GLOBAL_STRING(lp_web_keyfile, &Globals.web_keyfile)
+FN_GLOBAL_STRING(lp_web_certfile, &Globals.web_certfile)
+FN_GLOBAL_STRING(lp_web_cafile, &Globals.web_cafile)
+FN_GLOBAL_STRING(lp_web_crlfile, &Globals.web_crlfile)
 FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset)
 FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset)
 FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile)