mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 18:55:40 +03:00
Move nss typedefs into nss-util.h
In preparation for subsequent changes.
This commit is contained in:
parent
68a9c7c4f0
commit
cf2d43e7f4
@ -154,3 +154,27 @@ enum nss_status _nss_##module##_getgrgid_r( \
|
|||||||
struct group *gr, \
|
struct group *gr, \
|
||||||
char *buffer, size_t buflen, \
|
char *buffer, size_t buflen, \
|
||||||
int *errnop) _public_
|
int *errnop) _public_
|
||||||
|
|
||||||
|
typedef enum nss_status (*_nss_gethostbyname4_r_t)(
|
||||||
|
const char *name,
|
||||||
|
struct gaih_addrtuple **pat,
|
||||||
|
char *buffer, size_t buflen,
|
||||||
|
int *errnop, int *h_errnop,
|
||||||
|
int32_t *ttlp);
|
||||||
|
|
||||||
|
typedef enum nss_status (*_nss_gethostbyname3_r_t)(
|
||||||
|
const char *name,
|
||||||
|
int af,
|
||||||
|
struct hostent *result,
|
||||||
|
char *buffer, size_t buflen,
|
||||||
|
int *errnop, int *h_errnop,
|
||||||
|
int32_t *ttlp,
|
||||||
|
char **canonp);
|
||||||
|
|
||||||
|
typedef enum nss_status (*_nss_gethostbyaddr2_r_t)(
|
||||||
|
const void* addr, socklen_t len,
|
||||||
|
int af,
|
||||||
|
struct hostent *result,
|
||||||
|
char *buffer, size_t buflen,
|
||||||
|
int *errnop, int *h_errnop,
|
||||||
|
int32_t *ttlp);
|
||||||
|
@ -117,13 +117,6 @@ enum nss_status _nss_resolve_gethostbyname4_r(
|
|||||||
int *errnop, int *h_errnop,
|
int *errnop, int *h_errnop,
|
||||||
int32_t *ttlp) {
|
int32_t *ttlp) {
|
||||||
|
|
||||||
enum nss_status (*fallback)(
|
|
||||||
const char *name,
|
|
||||||
struct gaih_addrtuple **pat,
|
|
||||||
char *buffer, size_t buflen,
|
|
||||||
int *errnop, int *h_errnop,
|
|
||||||
int32_t *ttlp);
|
|
||||||
|
|
||||||
_cleanup_(sd_bus_message_unrefp) sd_bus_message *req = NULL, *reply = NULL;
|
_cleanup_(sd_bus_message_unrefp) sd_bus_message *req = NULL, *reply = NULL;
|
||||||
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||||
struct gaih_addrtuple *r_tuple, *r_tuple_first = NULL;
|
struct gaih_addrtuple *r_tuple, *r_tuple_first = NULL;
|
||||||
@ -275,15 +268,15 @@ enum nss_status _nss_resolve_gethostbyname4_r(
|
|||||||
return NSS_STATUS_SUCCESS;
|
return NSS_STATUS_SUCCESS;
|
||||||
|
|
||||||
fallback:
|
fallback:
|
||||||
fallback = (enum nss_status (*)(const char *name,
|
{
|
||||||
struct gaih_addrtuple **pat,
|
_nss_gethostbyname4_r_t fallback;
|
||||||
char *buffer, size_t buflen,
|
|
||||||
int *errnop, int *h_errnop,
|
|
||||||
int32_t *ttlp))
|
|
||||||
find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyname4_r");
|
|
||||||
|
|
||||||
if (fallback)
|
fallback = (_nss_gethostbyname4_r_t)
|
||||||
return fallback(name, pat, buffer, buflen, errnop, h_errnop, ttlp);
|
find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyname4_r");
|
||||||
|
|
||||||
|
if (fallback)
|
||||||
|
return fallback(name, pat, buffer, buflen, errnop, h_errnop, ttlp);
|
||||||
|
}
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
*errnop = -r;
|
*errnop = -r;
|
||||||
@ -300,15 +293,6 @@ enum nss_status _nss_resolve_gethostbyname3_r(
|
|||||||
int32_t *ttlp,
|
int32_t *ttlp,
|
||||||
char **canonp) {
|
char **canonp) {
|
||||||
|
|
||||||
enum nss_status (*fallback)(
|
|
||||||
const char *name,
|
|
||||||
int af,
|
|
||||||
struct hostent *result,
|
|
||||||
char *buffer, size_t buflen,
|
|
||||||
int *errnop, int *h_errnop,
|
|
||||||
int32_t *ttlp,
|
|
||||||
char **canonp);
|
|
||||||
|
|
||||||
_cleanup_(sd_bus_message_unrefp) sd_bus_message *req = NULL, *reply = NULL;
|
_cleanup_(sd_bus_message_unrefp) sd_bus_message *req = NULL, *reply = NULL;
|
||||||
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||||
char *r_name, *r_aliases, *r_addr, *r_addr_list;
|
char *r_name, *r_aliases, *r_addr, *r_addr_list;
|
||||||
@ -480,16 +464,14 @@ enum nss_status _nss_resolve_gethostbyname3_r(
|
|||||||
return NSS_STATUS_SUCCESS;
|
return NSS_STATUS_SUCCESS;
|
||||||
|
|
||||||
fallback:
|
fallback:
|
||||||
fallback = (enum nss_status (*)(const char *name,
|
{
|
||||||
int af,
|
_nss_gethostbyname3_r_t fallback;
|
||||||
struct hostent *result,
|
|
||||||
char *buffer, size_t buflen,
|
fallback = (_nss_gethostbyname3_r_t)
|
||||||
int *errnop, int *h_errnop,
|
find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyname3_r");
|
||||||
int32_t *ttlp,
|
if (fallback)
|
||||||
char **canonp))
|
return fallback(name, af, result, buffer, buflen, errnop, h_errnop, ttlp, canonp);
|
||||||
find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyname3_r");
|
}
|
||||||
if (fallback)
|
|
||||||
return fallback(name, af, result, buffer, buflen, errnop, h_errnop, ttlp, canonp);
|
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
*errnop = -r;
|
*errnop = -r;
|
||||||
@ -505,15 +487,6 @@ enum nss_status _nss_resolve_gethostbyaddr2_r(
|
|||||||
int *errnop, int *h_errnop,
|
int *errnop, int *h_errnop,
|
||||||
int32_t *ttlp) {
|
int32_t *ttlp) {
|
||||||
|
|
||||||
enum nss_status (*fallback)(
|
|
||||||
const void* addr, socklen_t len,
|
|
||||||
int af,
|
|
||||||
struct hostent *result,
|
|
||||||
char *buffer, size_t buflen,
|
|
||||||
int *errnop, int *h_errnop,
|
|
||||||
int32_t *ttlp);
|
|
||||||
|
|
||||||
|
|
||||||
_cleanup_(sd_bus_message_unrefp) sd_bus_message *req = NULL, *reply = NULL;
|
_cleanup_(sd_bus_message_unrefp) sd_bus_message *req = NULL, *reply = NULL;
|
||||||
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||||
char *r_name, *r_aliases, *r_addr, *r_addr_list;
|
char *r_name, *r_aliases, *r_addr, *r_addr_list;
|
||||||
@ -682,17 +655,15 @@ enum nss_status _nss_resolve_gethostbyaddr2_r(
|
|||||||
return NSS_STATUS_SUCCESS;
|
return NSS_STATUS_SUCCESS;
|
||||||
|
|
||||||
fallback:
|
fallback:
|
||||||
fallback = (enum nss_status (*)(
|
{
|
||||||
const void* addr, socklen_t len,
|
_nss_gethostbyaddr2_r_t fallback;
|
||||||
int af,
|
|
||||||
struct hostent *result,
|
|
||||||
char *buffer, size_t buflen,
|
|
||||||
int *errnop, int *h_errnop,
|
|
||||||
int32_t *ttlp))
|
|
||||||
find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyaddr2_r");
|
|
||||||
|
|
||||||
if (fallback)
|
fallback = (_nss_gethostbyaddr2_r_t)
|
||||||
return fallback(addr, len, af, result, buffer, buflen, errnop, h_errnop, ttlp);
|
find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyaddr2_r");
|
||||||
|
|
||||||
|
if (fallback)
|
||||||
|
return fallback(addr, len, af, result, buffer, buflen, errnop, h_errnop, ttlp);
|
||||||
|
}
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
*errnop = -r;
|
*errnop = -r;
|
||||||
|
Loading…
Reference in New Issue
Block a user