diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-04-19 14:28:01 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-04-19 14:28:01 +0000 |
| commit | 7ab174ed447f1c83855e1d36294b3fb15675ff9b (patch) | |
| tree | cc080e720565ad80c8ef906933e5f9774e6a10cd /nis/nis_lookup.c | |
| parent | b17c265f8fde4b4e7fc374a0408f742dd84ee4eb (diff) | |
| download | glibc-7ab174ed447f1c83855e1d36294b3fb15675ff9b.tar.gz glibc-7ab174ed447f1c83855e1d36294b3fb15675ff9b.tar.xz glibc-7ab174ed447f1c83855e1d36294b3fb15675ff9b.zip | |
* nis/nis_domain_of.c (__nis_domain_of): New function.
* include/rpcsvc/nislib.h (__nis_domain_of): New prototype. * nis/nis_lookup.c (nis_lookup): Use __nis_domain_of. * nis/nis_call.c (rec_dirsearch): Likewise. (first_shoot): Likewise. Remove search_parent_first argument. (struct nis_server_cache): Rename search_parent_first field to search_parent. (nis_server_cache_search, nis_server_cache_add): Rename search_parent_first argument to search_parent. (__nisfind_server): Likewise. If search_parent, call __nis_domain_of.
Diffstat (limited to 'nis/nis_lookup.c')
| -rw-r--r-- | nis/nis_lookup.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nis/nis_lookup.c b/nis/nis_lookup.c index 2075caa009..9677b4d3d1 100644 --- a/nis/nis_lookup.c +++ b/nis/nis_lookup.c @@ -75,7 +75,6 @@ nis_lookup (const_nis_name name, const unsigned int flags) { static const struct timeval RPCTIMEOUT = {10, 0}; enum clnt_stat result; - char ndomain[strlen (req.ns_name) + 1]; again: result = clnt_call (bptr.clnt, NIS_LOOKUP, @@ -137,10 +136,9 @@ nis_lookup (const_nis_name name, const unsigned int flags) if (__nisbind_next (&bptr) != NIS_SUCCESS) { /* No more servers to search. Try parent. */ - nis_domain_of_r (req.ns_name, ndomain, - sizeof (ndomain)); + const char *ndomain = __nis_domain_of (req.ns_name); req.ns_name = strdupa (ndomain); - if (strcmp (ndomain, ".") == 0) + if (strcmp (req.ns_name, ".") == 0) { NIS_RES_STATUS (res) = NIS_NAMEUNREACHABLE; goto out; |