From 62d0b2a09ac9b688e0e22844aa615ff9d81aa105 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Thu, 26 Jul 2001 09:05:30 +0000 Subject: [PATCH] (krb5_sock_to_principal): rename sa_len -> salen to avoid the macro that's defined on irix. noted by "Jacques A. Vidrine" git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10396 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/sock_principal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/krb5/sock_principal.c b/lib/krb5/sock_principal.c index cf0e69e12..064783901 100644 --- a/lib/krb5/sock_principal.c +++ b/lib/krb5/sock_principal.c @@ -45,15 +45,15 @@ krb5_sock_to_principal (krb5_context context, krb5_error_code ret; struct sockaddr_storage __ss; struct sockaddr *sa = (struct sockaddr *)&__ss; - socklen_t sa_len = sizeof(__ss); + socklen_t salen = sizeof(__ss); char hostname[NI_MAXHOST]; - if (getsockname (sock, sa, &sa_len) < 0) { + if (getsockname (sock, sa, &salen) < 0) { ret = errno; krb5_set_error_string (context, "getsockname: %s", strerror(ret)); return ret; } - ret = getnameinfo (sa, sa_len, hostname, sizeof(hostname), NULL, 0, 0); + ret = getnameinfo (sa, salen, hostname, sizeof(hostname), NULL, 0, 0); if (ret) { int save_errno = errno;