Small nfs-utils patch from Olaf Kirch

diff --git a/ChangeLog b/ChangeLog
index df3ae496c8aa81ddee94e96b7be66c45f1e21add..b67dbdf677d06eba8de8991fe15815166a129e70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-07 Olaf Kirch <okir@suse.de>
+       * utils/mountd/mountd.c(get_exportlist): Without this patch,
+       showmount -e would sometimes display host names that should really
+       have been subsumed under a wildcard entry.
+
+       The problem was that the code in get_exportlist would always
+       skip the next group entry after removing one FQDN.
+

 2005-10-06 Steve Dickson <SteveD@redhat.com> NeilBrown <neilb@suse.de>
        * support/nfs/export.c: don't warn about sync/async for readonly
        exports
 2005-10-06 Steve Dickson <SteveD@redhat.com> NeilBrown <neilb@suse.de>
        * support/nfs/export.c: don't warn about sync/async for readonly
        exports

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index a9ec1c7b0ae7f91c24a2d53331a6373d3123b924..8a2f4138e1ea84e3f1a7977bf08aac1a3a7927b2 100644 (file)
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -425,11 +425,9 @@ get_exportlist(void)
                                xfree(c->gr_name);
                                xfree(c);
                                xfree (hp);
                                xfree(c->gr_name);
                                xfree(c);
                                xfree (hp);

-                               if ((c = *cp) == NULL)
-                                 break;
+                               continue;

                              }
                              }

-                             else
-                               xfree (hp);
+                             xfree (hp);

                            }
                            cp = &(c->gr_next);
                          }
                            }
                            cp = &(c->gr_next);
                          }