X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnss-mymachines%2Fnss-mymachines.c;h=eb1d2b450ba076ecfcf5d569525db68a190c32cb;hp=5327499957e0a33cf26dc9202db4931a5e9a4f09;hb=634af5665fda8776d22624d947c8de830e30a874;hpb=d12b8cad40aa78fc948362340204c3fde778082d diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c index 532749995..eb1d2b450 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/nss-mymachines/nss-mymachines.c @@ -80,12 +80,12 @@ enum nss_status _nss_mymachines_gethostbyname4_r( struct gaih_addrtuple *r_tuple, *r_tuple_first = NULL; _cleanup_bus_message_unref_ sd_bus_message* reply = NULL; _cleanup_bus_unref_ sd_bus *bus = NULL; - _cleanup_free_ int *ifindexes = NULL; + _cleanup_free_ int *ifindices = NULL; _cleanup_free_ char *class = NULL; size_t l, ms, idx; unsigned i = 0, c = 0; char *r_name; - int n_ifindexes, r; + int n_ifindices, r; assert(name); assert(pat); @@ -101,9 +101,9 @@ enum nss_status _nss_mymachines_gethostbyname4_r( goto fail; } - n_ifindexes = sd_machine_get_ifindexes(name, &ifindexes); - if (n_ifindexes < 0) { - r = n_ifindexes; + n_ifindices = sd_machine_get_ifindices(name, &ifindices); + if (n_ifindices < 0) { + r = n_ifindices; goto fail; } @@ -182,7 +182,7 @@ enum nss_status _nss_mymachines_gethostbyname4_r( r_tuple->next = i == c-1 ? NULL : (struct gaih_addrtuple*) ((char*) r_tuple + ALIGN(sizeof(struct gaih_addrtuple))); r_tuple->name = r_name; r_tuple->family = family; - r_tuple->scopeid = n_ifindexes == 1 ? ifindexes[0] : 0; + r_tuple->scopeid = n_ifindices == 1 ? ifindices[0] : 0; memcpy(r_tuple->addr, a, sz); idx += ALIGN(sizeof(struct gaih_addrtuple));