From 2b89682808a43a3bf03733846ae0d67ec71208d9 Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Mar 26 2010 01:39:03 +0000 Subject: - fix add locality as valid ldap master map attribute (bz575863). --- diff --git a/autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.patch b/autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.patch new file mode 100644 index 0000000..e0081b1 --- /dev/null +++ b/autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.patch @@ -0,0 +1,51 @@ +autofs-5.0.5 - add locality as valid ldap master map attribute fix + +From: Ian Kent + +A recent change enabled the use of the locality ("l") attribute in map name +dns used in the master map. + +When using an entry like: +/mp yp:lnxhome + +the l following the ":" would match a dn patern in the tokenizer leading +to a syntax error. This has exposed a bug present for some time as, for +the map entry syntax above, this could also happen if the map name started +with another attribute, such as "cn" or "o". +--- + + CHANGELOG | 1 + + lib/master_tok.l | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + + +--- autofs-5.0.5.orig/CHANGELOG ++++ autofs-5.0.5/CHANGELOG +@@ -26,6 +26,7 @@ + - fix get query dn failure. + - fix ampersand escape in auto.smb. + - add locality as valid ldap master map attribute. ++- add locality as valid ldap master map attribute fix. + + 03/09/2009 autofs-5.0.5 + ----------------------- +--- autofs-5.0.5.orig/lib/master_tok.l ++++ autofs-5.0.5/lib/master_tok.l +@@ -210,7 +210,7 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|-- + } + + {MTYPE} | +- {MTYPE}/{DNSERVERSTR}{DNATTRSTR} | ++ {MTYPE}/{DNSERVERSTR}{DNATTRSTR}= | + {MTYPE}/{DNATTRSTR}= { + tlen = master_leng - 1; + if (bptr != buff && isblank(master_text[tlen])) { +@@ -250,7 +250,7 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|-- + yyless(0); + } + +- {DNSERVERSTR}{DNATTRSTR} { ++ {DNSERVERSTR}{DNATTRSTR}= { + BEGIN(DNSTR); + yyless(0); + } diff --git a/autofs.spec b/autofs.spec index cce1c53..967a2c4 100644 --- a/autofs.spec +++ b/autofs.spec @@ -4,7 +4,7 @@ Summary: A tool for automatically mounting and unmounting filesystems Name: autofs Version: 5.0.5 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 1 License: GPLv2+ Group: System Environment/Daemons @@ -36,6 +36,7 @@ Patch23: autofs-5.0.5-add-sasl-mutex-callbacks.patch Patch24: autofs-5.0.5-fix-get-qdn-fail.patch Patch25: autofs-5.0.5-fix-ampersand-escape-in-auto-smb.patch Patch26: autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute.patch +Patch27: autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel Conflicts: cyrus-sasl-lib < 2.1.23-9 @@ -104,6 +105,7 @@ echo %{version}-%{release} > .version %patch24 -p1 %patch25 -p1 %patch26 -p1 +%patch27 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -156,30 +158,33 @@ fi %{_libdir}/autofs/ %changelog -* Wed Mar 17 2010 Ian Kent - 1:5.0.5-22 +* Fri Mar 26 2010 Ian Kent - 1:5.0.5-24.fc14 +- fix add locality as valid ldap master map attribute (bz575863). + +* Wed Mar 17 2010 Ian Kent - 1:5.0.5-22 - fix get query dn failure. - fix ampersand escape in auto.smb. - add locality as valid ldap master map attribute. -* Wed Mar 17 2010 Ian Kent - 1:5.0.5-22 +* Wed Mar 17 2010 Ian Kent - 1:5.0.5-22 - add Conflicts to ensure we get fixed cyrus-sasl-lib for rev 21 change. -* Tue Feb 23 2010 Ian Kent - 1:5.0.5-21 +* Tue Feb 23 2010 Ian Kent - 1:5.0.5-21 - add missing sasl mutex callbacks. -* Thu Feb 11 2010 Ian Kent - 1:5.0.5-19 +* Thu Feb 11 2010 Ian Kent - 1:5.0.5-19 - fix segfault upon reconnect cannot find valid base dn. -* Mon Feb 1 2010 Ian Kent - 1:5.0.5-17 +* Mon Feb 1 2010 Ian Kent - 1:5.0.5-17 - dont connect at ldap lookup module init. - fix random selection option. - fix disable timeout. - fix strdup() return value check. -* Tue Dec 8 2009 Ian Kent - 1:5.0.5-16 +* Tue Dec 8 2009 Ian Kent - 1:5.0.5-16 - fix memory leak on reload (bz545137). -* Fri Dec 4 2009 Ian Kent - 1:5.0.5-14 +* Fri Dec 4 2009 Ian Kent - 1:5.0.5-14 - fix rpc fail on large export list (bz543023). * Mon Nov 30 2009 Ian Kent - 1:5.0.5-12