Skip to content

Commit c1586f6

Browse files
committed
release 2.4.14.4: conditionally define CURLAUTH_NEGOTIATE
Signed-off-by: Hans Zandbelt <hans.zandbelt@openidc.com>
1 parent 23a23f0 commit c1586f6

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/parse.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,18 +1414,22 @@ const char* oidc_parse_x_forwarded_headers(apr_pool_t *pool, const char *arg,
14141414

14151415
#define OIDC_PROXY_AUTH_BASIC "basic"
14161416
#define OIDC_PROXY_AUTH_DIGEST "digest"
1417-
#define OIDC_PROXY_AUTH_NEGOTIATE "negotiate"
14181417
#define OIDC_PROXY_AUTH_NTLM "ntlm"
14191418
#define OIDC_PROXY_AUTH_ANY "any"
1419+
#ifdef CURLAUTH_NEGOTIATE
1420+
#define OIDC_PROXY_AUTH_NEGOTIATE "negotiate"
1421+
#endif
14201422

14211423
const char* oidc_parse_outgoing_proxy_auth_type(apr_pool_t *pool,
14221424
const char *arg, unsigned long *auth_type) {
14231425
static char *options[] = {
14241426
OIDC_PROXY_AUTH_BASIC,
14251427
OIDC_PROXY_AUTH_DIGEST,
1426-
OIDC_PROXY_AUTH_NEGOTIATE,
14271428
OIDC_PROXY_AUTH_NTLM,
14281429
OIDC_PROXY_AUTH_ANY,
1430+
#ifdef CURLAUTH_NEGOTIATE
1431+
OIDC_PROXY_AUTH_NEGOTIATE,
1432+
#endif
14291433
NULL };
14301434
const char *rv = oidc_valid_string_option(pool, arg, options);
14311435
if (rv != NULL)
@@ -1435,12 +1439,14 @@ const char* oidc_parse_outgoing_proxy_auth_type(apr_pool_t *pool,
14351439
*auth_type = CURLAUTH_BASIC;
14361440
} else if (_oidc_strcmp(arg, OIDC_PROXY_AUTH_DIGEST) == 0) {
14371441
*auth_type = CURLAUTH_DIGEST;
1438-
} else if (_oidc_strcmp(arg, OIDC_PROXY_AUTH_NEGOTIATE) == 0) {
1439-
*auth_type = CURLAUTH_NEGOTIATE;
14401442
} else if (_oidc_strcmp(arg, OIDC_PROXY_AUTH_NTLM) == 0) {
14411443
*auth_type = CURLAUTH_NTLM;
14421444
} else if (_oidc_strcmp(arg, OIDC_PROXY_AUTH_ANY) == 0) {
14431445
*auth_type = CURLAUTH_ANY;
1446+
#ifdef CURLAUTH_NEGOTIATE
1447+
} else if (_oidc_strcmp(arg, OIDC_PROXY_AUTH_NEGOTIATE) == 0) {
1448+
*auth_type = CURLAUTH_NEGOTIATE;
1449+
#endif
14441450
}
14451451

14461452
return NULL;

0 commit comments

Comments
 (0)