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-proxyd: explicitly address messages to unique and well-known name
[elogind.git]
/
src
/
nss-myhostname
/
nss-myhostname.c
diff --git
a/src/nss-myhostname/nss-myhostname.c
b/src/nss-myhostname/nss-myhostname.c
index f5dadb60aae34a79543e6aec33a7a711a5239f36..86e7be2aa132d4ca9e9ecc8590d41e63022e6a23 100644
(file)
--- a/
src/nss-myhostname/nss-myhostname.c
+++ b/
src/nss-myhostname/nss-myhostname.c
@@
-35,11
+35,6
@@
#include "nss-util.h"
#include "util.h"
#include "nss-util.h"
#include "util.h"
-/* Ensure that glibc's assert is used. We cannot use assert from macro.h, as
- * libnss_myhostname will be linked into arbitrary programs which will, in turn
- * attempt to write to the journal via log_dispatch() */
-#include <assert.h>
-
/* We use 127.0.0.2 as IPv4 address. This has the advantage over
* 127.0.0.1 that it can be translated back to the local hostname. For
* IPv6 we use ::1 which unfortunately will not translate back to the
/* We use 127.0.0.2 as IPv4 address. This has the advantage over
* 127.0.0.1 that it can be translated back to the local hostname. For
* IPv6 we use ::1 which unfortunately will not translate back to the
@@
-97,7
+92,7
@@
enum nss_status _nss_myhostname_gethostbyname4_r(
return NSS_STATUS_NOTFOUND;
}
return NSS_STATUS_NOTFOUND;
}
- n_addresses = local_addresses(&addresses);
+ n_addresses = local_addresses(
NULL, 0,
&addresses);
if (n_addresses < 0)
n_addresses = 0;
if (n_addresses < 0)
n_addresses = 0;
@@
-170,6
+165,11
@@
enum nss_status _nss_myhostname_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;
}
return NSS_STATUS_SUCCESS;
}
@@
-195,7
+195,7
@@
static enum nss_status fill_in_hostent(
assert(errnop);
assert(h_errnop);
assert(errnop);
assert(h_errnop);
- alen =
PROTO
_ADDRESS_SIZE(af);
+ alen =
FAMILY
_ADDRESS_SIZE(af);
for (a = addresses, n = 0, c = 0; n < n_addresses; a++, n++)
if (af == a->family)
for (a = addresses, n = 0, c = 0; n < n_addresses; a++, n++)
if (af == a->family)
@@
-294,6
+294,11
@@
static enum nss_status fill_in_hostent(
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;
}
return NSS_STATUS_SUCCESS;
}
@@
-344,7
+349,7
@@
enum nss_status _nss_myhostname_gethostbyname3_r(
return NSS_STATUS_NOTFOUND;
}
return NSS_STATUS_NOTFOUND;
}
- n_addresses = local_addresses(&addresses);
+ n_addresses = local_addresses(
NULL, 0,
&addresses);
if (n_addresses < 0)
n_addresses = 0;
if (n_addresses < 0)
n_addresses = 0;
@@
-393,7
+398,7
@@
enum nss_status _nss_myhostname_gethostbyaddr2_r(
return NSS_STATUS_UNAVAIL;
}
return NSS_STATUS_UNAVAIL;
}
- if (len !=
PROTO
_ADDRESS_SIZE(af)) {
+ if (len !=
FAMILY
_ADDRESS_SIZE(af)) {
*errnop = EINVAL;
*h_errnop = NO_RECOVERY;
return NSS_STATUS_UNAVAIL;
*errnop = EINVAL;
*h_errnop = NO_RECOVERY;
return NSS_STATUS_UNAVAIL;
@@
-420,7
+425,7
@@
enum nss_status _nss_myhostname_gethostbyaddr2_r(
}
}
- n_addresses = local_addresses(&addresses);
+ n_addresses = local_addresses(
NULL, 0,
&addresses);
if (n_addresses < 0)
n_addresses = 0;
if (n_addresses < 0)
n_addresses = 0;
@@
-428,7
+433,7
@@
enum nss_status _nss_myhostname_gethostbyaddr2_r(
if (af != a->family)
continue;
if (af != a->family)
continue;
- if (memcmp(addr, &a->address,
PROTO
_ADDRESS_SIZE(af)) == 0)
+ if (memcmp(addr, &a->address,
FAMILY
_ADDRESS_SIZE(af)) == 0)
goto found;
}
goto found;
}