From 8f1507811058ef1216eb30adb394a2c4d96f5edc Mon Sep 17 00:00:00 2001 From: Alfred Perlstein Date: Tue, 27 Mar 2001 09:49:03 +0000 Subject: [PATCH] give the "netgrent" functions a home in netdb.h --- include/netdb.h | 5 +++++ lib/libc/gen/getnetgrent.3 | 1 + sbin/mountd/mountd.c | 5 ----- usr.sbin/amd/include/config.h | 2 +- usr.sbin/mountd/mountd.c | 5 ----- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/netdb.h b/include/netdb.h index 2e3ae67a1df4..94c7d3948c7b 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -208,6 +208,7 @@ typedef _BSD_SOCKLEN_T_ socklen_t; __BEGIN_DECLS void endhostent __P((void)); void endnetent __P((void)); +void endnetgrent __P((void)); void endprotoent __P((void)); void endservent __P((void)); void freehostent __P((struct hostent *)); @@ -220,6 +221,7 @@ struct hostent *getipnodebyname __P((const char *, int, int, int *)); struct netent *getnetbyaddr __P((unsigned long, int)); struct netent *getnetbyname __P((const char *)); struct netent *getnetent __P((void)); +int getnetgrent __P((char **, char **, char **)); struct protoent *getprotobyname __P((const char *)); struct protoent *getprotobynumber __P((int)); struct protoent *getprotoent __P((void)); @@ -228,6 +230,8 @@ struct servent *getservbyport __P((int, const char *)); struct servent *getservent __P((void)); void herror __P((const char *)); __const char *hstrerror __P((int)); +int innetgr __P((const char *, const char *, const char *, + const char *)); void sethostent __P((int)); /* void sethostfile __P((const char *)); */ void setnetent __P((int)); @@ -238,6 +242,7 @@ int getnameinfo __P((const struct sockaddr *, socklen_t, char *, size_t, char *, size_t, int)); void freeaddrinfo __P((struct addrinfo *)); char *gai_strerror __P((int)); +void setnetgrent __P((const char *)); void setservent __P((int)); /* diff --git a/lib/libc/gen/getnetgrent.3 b/lib/libc/gen/getnetgrent.3 index 3258df66c4a6..eac3a528a6a3 100644 --- a/lib/libc/gen/getnetgrent.3 +++ b/lib/libc/gen/getnetgrent.3 @@ -44,6 +44,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS +.Fd #include .Ft int .Fn getnetgrent "char **host" "char **user" "char **domain" .Ft int diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index 16d2ecec7c61..da600c5a2873 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -201,11 +201,6 @@ int xdr_fhs __P((XDR *, caddr_t)); int xdr_mlist __P((XDR *, caddr_t)); void terminate __P((int)); -/* C library */ -int getnetgrent(); -void endnetgrent(); -void setnetgrent(); - static int bitcmp __P((void *, void *, int)); static int netpartcmp __P((struct sockaddr *, struct sockaddr *, int)); static int sacmp __P((struct sockaddr *, struct sockaddr *)); diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h index c5f4382d63f0..2456edd83cf4 100644 --- a/usr.sbin/amd/include/config.h +++ b/usr.sbin/amd/include/config.h @@ -1977,7 +1977,7 @@ #define HAVE_EXTERN_GETPAGESIZE 1 /* does extern definition for innetgr() exist? */ -/* #undef HAVE_EXTERN_INNETGR */ +#define HAVE_EXTERN_INNETGR /* does extern definition for mkstemp() exist? */ #define HAVE_EXTERN_MKSTEMP 1 diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 16d2ecec7c61..da600c5a2873 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -201,11 +201,6 @@ int xdr_fhs __P((XDR *, caddr_t)); int xdr_mlist __P((XDR *, caddr_t)); void terminate __P((int)); -/* C library */ -int getnetgrent(); -void endnetgrent(); -void setnetgrent(); - static int bitcmp __P((void *, void *, int)); static int netpartcmp __P((struct sockaddr *, struct sockaddr *, int)); static int sacmp __P((struct sockaddr *, struct sockaddr *));