curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-30 07:56:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace inet_ntoa and inet_ntoa_r with Curl_inet_ntop

Browse Source
This commit is contained in:
Yang Tse 2008-09-23 19:16:56 +00:00
parent 2a09ffc648
commit c9ad952604
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/krb4.c
View File

@ -62,12 +62,9 @@
#include "ftp.h" #include "ftp.h"
#include "sendf.h" #include "sendf.h"
#include "krb4.h" #include "krb4.h"
#include "inet_ntop.h"
#include "memory.h" #include "memory.h"
#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)
#include "inet_ntoa_r.h"
#endif
/* The last #include file should be: */ /* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"
@ -242,13 +239,9 @@ krb4_auth(void *app_data, struct connectdata *conn)
krb_realmofhost(host)); krb_realmofhost(host));
else { else {
if(natAddr.s_addr != localaddr->sin_addr.s_addr) { if(natAddr.s_addr != localaddr->sin_addr.s_addr) {
#ifdef HAVE_INET_NTOA_R char addr_buf[128];
char ntoa_buf[64]; if(Curl_inet_ntop(AF_INET, natAddr, addr_buf, sizeof(addr_buf)))
char *ip = (char *)inet_ntoa_r(natAddr, ntoa_buf, sizeof(ntoa_buf)); infof(data, "Using NAT IP address (%s) for kerberos 4\n", addr_buf);
#else
char *ip = (char *)inet_ntoa(natAddr);
#endif
infof(data, "Using NAT IP address (%s) for kerberos 4\n", ip);
localaddr->sin_addr = natAddr; localaddr->sin_addr = natAddr;
} }
} }