fix exportfs with multiple matches

  Fixes a problem with exportfs -o
  and multiple entries of the same type for the same patch that matches
  a given client. The entire rationale and problem description can be found
  at http://bugs.debian.org/245449 (fumihiko kakuma <kakmy@mvh.biglobe.ne.jp>)

diff --git a/ChangeLog b/ChangeLog
index 29a0c45e575766390108a2a07608c9063a6e81ee..b6df9980617238a7c4ef530e682f0b0ff098bf16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2006-06-05 NeilBrown <neilb@suse.de>
        Remove debian/ at request of Debian maintainer "Steinar H. Gunderson" <sesse@debian.org>
 2006-06-05 NeilBrown <neilb@suse.de>
        Remove debian/ at request of Debian maintainer "Steinar H. Gunderson" <sesse@debian.org>

+       - fix_exportfs_with_multiple_matches.diff: Fixes a problem with exportfs -o
+         and multiple entries of the same type for the same patch that matches
+         a given client. The entire rationale and problem description can be found
+         at http://bugs.debian.org/245449 (fumihiko kakuma <kakmy@mvh.biglobe.ne.jp>)

 
 

+       

 2006-04-12 NeilBrown <neilb@suse.de>
        Remove **/Makefile.in, aclocal.m4, configure, and
         support/include/config.h.in from source control
 2006-04-12 NeilBrown <neilb@suse.de>
        Remove **/Makefile.in, aclocal.m4, configure, and
         support/include/config.h.in from source control

diff --git a/support/export/export.c b/support/export/export.c
index 27d4440c72bb287f32955704d6beda9ad19f17d3..cfb6681093fe8e629eb38ff1289794115191b10b 100644 (file)
--- a/support/export/export.c
+++ b/support/export/export.c
@@ -131,7 +131,7 @@ export_add(nfs_export *exp)
                xlog(L_FATAL, "unknown client type in export_add");
 
        epp = exportlist + type;
                xlog(L_FATAL, "unknown client type in export_add");
 
        epp = exportlist + type;

-       while (*epp && slen < strlen((*epp)->m_export.e_path))
+       while (*epp && slen <= strlen((*epp)->m_export.e_path))

                epp = &((*epp)->m_next);
        exp->m_next = *epp;
        *epp = exp;
                epp = &((*epp)->m_next);
        exp->m_next = *epp;
        *epp = exp;