From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 20 May 2011 07:38:48 +0000 (+0200)
Subject: Added deprecated flag to old config variables
X-Git-Tag: release_3_0_0_beta0~818
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07bb68770e88e4385e84d009e6d46a5e1137cc8c;p=thirdparty%2Ffreeradius-server.git

Added deprecated flag to old config variables
---

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 450279bdc12..8b08f6aa28c 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -249,22 +249,22 @@ static const CONF_PARSER module_config[] = {
 	 *	TLS configuration  The first few are here for backwards
 	 *	compatibility.  The last is the new subsection.
 	 */
-	{"tls_mode", PW_TYPE_BOOLEAN,
+	{"tls_mode", PW_TYPE_BOOLEAN | PW_TYPE_DEPRECATED,
 	 offsetof(ldap_instance,tls_mode), NULL, "no"},
 
-	{"start_tls", PW_TYPE_BOOLEAN,
+	{"start_tls", PW_TYPE_BOOLEAN | PW_TYPE_DEPRECATED,
 	 offsetof(ldap_instance,start_tls), NULL, "no"},
-	{"tls_cacertfile", PW_TYPE_FILENAME,
+	{"tls_cacertfile", PW_TYPE_FILENAME | PW_TYPE_DEPRECATED,
 	 offsetof(ldap_instance,tls_cacertfile), NULL, NULL},
-	{"tls_cacertdir", PW_TYPE_FILENAME,
+	{"tls_cacertdir", PW_TYPE_FILENAME | PW_TYPE_DEPRECATED,
 	 offsetof(ldap_instance,tls_cacertdir), NULL, NULL},
-	{"tls_certfile", PW_TYPE_FILENAME,
+	{"tls_certfile", PW_TYPE_FILENAME | PW_TYPE_DEPRECATED,
 	 offsetof(ldap_instance,tls_certfile), NULL, NULL},
-	{"tls_keyfile", PW_TYPE_FILENAME,
+	{"tls_keyfile", PW_TYPE_FILENAME | PW_TYPE_DEPRECATED,
 	 offsetof(ldap_instance,tls_keyfile), NULL, NULL},
-	{"tls_randfile", PW_TYPE_STRING_PTR, /* OK if it changes on HUP */
+	{"tls_randfile", PW_TYPE_STRING_PTR | PW_TYPE_DEPRECATED, /* OK if it changes on HUP */
 	 offsetof(ldap_instance,tls_randfile), NULL, NULL},
-	{"tls_require_cert", PW_TYPE_STRING_PTR,
+	{"tls_require_cert", PW_TYPE_STRING_PTR | PW_TYPE_DEPRECATED,
 	 offsetof(ldap_instance,tls_require_cert), NULL, TLS_DEFAULT_VERIFY},
 	{ "tls", PW_TYPE_SUBSECTION, 0, NULL, (const void *) tls_config },