summaryrefslogtreecommitdiff
path: root/lib/krb5.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-03-10 10:40:10 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-03-10 10:40:10 +0100
commit4d4ce84bb3eccbf9c249f1a43fa79fb9ba14a29b (patch)
tree4ac7d7d9f69834616496f97298f1806a2e1f33b7 /lib/krb5.c
parent549b1a433ae44b418ff861a06122a1c366eabd3e (diff)
downloadcurl-4d4ce84bb3eccbf9c249f1a43fa79fb9ba14a29b.tar.gz
krb5: improved type handling to avoid clang compiler warnings
Diffstat (limited to 'lib/krb5.c')
-rw-r--r--lib/krb5.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/krb5.c b/lib/krb5.c
index ad7dd67af..65869c99d 100644
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -2,7 +2,7 @@
*
* Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
- * Copyright (c) 2004 - 2015 Daniel Stenberg
+ * Copyright (c) 2004 - 2016 Daniel Stenberg
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -53,9 +53,6 @@
#include "curl_memory.h"
#include "memdebug.h"
-#define LOCAL_ADDR (&conn->local_addr)
-#define REMOTE_ADDR conn->ip_addr->ai_addr
-
static int
krb5_init(void *app_data)
{
@@ -162,19 +159,19 @@ krb5_auth(void *app_data, struct connectdata *conn)
gss_ctx_id_t *context = app_data;
struct gss_channel_bindings_struct chan;
size_t base64_sz = 0;
+ struct sockaddr_in **remote_addr =
+ (struct sockaddr_in **)&conn->ip_addr->ai_addr;
if(getsockname(conn->sock[FIRSTSOCKET],
- (struct sockaddr *)LOCAL_ADDR, &l) < 0)
+ (struct sockaddr *)&conn->local_addr, &l) < 0)
perror("getsockname()");
chan.initiator_addrtype = GSS_C_AF_INET;
chan.initiator_address.length = l - 4;
- chan.initiator_address.value =
- &((struct sockaddr_in *)LOCAL_ADDR)->sin_addr.s_addr;
+ chan.initiator_address.value = &conn->local_addr.sin_addr.s_addr;
chan.acceptor_addrtype = GSS_C_AF_INET;
chan.acceptor_address.length = l - 4;
- chan.acceptor_address.value =
- &((struct sockaddr_in *)REMOTE_ADDR)->sin_addr.s_addr;
+ chan.acceptor_address.value = &(*remote_addr)->sin_addr.s_addr;
chan.application_data.length = 0;
chan.application_data.value = NULL;