summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-07 17:40:53 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-07 17:40:53 +0000
commit13a0293d5ae75bcb61dbe6e3ab9c680f3cf25388 (patch)
tree7faa62e94976c480a7842b0df08b073fa232b427
parentbd1ebae0eb756824f9a8dbc66aa2913733c06354 (diff)
2006-08-07 Jakub Jelinek <jakub@redhat.com>cvs/fedora-glibc-20060807T1859
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.
-rw-r--r--ChangeLog6
-rw-r--r--nis/nis_call.c8
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);