chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nss: always explicitly reset all error variables
[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 eb1d2b450ba076ecfcf5d569525db68a190c32cb..cc185b0c3df96f5d585b35d0466ea6c7135bbdd5 100644
(file)
--- a/
src/nss-mymachines/nss-mymachines.c
+++ b/
src/nss-mymachines/nss-mymachines.c
@@
-32,7
+32,7
@@
NSS_GETHOSTBYNAME_PROTOTYPES(mymachines);
NSS_GETHOSTBYNAME_PROTOTYPES(mymachines);
-static int count_addresses(sd_bus_message *m,
unsigned
af, unsigned *ret) {
+static int count_addresses(sd_bus_message *m,
int
af, unsigned *ret) {
unsigned c = 0;
int r;
unsigned c = 0;
int r;
@@
-40,9
+40,9
@@
static int count_addresses(sd_bus_message *m, unsigned af, unsigned *ret) {
assert(ret);
while ((r = sd_bus_message_enter_container(m, 'r', "yay")) > 0) {
assert(ret);
while ((r = sd_bus_message_enter_container(m, 'r', "yay")) > 0) {
-
unsigned char
family;
+
int
family;
- r = sd_bus_message_read(m, "
y
", &family);
+ r = sd_bus_message_read(m, "
i
", &family);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-122,7
+122,7
@@
enum nss_status _nss_mymachines_gethostbyname4_r(
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = sd_bus_message_enter_container(reply, 'a', "(
y
ay)");
+ r = sd_bus_message_enter_container(reply, 'a', "(
i
ay)");
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-151,12
+151,12
@@
enum nss_status _nss_mymachines_gethostbyname4_r(
/* Second, append addresses */
r_tuple_first = (struct gaih_addrtuple*) (buffer + idx);
/* Second, append addresses */
r_tuple_first = (struct gaih_addrtuple*) (buffer + idx);
- while ((r = sd_bus_message_enter_container(reply, 'r', "
y
ay")) > 0) {
-
unsigned char
family;
+ while ((r = sd_bus_message_enter_container(reply, 'r', "
i
ay")) > 0) {
+
int
family;
const void *a;
size_t sz;
const void *a;
size_t sz;
- r = sd_bus_message_read(reply, "
y
", &family);
+ r = sd_bus_message_read(reply, "
i
", &family);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-173,7
+173,7
@@
enum nss_status _nss_mymachines_gethostbyname4_r(
goto fail;
}
goto fail;
}
- if (sz !=
PROTO
_ADDRESS_SIZE(family)) {
+ if (sz !=
FAMILY
_ADDRESS_SIZE(family)) {
r = -EINVAL;
goto fail;
}
r = -EINVAL;
goto fail;
}
@@
-205,6
+205,11
@@
enum nss_status _nss_mymachines_gethostbyname4_r(
if (ttlp)
*ttlp = 0;
if (ttlp)
*ttlp = 0;
+ /* Explicitly reset all error variables */
+ *errnop = 0;
+ *h_errnop = NETDB_SUCCESS;
+ h_errno = 0;
+
return NSS_STATUS_SUCCESS;
fail:
return NSS_STATUS_SUCCESS;
fail:
@@
-267,7
+272,7
@@
enum nss_status _nss_mymachines_gethostbyname3_r(
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = sd_bus_message_enter_container(reply, 'a', "(
y
ay)");
+ r = sd_bus_message_enter_container(reply, 'a', "(
i
ay)");
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-281,7
+286,7
@@
enum nss_status _nss_mymachines_gethostbyname3_r(
return NSS_STATUS_NOTFOUND;
}
return NSS_STATUS_NOTFOUND;
}
- alen =
PROTO
_ADDRESS_SIZE(af);
+ alen =
FAMILY
_ADDRESS_SIZE(af);
l = strlen(name);
ms = ALIGN(l+1) +
l = strlen(name);
ms = ALIGN(l+1) +
@@
-307,12
+312,12
@@
enum nss_status _nss_mymachines_gethostbyname3_r(
/* Third, append addresses */
r_addr = buffer + idx;
/* Third, append addresses */
r_addr = buffer + idx;
- while ((r = sd_bus_message_enter_container(reply, 'r', "
y
ay")) > 0) {
-
unsigned char
family;
+ while ((r = sd_bus_message_enter_container(reply, 'r', "
i
ay")) > 0) {
+
int
family;
const void *a;
size_t sz;
const void *a;
size_t sz;
- r = sd_bus_message_read(reply, "
y
", &family);
+ r = sd_bus_message_read(reply, "
i
", &family);
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-365,6
+370,11
@@
enum nss_status _nss_mymachines_gethostbyname3_r(
if (canonp)
*canonp = r_name;
if (canonp)
*canonp = r_name;
+ /* Explicitly reset all error variables */
+ *errnop = 0;
+ *h_errnop = NETDB_SUCCESS;
+ h_errno = 0;
+
return NSS_STATUS_SUCCESS;
fail:
return NSS_STATUS_SUCCESS;
fail: