[9/7] nss_nis: Use NSS_DECLARE_MODULE_FUNCTIONS
Commit Message
* Andreas Schwab:
> On Feb 13 2020, Florian Weimer wrote:
>
>> * Andreas Schwab:
>>
>>> On Feb 13 2020, Florian Weimer wrote:
>>>
>>>> diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c
>>>> index 2d08076382..1ee5444cfc 100644
>>>> --- a/nis/nss_nis/nis-hosts.c
>>>> +++ b/nis/nss_nis/nis-hosts.c
>>>> @@ -90,9 +90,16 @@ static bool_t new_start = 1;
>>>> static char *oldkey = NULL;
>>>> static int oldkeylen = 0;
>>>>
>>>> +hidden_proto (_nss_nis_endhostent)
>>>
>>> The hidden_proto should be in the header.
>>
>> Which header? nss_nis.h?
>
> netdb.h, after the prototype.
Do you mean like this?
Changing DECLARE_NSS_PROTOTYPES would require updating all NSS modules
to use hidden_def because with a hidden_proto, the function definition
would only define the internal alias, and the exported function would be
gone.
Thanks,
Florian
8<------------------------------------------------------------------8<
This commit removes the minor optimization based on strong aliases
because it loses type safety.
-----
include/netdb.h | 7 ++++++-
nis/nss-nis.h | 1 +
nis/nss_nis/nis-hosts.c | 17 +++++++----------
nis/nss_nis/nis-network.c | 17 ++++++++---------
nis/nss_nis/nis-spwd.c | 16 ++++++++--------
5 files changed, 30 insertions(+), 28 deletions(-)
Comments
On Feb 25 2020, Florian Weimer wrote:
> @@ -288,6 +289,10 @@ DECLARE_NSS_PROTOTYPES (hesiod)
> DECLARE_NSS_PROTOTYPES (nis)
> DECLARE_NSS_PROTOTYPES (nisplus)
>
> +hidden_proto (_nss_nis_endhostent)
> +hidden_proto (_nss_nis_endnetent)
> +hidden_proto (_nss_nis_endspent)
> +
The hidden_proto should only exist if IS_IN(libnss_nis).
Andreas.
@@ -279,7 +279,8 @@ extern enum nss_status _nss_ ## service ## _getnetbyname_r \
extern enum nss_status _nss_ ## service ## _getnetbyaddr_r \
(uint32_t addr, int type, struct netent *net, \
char *buffer, size_t buflen, int *errnop, \
- int *herrnop);
+ int *herrnop); \
+extern enum nss_status _nss_ ## service ## _endspent (void);
DECLARE_NSS_PROTOTYPES (compat)
DECLARE_NSS_PROTOTYPES (dns)
@@ -288,6 +289,10 @@ DECLARE_NSS_PROTOTYPES (hesiod)
DECLARE_NSS_PROTOTYPES (nis)
DECLARE_NSS_PROTOTYPES (nisplus)
+hidden_proto (_nss_nis_endhostent)
+hidden_proto (_nss_nis_endnetent)
+hidden_proto (_nss_nis_endspent)
+
#undef DECLARE_NSS_PROTOTYPES
#endif
@@ -22,6 +22,7 @@
#include "nsswitch.h"
+NSS_DECLARE_MODULE_FUNCTIONS (nis)
/* Convert YP error number to NSS error number. */
extern const enum nss_status __yperr2nss_tab[] attribute_hidden;
@@ -19,11 +19,7 @@
#include <assert.h>
#include <nss.h>
#include <ctype.h>
-/* The following is an ugly trick to avoid a prototype declaration for
- _nss_nis_endgrent. */
-#define _nss_nis_endhostent _nss_nis_endhostent_XXX
#include <netdb.h>
-#undef _nss_nis_endhostent
#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -90,9 +86,14 @@ static bool_t new_start = 1;
static char *oldkey = NULL;
static int oldkeylen = 0;
-
enum nss_status
_nss_nis_sethostent (int stayopen)
+{
+ return _nss_nis_endhostent ();
+}
+
+enum nss_status
+_nss_nis_endhostent (void)
{
__libc_lock_lock (lock);
@@ -108,11 +109,7 @@ _nss_nis_sethostent (int stayopen)
return NSS_STATUS_SUCCESS;
}
-/* Make _nss_nis_endhostent an alias of _nss_nis_sethostent. We do this
- even though the prototypes don't match. The argument of sethostent
- is used so this makes no difference. */
-strong_alias (_nss_nis_sethostent, _nss_nis_endhostent)
-
+hidden_def (_nss_nis_endhostent)
/* The calling function always need to get a lock first. */
static enum nss_status
@@ -17,11 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <nss.h>
-/* The following is an ugly trick to avoid a prototype declaration for
- _nss_nis_endgrent. */
-#define _nss_nis_endnetent _nss_nis_endnetent_XXX
#include <netdb.h>
-#undef _nss_nis_endnetent
#include <ctype.h>
#include <errno.h>
#include <stdint.h>
@@ -48,7 +44,13 @@ static int oldkeylen;
enum nss_status
_nss_nis_setnetent (int stayopen)
{
- __libc_lock_lock (lock);
+ return _nss_nis_endnetent ();
+}
+
+enum nss_status
+_nss_nis_endnetent (void)
+{
+__libc_lock_lock (lock);
new_start = 1;
if (oldkey != NULL)
@@ -62,10 +64,7 @@ _nss_nis_setnetent (int stayopen)
return NSS_STATUS_SUCCESS;
}
-/* Make _nss_nis_endnetent an alias of _nss_nis_setnetent. We do this
- even though the prototypes don't match. The argument of setnetent
- is not used so this makes no difference. */
-strong_alias (_nss_nis_setnetent, _nss_nis_endnetent)
+hidden_def (_nss_nis_endnetent)
static enum nss_status
internal_nis_getnetent_r (struct netent *net, char *buffer, size_t buflen,
@@ -20,14 +20,11 @@
#include <ctype.h>
#include <errno.h>
#include <string.h>
-/* The following is an ugly trick to avoid a prototype declaration for
- _nss_nis_endspent. */
-#define _nss_nis_endspent _nss_nis_endspent_XXX
#include <shadow.h>
-#undef _nss_nis_endspent
#include <libc-lock.h>
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
+#include <netdb.h>
#include "nss-nis.h"
#include <libnsl.h>
@@ -48,6 +45,12 @@ static int oldkeylen;
enum nss_status
_nss_nis_setspent (int stayopen)
+{
+ return _nss_nis_endspent ();
+}
+
+enum nss_status
+_nss_nis_endspent (void)
{
__libc_lock_lock (lock);
@@ -61,10 +64,7 @@ _nss_nis_setspent (int stayopen)
return NSS_STATUS_SUCCESS;
}
-/* Make _nss_nis_endspent an alias of _nss_nis_setspent. We do this
- even though the prototypes don't match. The argument of setspent
- is not used so this makes no difference. */
-strong_alias (_nss_nis_setspent, _nss_nis_endspent)
+hidden_def (_nss_nis_endspent)
static enum nss_status
internal_nis_getspent_r (struct spwd *sp, char *buffer, size_t buflen,