chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus-policy: append items rather than prepending them
[elogind.git]
/
src
/
nss-mymachines
/
nss-mymachines.c
diff --git
a/src/nss-mymachines/nss-mymachines.c
b/src/nss-mymachines/nss-mymachines.c
index cc185b0c3df96f5d585b35d0466ea6c7135bbdd5..9476ad1694f2be8d52a6613e46692786c5541b6b 100644
(file)
--- a/
src/nss-mymachines/nss-mymachines.c
+++ b/
src/nss-mymachines/nss-mymachines.c
@@
-39,7
+39,7
@@
static int count_addresses(sd_bus_message *m, int af, unsigned *ret) {
assert(m);
assert(ret);
assert(m);
assert(ret);
- while ((r = sd_bus_message_enter_container(m, 'r', "
y
ay")) > 0) {
+ while ((r = sd_bus_message_enter_container(m, 'r', "
i
ay")) > 0) {
int family;
r = sd_bus_message_read(m, "i", &family);
int family;
r = sd_bus_message_read(m, "i", &family);
@@
-79,7
+79,7
@@
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;
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_bus_
close_
unref_ sd_bus *bus = NULL;
_cleanup_free_ int *ifindices = NULL;
_cleanup_free_ char *class = NULL;
size_t l, ms, idx;
_cleanup_free_ int *ifindices = NULL;
_cleanup_free_ char *class = NULL;
size_t l, ms, idx;
@@
-228,7
+228,7
@@
enum nss_status _nss_mymachines_gethostbyname3_r(
char **canonp) {
_cleanup_bus_message_unref_ sd_bus_message* reply = NULL;
char **canonp) {
_cleanup_bus_message_unref_ sd_bus_message* reply = NULL;
- _cleanup_bus_unref_ sd_bus *bus = NULL;
+ _cleanup_bus_
close_
unref_ sd_bus *bus = NULL;
_cleanup_free_ char *class = NULL;
unsigned c = 0, i = 0;
char *r_name, *r_aliases, *r_addr, *r_addr_list;
_cleanup_free_ char *class = NULL;
unsigned c = 0, i = 0;
char *r_name, *r_aliases, *r_addr, *r_addr_list;
@@
-289,10
+289,7
@@
enum nss_status _nss_mymachines_gethostbyname3_r(
alen = FAMILY_ADDRESS_SIZE(af);
l = strlen(name);
alen = FAMILY_ADDRESS_SIZE(af);
l = strlen(name);
- ms = ALIGN(l+1) +
- sizeof(char*) +
- (c > 0 ? c : 1) * ALIGN(alen) +
- (c > 0 ? c+1 : 2) * sizeof(char*);
+ ms = ALIGN(l+1) + c * ALIGN(alen) + (c+2) * sizeof(char*);
if (buflen < ms) {
*errnop = ENOMEM;
if (buflen < ms) {
*errnop = ENOMEM;