From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 28 Mar 2019 06:33:24 +0000 (+0800)
Subject: Less fragile well of enumerating curl auth methods
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17629d832020a14bdaf8f081df402cb468f8496d;p=thirdparty%2Ffreeradius-server.git

Less fragile well of enumerating curl auth methods
---

diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index 3f4476ab125..b41768ae30a 100644
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -108,17 +108,17 @@ do {\
 } while (0)
 
 const unsigned long http_curl_auth[HTTP_AUTH_NUM_ENTRIES] = {
-	0,			// HTTP_AUTH_UNKNOWN
-	0,			// HTTP_AUTH_NONE
-	CURLOPT_TLSAUTH_SRP,	// HTTP_AUTH_TLS_SRP
-	CURLAUTH_BASIC,		// HTTP_AUTH_BASIC
-	CURLAUTH_DIGEST,	// HTTP_AUTH_DIGEST
-	CURLAUTH_DIGEST_IE,	// HTTP_AUTH_DIGEST_IE
-	CURLAUTH_GSSNEGOTIATE,	// HTTP_AUTH_GSSNEGOTIATE
-	CURLAUTH_NTLM,		// HTTP_AUTH_NTLM
-	CURLAUTH_NTLM_WB,	// HTTP_AUTH_NTLM_WB
-	CURLAUTH_ANY,		// HTTP_AUTH_ANY
-	CURLAUTH_ANYSAFE	// HTTP_AUTH_ANY_SAFE
+	[HTTP_AUTH_UNKNOWN]		= 0,
+	[HTTP_AUTH_NONE]		= 0,
+	[HTTP_AUTH_TLS_SRP]		= CURLOPT_TLSAUTH_SRP,
+	[HTTP_AUTH_BASIC]		= CURLAUTH_BASIC,
+	[HTTP_AUTH_DIGEST]		= CURLAUTH_DIGEST,
+	[HTTP_AUTH_DIGEST_IE]		= CURLAUTH_DIGEST_IE,
+	[HTTP_AUTH_GSSNEGOTIATE]	= CURLAUTH_GSSNEGOTIATE,
+	[HTTP_AUTH_NTLM]		= CURLAUTH_NTLM,
+	[HTTP_AUTH_NTLM_WB]		= CURLAUTH_NTLM_WB,
+	[HTTP_AUTH_ANY]			= CURLAUTH_ANY,
+	[HTTP_AUTH_ANY_SAFE]		= CURLAUTH_ANYSAFE
 };