From 4e5af565458826d4bae0086aaa7edf9cb8560f50 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Thu, 27 Jul 2000 05:22:14 +0000 Subject: [PATCH] use sa_size instead of sa_len, some systems define this to emulate anonymous unions git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8847 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kadmin/kadm_conn.c | 4 ++-- kadmin/kadmind.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kadmin/kadm_conn.c b/kadmin/kadm_conn.c index 71581840e..4dabf051d 100644 --- a/kadmin/kadm_conn.c +++ b/kadmin/kadm_conn.c @@ -124,13 +124,13 @@ spawn_child(krb5_context context, int *socks, int num_socks, int this_sock) { int e, i; struct sockaddr sa; - size_t sa_len; + size_t sa_size; int s; pid_t pid; krb5_address addr; char buf[128]; size_t buf_len; - s = accept(socks[this_sock], &sa, &sa_len); + s = accept(socks[this_sock], &sa, &sa_size); if(s < 0) { krb5_warn(context, errno, "accept"); return 1; diff --git a/kadmin/kadmind.c b/kadmin/kadmind.c index 74aea1078..04a9ae9da 100644 --- a/kadmin/kadmind.c +++ b/kadmin/kadmind.c @@ -135,10 +135,10 @@ main(int argc, char **argv) { int fd = 0; struct sockaddr sa; - size_t sa_len; + size_t sa_size; krb5_auth_context ac = NULL; int debug_port; - sa_len = sizeof(sa); + sa_size = sizeof(sa); if(debug_flag) { if(port_str == NULL) debug_port = krb5_getportbyname (context, "kerberos-adm", @@ -146,7 +146,7 @@ main(int argc, char **argv) else debug_port = htons(atoi(port_str)); mini_inetd(debug_port); - } else if(getsockname(STDIN_FILENO, &sa, &sa_len) < 0 && + } else if(getsockname(STDIN_FILENO, &sa, &sa_size) < 0 && errno == ENOTSOCK) { parse_ports(context, port_str ? port_str : "+"); start_server(context);