From 225fe2c82c476d1730554e908da681b3ed6b49b7 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 6 Apr 2001 05:35:41 +0000 Subject: [PATCH] checkpoint --- lib/bind/config.h.in | 16 ++ lib/bind/configure | 398 +++++++++++++++++++++++++++++-------- lib/bind/configure.in | 24 ++- lib/bind/port_after.h.in | 72 +++++++ lib/bind/resolv/res_init.c | 7 +- 5 files changed, 431 insertions(+), 86 deletions(-) diff --git a/lib/bind/config.h.in b/lib/bind/config.h.in index e67eb53da4..60d50b3aed 100644 --- a/lib/bind/config.h.in +++ b/lib/bind/config.h.in @@ -4,3 +4,19 @@ #undef _POSIX_PTHREAD_SEMANTICS #undef POSIX_GETGRGID_R #undef POSIX_GETGRNAM_R + +/* define if prototype for getgrnam_r() is required */ +#undef NEED_GETGRNAM_R +#undef NEED_GETGRGID_R +#undef NEED_GETGRENT_R +#undef NEED_SETGRENT_R +#undef NEED_ENDGRENT_R + +#undef NEED_INNETGR_R +#undef NEED_SETNETGRENT_R +#undef NEED_ENDNETGRENT_R + +#undef NEED_SETPASSENT_R +#undef NEED_SETPWENT_R +#undef NEED_GETPWENT_R +#undef NEED_ENDPWENT_R diff --git a/lib/bind/configure b/lib/bind/configure index 0420e7775a..9fc4dc43fe 100644 --- a/lib/bind/configure +++ b/lib/bind/configure @@ -4921,14 +4921,119 @@ fi -echo $ac_n "checking for getgrent_r""... $ac_c" 1>&6 -echo "configure:4926: checking for getgrent_r" >&5 -if eval "test \"`echo '$''{'ac_cv_func_getgrent_r'+set}'`\" = set"; then +echo $ac_n "checking for getgrnam_r""... $ac_c" 1>&6 +echo "configure:4926: checking for getgrnam_r" >&5 +if eval "test \"`echo '$''{'ac_cv_func_getgrnam_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char getgrnam_r(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getgrnam_r) || defined (__stub___getgrnam_r) +choke me +#else +getgrnam_r(); +#endif + +; return 0; } +EOF +if { (eval echo configure:4954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_getgrnam_r=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_getgrnam_r=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'getgrnam_r`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +cat >> confdefs.h <<\EOF +#define NEED_GETGRNAM_R 1 +EOF + +fi + +echo $ac_n "checking for getgrgid_r""... $ac_c" 1>&6 +echo "configure:4978: checking for getgrgid_r" >&5 +if eval "test \"`echo '$''{'ac_cv_func_getgrgid_r'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char getgrgid_r(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getgrgid_r) || defined (__stub___getgrgid_r) +choke me +#else +getgrgid_r(); +#endif + +; return 0; } +EOF +if { (eval echo configure:5006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_getgrgid_r=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_getgrgid_r=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'getgrgid_r`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +cat >> confdefs.h <<\EOF +#define NEED_GETGRGID_R 1 +EOF + +fi + + +echo $ac_n "checking for getgrent_r""... $ac_c" 1>&6 +echo "configure:5031: checking for getgrent_r" >&5 +if eval "test \"`echo '$''{'ac_cv_func_getgrent_r'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < @@ -4950,7 +5055,7 @@ getgrent_r(); ; return 0; } EOF -if { (eval echo configure:4954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getgrent_r=yes" else @@ -4965,7 +5070,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getgrent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -4976,7 +5081,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:4980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* GROUP_R_ARGS="#define GROUP_R_ARGS char *buf, int buflen" @@ -4996,6 +5101,10 @@ GROUP_R_ARGS="#define GROUP_R_ARGS char *buf, int buflen" GROUP_R_BAD="#define GROUP_R_BAD NULL" GROUP_R_OK="#define GROUP_R_OK gptr" GROUP_R_RETURN="#define GROUP_R_RETURN struct group *" +cat >> confdefs.h <<\EOF +#define NEED_GETGRENT_R 1 +EOF + fi @@ -5005,12 +5114,12 @@ fi echo $ac_n "checking for endgrent_r""... $ac_c" 1>&6 -echo "configure:5009: checking for endgrent_r" >&5 +echo "configure:5118: checking for endgrent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endgrent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endgrent_r=yes" else @@ -5053,6 +5162,10 @@ else GROUP_R_END_RESULT="#define GROUP_R_END_RESULT(x) /*empty*/" GROUP_R_END_RETURN="#define GROUP_R_END_RETURN void" GROUP_R_ENT_ARGS="#define GROUP_R_ENT_ARGS void" +cat >> confdefs.h <<\EOF +#define NEED_ENDGRENT_R 1 +EOF + fi @@ -5061,12 +5174,12 @@ fi echo $ac_n "checking for setgrent_r""... $ac_c" 1>&6 -echo "configure:5065: checking for setgrent_r" >&5 +echo "configure:5178: checking for setgrent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_setgrent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setgrent_r=yes" else @@ -5108,19 +5221,24 @@ else echo "$ac_t""no" 1>&6 GROUP_R_SET_RESULT="#undef GROUP_R_SET_RESULT /*empty*/" GROUP_R_SET_RETURN="#define GROUP_R_SET_RETURN void" +cat >> confdefs.h <<\EOF +#define NEED_SETGRENT_R 1 +EOF + fi + echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6 -echo "configure:5119: checking for gethostbyname_r" >&5 +echo "configure:5237: checking for gethostbyname_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname_r=yes" else @@ -5158,7 +5276,7 @@ fi if eval "test \"`echo '$ac_cv_func_'gethostbyname_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -5169,7 +5287,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:5173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* HOST_R_ARGS="#define HOST_R_ARGS char *buf, int buflen, int *h_errnop" @@ -5208,12 +5326,12 @@ fi echo $ac_n "checking for endhostent_r""... $ac_c" 1>&6 -echo "configure:5212: checking for endhostent_r" >&5 +echo "configure:5330: checking for endhostent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endhostent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endhostent_r=yes" else @@ -5264,12 +5382,12 @@ fi echo $ac_n "checking for sethostent_r""... $ac_c" 1>&6 -echo "configure:5268: checking for sethostent_r" >&5 +echo "configure:5386: checking for sethostent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_sethostent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sethostent_r=yes" else @@ -5319,7 +5437,7 @@ fi cat > conftest.$ac_ext < @@ -5331,7 +5449,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:5335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SETPWENT_VOID="#define SETPWENT_VOID 1" @@ -5346,39 +5464,39 @@ rm -f conftest* cat > conftest.$ac_ext < #include void -endgrent(void) {} +setgrent(void) {} int main() { return (0); ; return 0; } EOF -if { (eval echo configure:5362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - SETPWENT_VOID="#define SETGRENT_VOID 1" + SETGRENT_VOID="#define SETGRENT_VOID 1" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - SETPWENT_VOID="#undef SETGRENT_VOID" + SETGRENT_VOID="#undef SETGRENT_VOID" fi rm -f conftest* echo $ac_n "checking for getnetgrent_r""... $ac_c" 1>&6 -echo "configure:5377: checking for getnetgrent_r" >&5 +echo "configure:5495: checking for getnetgrent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getnetgrent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getnetgrent_r=yes" else @@ -5416,7 +5534,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getnetgrent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -5427,7 +5545,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:5431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* NGR_R_ARGS="#define NGR_R_ARGS char *buf, int buflen" @@ -5463,12 +5581,12 @@ fi echo $ac_n "checking for endnetgrent_r""... $ac_c" 1>&6 -echo "configure:5467: checking for endnetgrent_r" >&5 +echo "configure:5585: checking for endnetgrent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endnetgrent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endnetgrent_r=yes" else @@ -5511,6 +5629,10 @@ else NGR_R_END_RESULT="#define NGR_R_END_RESULT(x) /*empty*/" NGR_R_END_RETURN="#define NGR_R_END_RETURN void" NGR_R_ENT_ARGS="#undef NGR_R_ENT_ARGS /*empty*/" +cat >> confdefs.h <<\EOF +#define NEED_ENDNETGRENT_R 1 +EOF + fi @@ -5519,12 +5641,12 @@ fi echo $ac_n "checking for setnetgrent_r""... $ac_c" 1>&6 -echo "configure:5523: checking for setnetgrent_r" >&5 +echo "configure:5645: checking for setnetgrent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_setnetgrent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setnetgrent_r=yes" else @@ -5566,20 +5688,76 @@ else echo "$ac_t""no" 1>&6 NGR_R_SET_RESULT="#undef NGR_R_SET_RESULT /*empty*/" NGR_R_SET_RETURN="#define NGR_R_SET_RETURN void" +cat >> confdefs.h <<\EOF +#define NEED_SETNETGRENT_R 1 +EOF + fi +echo $ac_n "checking for innetgr_r""... $ac_c" 1>&6 +echo "configure:5703: checking for innetgr_r" >&5 +if eval "test \"`echo '$''{'ac_cv_func_innetgr_r'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char innetgr_r(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_innetgr_r) || defined (__stub___innetgr_r) +choke me +#else +innetgr_r(); +#endif + +; return 0; } +EOF +if { (eval echo configure:5731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_innetgr_r=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_innetgr_r=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'innetgr_r`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +cat >> confdefs.h <<\EOF +#define NEED_INNETGR_R 1 +EOF + +fi + echo $ac_n "checking for getprotoent_r""... $ac_c" 1>&6 -echo "configure:5578: checking for getprotoent_r" >&5 +echo "configure:5756: checking for getprotoent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getprotoent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getprotoent_r=yes" else @@ -5617,7 +5795,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getprotoent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -5630,7 +5808,7 @@ return (0); ; return 0; } EOF -if { (eval echo configure:5634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROTO_R_ARGS="#define PROTO_R_ARGS char *buf, int buflen" @@ -5666,12 +5844,12 @@ fi echo $ac_n "checking for endprotoent_r""... $ac_c" 1>&6 -echo "configure:5670: checking for endprotoent_r" >&5 +echo "configure:5848: checking for endprotoent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endprotoent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endprotoent_r=yes" else @@ -5722,12 +5900,12 @@ fi echo $ac_n "checking for setprotoent_r""... $ac_c" 1>&6 -echo "configure:5726: checking for setprotoent_r" >&5 +echo "configure:5904: checking for setprotoent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_setprotoent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setprotoent_r=yes" else @@ -5776,12 +5954,12 @@ fi echo $ac_n "checking for getpwent_r""... $ac_c" 1>&6 -echo "configure:5780: checking for getpwent_r" >&5 +echo "configure:5958: checking for getpwent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpwent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getpwent_r=yes" else @@ -5827,6 +6005,10 @@ PASS_R_COPY="#define PASS_R_COPY buf, buflen" PASS_R_COPY_ARGS="#define PASS_R_COPY_ARGS PASS_R_ARGS" PASS_R_OK="#define PASS_R_OK pwptr" PASS_R_RETURN="#define PASS_R_RETURN struct passwd *" +cat >> confdefs.h <<\EOF +#define NEED_GETPWENT_R 1 +EOF + fi @@ -5838,12 +6020,12 @@ fi echo $ac_n "checking for endpwent_r""... $ac_c" 1>&6 -echo "configure:5842: checking for endpwent_r" >&5 +echo "configure:6024: checking for endpwent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endpwent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endpwent_r=yes" else @@ -5885,21 +6067,77 @@ else echo "$ac_t""no" 1>&6 PASS_R_END_RESULT="#define PASS_R_END_RESULT(x) /*empty*/" PASS_R_END_RETURN="#define PASS_R_END_RETURN void" -PASS_R_ENT_ARGS="#undef PASS_R_ENT_ARGS /*empty*/" +PASS_R_ENT_ARGS="#undef PASS_R_ENT_ARGS" +cat >> confdefs.h <<\EOF +#define NEED_ENDPWENT_R 1 +EOF + fi +echo $ac_n "checking for setpassent_r""... $ac_c" 1>&6 +echo "configure:6083: checking for setpassent_r" >&5 +if eval "test \"`echo '$''{'ac_cv_func_setpassent_r'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char setpassent_r(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_setpassent_r) || defined (__stub___setpassent_r) +choke me +#else +setpassent_r(); +#endif + +; return 0; } +EOF +if { (eval echo configure:6111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_setpassent_r=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_setpassent_r=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'setpassent_r`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +cat >> confdefs.h <<\EOF +#define NEED_SETPASSENT_R 1 +EOF + +fi + echo $ac_n "checking for setpwent_r""... $ac_c" 1>&6 -echo "configure:5898: checking for setpwent_r" >&5 +echo "configure:6136: checking for setpwent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_setpwent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setpwent_r=yes" else @@ -5941,6 +6179,10 @@ else echo "$ac_t""no" 1>&6 PASS_R_SET_RESULT="#undef PASS_R_SET_RESULT /*empty*/" PASS_R_SET_RETURN="#define PASS_R_SET_RETURN void" +cat >> confdefs.h <<\EOF +#define NEED_SETPWENT_R 1 +EOF + fi @@ -5948,12 +6190,12 @@ fi echo $ac_n "checking for getservent_r""... $ac_c" 1>&6 -echo "configure:5952: checking for getservent_r" >&5 +echo "configure:6194: checking for getservent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getservent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getservent_r=yes" else @@ -5991,7 +6233,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getservent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -6002,7 +6244,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:6006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SERV_R_ARGS="#define SERV_R_ARGS char *buf, int buflen" @@ -6038,12 +6280,12 @@ fi echo $ac_n "checking for endservent_r""... $ac_c" 1>&6 -echo "configure:6042: checking for endservent_r" >&5 +echo "configure:6284: checking for endservent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endservent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endservent_r=yes" else @@ -6094,12 +6336,12 @@ fi echo $ac_n "checking for setservent_r""... $ac_c" 1>&6 -echo "configure:6098: checking for setservent_r" >&5 +echo "configure:6340: checking for setservent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_setservent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setservent_r=yes" else @@ -6225,7 +6467,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6229: checking for $ac_word" >&5 +echo "configure:6471: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JADE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6272,7 +6514,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6276: checking for $ac_word" >&5 +echo "configure:6518: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6314,7 +6556,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6318: checking for $ac_word" >&5 +echo "configure:6560: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PDFTEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6359,7 +6601,7 @@ done SGMLDIR="" echo $ac_n "checking for SGML files""... $ac_c" 1>&6 -echo "configure:6363: checking for SGML files" >&5 +echo "configure:6605: checking for SGML files" >&5 for d in /usr/pkg/share/sgml /usr/local/share/sgml do if test -f $d/docbook/dsssl/modular/html/docbook.dsl @@ -6384,7 +6626,7 @@ fi XGMLDIR="" echo $ac_n "checking for XML files""... $ac_c" 1>&6 -echo "configure:6388: checking for XML files" >&5 +echo "configure:6630: checking for XML files" >&5 for d in /usr/pkg/share/xml /usr/local/share/xml do if test -f $d/dtd/docbook/docbookx.dtd diff --git a/lib/bind/configure.in b/lib/bind/configure.in index a78d39078e..07ebe67238 100644 --- a/lib/bind/configure.in +++ b/lib/bind/configure.in @@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.22 $) +AC_REVISION($Revision: 1.23 $) AC_INIT(resolv/herror.c) AC_PREREQ(2.13) @@ -1357,6 +1357,9 @@ NET_R_END_RETURN="#define NET_R_END_RETURN void" AC_SUBST(NET_R_END_RESULT) AC_SUBST(NET_R_END_RETURN) +AC_CHECK_FUNC(getgrnam_r,,AC_DEFINE(NEED_GETGRNAM_R)) +AC_CHECK_FUNC(getgrgid_r,,AC_DEFINE(NEED_GETGRGID_R)) + AC_CHECK_FUNC(getgrent_r, AC_TRY_COMPILE( [ @@ -1375,6 +1378,7 @@ GROUP_R_ARGS="#define GROUP_R_ARGS char *buf, int buflen" GROUP_R_BAD="#define GROUP_R_BAD NULL" GROUP_R_OK="#define GROUP_R_OK gptr" GROUP_R_RETURN="#define GROUP_R_RETURN struct group *" +AC_DEFINE(NEED_GETGRENT_R) ) AC_SUBST(GROUP_R_ARGS) AC_SUBST(GROUP_R_BAD) @@ -1386,6 +1390,7 @@ AC_CHECK_FUNC(endgrent_r, GROUP_R_END_RESULT="#define GROUP_R_END_RESULT(x) /*empty*/" GROUP_R_END_RETURN="#define GROUP_R_END_RETURN void" GROUP_R_ENT_ARGS="#define GROUP_R_ENT_ARGS void" +AC_DEFINE(NEED_ENDGRENT_R) ) AC_SUBST(GROUP_R_END_RESULT) AC_SUBST(GROUP_R_END_RETURN) @@ -1395,10 +1400,12 @@ AC_CHECK_FUNC(setgrent_r, , GROUP_R_SET_RESULT="#undef GROUP_R_SET_RESULT /*empty*/" GROUP_R_SET_RETURN="#define GROUP_R_SET_RETURN void" +AC_DEFINE(NEED_SETGRENT_R) ) AC_SUBST(GROUP_R_SET_RESULT) AC_SUBST(GROUP_R_SET_RETURN) + AC_CHECK_FUNC(gethostbyname_r, AC_TRY_COMPILE( [ @@ -1471,12 +1478,12 @@ AC_TRY_COMPILE([ #include #include void -endgrent(void) {} +setgrent(void) {} ], [return (0);], -SETPWENT_VOID="#define SETGRENT_VOID 1" +SETGRENT_VOID="#define SETGRENT_VOID 1" , -SETPWENT_VOID="#undef SETGRENT_VOID" +SETGRENT_VOID="#undef SETGRENT_VOID" ) AC_SUBST(SETGRENT_VOID) @@ -1518,6 +1525,7 @@ AC_CHECK_FUNC(endnetgrent_r, NGR_R_END_RESULT="#define NGR_R_END_RESULT(x) /*empty*/" NGR_R_END_RETURN="#define NGR_R_END_RETURN void" NGR_R_ENT_ARGS="#undef NGR_R_ENT_ARGS /*empty*/" +AC_DEFINE(NEED_ENDNETGRENT_R) ) AC_SUBST(NGR_R_END_RESULT) AC_SUBST(NGR_R_END_RETURN) @@ -1527,10 +1535,12 @@ AC_CHECK_FUNC(setnetgrent_r, , NGR_R_SET_RESULT="#undef NGR_R_SET_RESULT /*empty*/" NGR_R_SET_RETURN="#define NGR_R_SET_RETURN void" +AC_DEFINE(NEED_SETNETGRENT_R) ) AC_SUBST(NGR_R_SET_RESULT) AC_SUBST(NGR_R_SET_RETURN) +AC_CHECK_FUNC(innetgr_r,,AC_DEFINE(NEED_INNETGR_R)) AC_CHECK_FUNC(getprotoent_r, AC_TRY_COMPILE( @@ -1593,6 +1603,7 @@ PASS_R_COPY="#define PASS_R_COPY buf, buflen" PASS_R_COPY_ARGS="#define PASS_R_COPY_ARGS PASS_R_ARGS" PASS_R_OK="#define PASS_R_OK pwptr" PASS_R_RETURN="#define PASS_R_RETURN struct passwd *" +AC_DEFINE(NEED_GETPWENT_R) ) AC_SUBST(PASS_R_ARGS) AC_SUBST(PASS_R_BAD) @@ -1605,16 +1616,19 @@ AC_CHECK_FUNC(endpwent_r, , PASS_R_END_RESULT="#define PASS_R_END_RESULT(x) /*empty*/" PASS_R_END_RETURN="#define PASS_R_END_RETURN void" -PASS_R_ENT_ARGS="#undef PASS_R_ENT_ARGS /*empty*/" +PASS_R_ENT_ARGS="#undef PASS_R_ENT_ARGS" +AC_DEFINE(NEED_ENDPWENT_R) ) AC_SUBST(PASS_R_END_RESULT) AC_SUBST(PASS_R_END_RETURN) AC_SUBST(PASS_R_ENT_ARGS) +AC_CHECK_FUNC(setpassent_r,,AC_DEFINE(NEED_SETPASSENT_R)) AC_CHECK_FUNC(setpwent_r, , PASS_R_SET_RESULT="#undef PASS_R_SET_RESULT /*empty*/" PASS_R_SET_RETURN="#define PASS_R_SET_RETURN void" +AC_DEFINE(NEED_SETPWENT_R) ) AC_SUBST(PASS_R_SET_RESULT) AC_SUBST(PASS_R_SET_RETURN) diff --git a/lib/bind/port_after.h.in b/lib/bind/port_after.h.in index 701ae1f1d6..97614516aa 100644 --- a/lib/bind/port_after.h.in +++ b/lib/bind/port_after.h.in @@ -114,4 +114,76 @@ char * strsep(char **stringp, const char *delim); #define ALIGN(p) (((unsigned int)(p) + (sizeof(int) - 1)) & ~(sizeof(int) - 1)) #endif +/* forward declarations */ +struct group; + +#ifdef POSIX_GETGRNAM_R +int +__posix_getgrnam_r(const char *, struct group *, char *, int, struct group **); +#endif + +#ifdef NEED_GETGRNAM_R +int +getgrnam_r(const char *, struct group *, char *, size_t, struct group **); +#endif + +#ifdef POSIX_GETGRGID_R +int +__posix_getgrgid_r(gid_t, struct group *, char *, int, struct group **) ; +#endif + +#ifdef NEED_GETGRGID_R +int +getgrgid_r(gid_t, struct group *, char *, size_t, struct group **); +#endif + +#ifdef NEED_GETGRENT_R +GROUP_R_RETURN getgrent_r(struct group *gptr, GROUP_R_ARGS); +#endif + +#ifdef NEED_SETGRENT_R +GROUP_R_SET_RETURN setgrent_r(GROUP_R_ENT_ARGS); +#endif + +#ifdef NEED_ENDGRENT_R +GROUP_R_END_RETURN endgrent_r(GROUP_R_ENT_ARGS); +#endif + +#ifdef NEED_INNETGR_R +NGR_R_RETURN +innetgr_r(const char *, const char *, const char *, const char *); +#endif + +#ifdef NEED_SETNETGRENT_R +#ifdef NGR_R_ENT_ARGS +NGR_R_SET_RETURN setnetgrent_r(const char *netgroup, NGR_R_ENT_ARGS); +#else +NGR_R_SET_RETURN setnetgrent_r(const char *netgroup); +#endif +#endif + +#ifdef NEED_ENDNETGRENT_R +#ifdef NGR_R_ENT_ARGS +NGR_R_END_RETURN endnetgrent_r(NGR_R_ENT_ARGS); +#else +NGR_R_END_RETURN endnetgrent_r(void); +#endif +#endif + +#ifdef NEED_SETPASSENT_R +#ifdef PASS_R_ENT_ARGS +PASS_R_SET_RETURN setpassent_r(int stayopen, PASS_R_ENT_ARGS); +#else +PASS_R_SET_RETURN setpassent_r(int stayopen); +#endif +#endif + +#ifdef NEED_GETPWENT_R +PASS_R_RETURN getpwent_r(struct passwd *pwptr, PASS_R_ARGS); +#endif + +#ifdef NEED_ENDPWENT_R +void endpwent_r(void); +#endif + #endif diff --git a/lib/bind/resolv/res_init.c b/lib/bind/resolv/res_init.c index 4b9dc42a65..1b423d7666 100644 --- a/lib/bind/resolv/res_init.c +++ b/lib/bind/resolv/res_init.c @@ -70,7 +70,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; -static const char rcsid[] = "$Id: res_init.c,v 1.2 2001/04/02 07:52:30 marka Exp $"; +static const char rcsid[] = "$Id: res_init.c,v 1.3 2001/04/06 05:35:41 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" @@ -340,7 +340,7 @@ __res_vinit(res_state statp, int preinit) { break; net = cp; while (*cp && !ISSORTMASK(*cp) && *cp != ';' && - isascii(*cp) && !isspace(*cp)) + isascii(*cp) && !isspace((unsigned char)*cp)) cp++; n = *cp; *cp = 0; @@ -350,7 +350,8 @@ __res_vinit(res_state statp, int preinit) { *cp++ = n; net = cp; while (*cp && *cp != ';' && - isascii(*cp) && !isspace(*cp)) + isascii(*cp) && + !isspace((unsigned char)*cp)) cp++; n = *cp; *cp = 0;