diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nis/nis_call.c | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 98ecfa6d5e..dc3e0391b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-08-07 Jakub Jelinek <jakub@redhat.com> + Ulrich Drepper <drepper@redhat.com> + + * nis/nis_call.c (rec_dirsearch) [case LOWER_NAME]: Don't take + short cut if only one name component is stripped away. + 2006-08-07 Ulrich Drepper <drepper@redhat.com> * nis/nis_call.c: Minor cleanups throughout. diff --git a/nis/nis_call.c b/nis/nis_call.c index bad1f776a1..928053daf5 100644 --- a/nis/nis_call.c +++ b/nis/nis_call.c @@ -386,7 +386,6 @@ rec_dirsearch (const_nis_name name, directory_obj *dir, nis_error *status) char domain[namelen + 3]; char ndomain[namelen + 3]; char *cp; - u_int run = 0; strcpy (domain, name); @@ -400,16 +399,9 @@ rec_dirsearch (const_nis_name name, directory_obj *dir, nis_error *status) nis_leaf_of_r (domain, leaf, sizeof (leaf)); nis_domain_of_r (domain, ndomain, sizeof (ndomain)); strcpy (domain, ndomain); - ++run; } while (nis_dir_cmp (domain, dir->do_name) != SAME_NAME); - if (run == 1) - { - /* We have found the directory above. Use it. */ - return dir; - } - cp = rawmemchr (leaf, '\0'); *cp++ = '.'; strcpy (cp, domain); |