moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

krb5: improved type handling to avoid clang compiler warnings

Browse Source
This commit is contained in:
Daniel Stenberg 2016-03-10 10:40:10 +01:00
parent 549b1a433a
commit 4d4ce84bb3
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/krb5.c
View File

@ -2,7 +2,7 @@
* *
* Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* Copyright (c) 2004 - 2015 Daniel Stenberg * Copyright (c) 2004 - 2016 Daniel Stenberg
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -53,9 +53,6 @@
#include "curl_memory.h" #include "curl_memory.h"
#include "memdebug.h" #include "memdebug.h"
#define LOCAL_ADDR (&conn->local_addr)
#define REMOTE_ADDR conn->ip_addr->ai_addr
static int static int
krb5_init(void *app_data) krb5_init(void *app_data)
{ {
@ -162,19 +159,19 @@ krb5_auth(void *app_data, struct connectdata *conn)
gss_ctx_id_t *context = app_data; gss_ctx_id_t *context = app_data;
struct gss_channel_bindings_struct chan; struct gss_channel_bindings_struct chan;
size_t base64_sz = 0; size_t base64_sz = 0;
struct sockaddr_in **remote_addr =
(struct sockaddr_in **)&conn->ip_addr->ai_addr;
if(getsockname(conn->sock[FIRSTSOCKET], if(getsockname(conn->sock[FIRSTSOCKET],
(struct sockaddr *)LOCAL_ADDR, &l) < 0) (struct sockaddr *)&conn->local_addr, &l) < 0)
perror("getsockname()"); perror("getsockname()");
chan.initiator_addrtype = GSS_C_AF_INET; chan.initiator_addrtype = GSS_C_AF_INET;
chan.initiator_address.length = l - 4; chan.initiator_address.length = l - 4;
chan.initiator_address.value = chan.initiator_address.value = &conn->local_addr.sin_addr.s_addr;
&((struct sockaddr_in *)LOCAL_ADDR)->sin_addr.s_addr;
chan.acceptor_addrtype = GSS_C_AF_INET; chan.acceptor_addrtype = GSS_C_AF_INET;
chan.acceptor_address.length = l - 4; chan.acceptor_address.length = l - 4;
chan.acceptor_address.value = chan.acceptor_address.value = &(*remote_addr)->sin_addr.s_addr;
&((struct sockaddr_in *)REMOTE_ADDR)->sin_addr.s_addr;
chan.application_data.length = 0; chan.application_data.length = 0;
chan.application_data.value = NULL; chan.application_data.value = NULL;