- fix get query dn failure.
- fix ampersand escape in auto.smb. - add locality as valid ldap master map attribute.
This commit is contained in:
Ian Kent
parent
a660cec605
commit
135552a37f
@ -0,0 +1,35 @@
|
||||
autofs-5.0.5 - add locality as valid ldap master map attribute
|
||||
|
||||
From: Ian Kent <raven@themaw.net>
|
||||
|
||||
The master map dn string parsing is quite strict so we will need to add
|
||||
allowable attributes as required. One such attribute is "l", the locality.
|
||||
---
|
||||
|
||||
CHANGELOG | 1 +
|
||||
lib/master_tok.l | 3 ++-
|
||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
|
||||
--- autofs-5.0.5.orig/CHANGELOG
|
||||
+++ autofs-5.0.5/CHANGELOG
|
||||
@@ -25,6 +25,7 @@
|
||||
- add missing sasl mutex callbacks.
|
||||
- fix get query dn failure.
|
||||
- fix ampersand escape in auto.smb.
|
||||
+- add locality as valid ldap master map attribute.
|
||||
|
||||
03/09/2009 autofs-5.0.5
|
||||
-----------------------
|
||||
--- autofs-5.0.5.orig/lib/master_tok.l
|
||||
+++ autofs-5.0.5/lib/master_tok.l
|
||||
@@ -110,7 +110,8 @@ AT_OU ([oO][[uU])
|
||||
AT_DC ([dD][[cC])
|
||||
AT_O ([oO])
|
||||
AT_C ([cC])
|
||||
-DNATTRSTR ({AT_CN}|{AT_NMN}|{AT_AMN}|{AT_OU}|{AT_DC}|{AT_O}|{AT_C})
|
||||
+AT_L ([lL])
|
||||
+DNATTRSTR ({AT_CN}|{AT_NMN}|{AT_AMN}|{AT_OU}|{AT_DC}|{AT_O}|{AT_C}|{AT_L})
|
||||
DNNAMESTR1 ([[:alnum:]_.\- ]+)
|
||||
DNNAMESTR2 ([[:alnum:]_.\-]+)
|
||||
|
||||
32
autofs-5.0.5-fix-ampersand-escape-in-auto-smb.patch
Normal file
32
autofs-5.0.5-fix-ampersand-escape-in-auto-smb.patch
Normal file
@ -0,0 +1,32 @@
|
||||
autofs-5.0.5 - fix ampersand escape in auto.smb
|
||||
|
||||
From: Ian Kent <raven@themaw.net>
|
||||
|
||||
CIFS share names containing an ampersand need to be escaped.
|
||||
---
|
||||
|
||||
CHANGELOG | 1 +
|
||||
samples/auto.smb | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
|
||||
--- autofs-5.0.5.orig/CHANGELOG
|
||||
+++ autofs-5.0.5/CHANGELOG
|
||||
@@ -24,6 +24,7 @@
|
||||
- fix reconnect get base dn.
|
||||
- add missing sasl mutex callbacks.
|
||||
- fix get query dn failure.
|
||||
+- fix ampersand escape in auto.smb.
|
||||
|
||||
03/09/2009 autofs-5.0.5
|
||||
-----------------------
|
||||
--- autofs-5.0.5.orig/samples/auto.smb
|
||||
+++ autofs-5.0.5/samples/auto.smb
|
||||
@@ -26,6 +26,7 @@ $SMBCLIENT -gNL $key 2>/dev/null| awk -v
|
||||
# Enclose mount dir and location in quotes
|
||||
# Double quote "$" in location as it is special
|
||||
gsub(/\$$/, "\\$", loc);
|
||||
+ gsub(/\&/,"\\\\&",loc)
|
||||
print " \\\n\t \"/" dir "\"", "\"://" key "/" loc "\""
|
||||
}
|
||||
END { if (!first) print "\n"; else exit 1 }
|
||||
39
autofs-5.0.5-fix-get-qdn-fail.patch
Normal file
39
autofs-5.0.5-fix-get-qdn-fail.patch
Normal file
@ -0,0 +1,39 @@
|
||||
autofs-5.0.5 - fix get query dn failure
|
||||
|
||||
From: Ian Kent <raven@themaw.net>
|
||||
|
||||
Recent changes to the LDAP connection logic can fail to retrieve a valid
|
||||
query dn upon LDAP connection.
|
||||
|
||||
If LDAP is being used to store autofs maps, the LDAP schema to be used
|
||||
for the maps is explicitly defined in the autofs configuration and no
|
||||
master map entries exist in LDAP autofs fails to try and retrieve a
|
||||
query dn, returning success instead of failure.
|
||||
---
|
||||
|
||||
CHANGELOG | 1 +
|
||||
modules/lookup_ldap.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
|
||||
--- autofs-5.0.5.orig/CHANGELOG
|
||||
+++ autofs-5.0.5/CHANGELOG
|
||||
@@ -23,6 +23,7 @@
|
||||
- fix strdup() return value check (Leonardo Chiquitto).
|
||||
- fix reconnect get base dn.
|
||||
- add missing sasl mutex callbacks.
|
||||
+- fix get query dn failure.
|
||||
|
||||
03/09/2009 autofs-5.0.5
|
||||
-----------------------
|
||||
--- autofs-5.0.5.orig/modules/lookup_ldap.c
|
||||
+++ autofs-5.0.5/modules/lookup_ldap.c
|
||||
@@ -556,7 +556,7 @@ static int do_bind(unsigned logopt, LDAP
|
||||
}
|
||||
}
|
||||
|
||||
- if (ctxt->schema && !need_base)
|
||||
+ if (ctxt->schema && ctxt->qdn && !need_base)
|
||||
return 1;
|
||||
|
||||
/*
|
||||
13
autofs.spec
13
autofs.spec
@ -4,7 +4,7 @@
|
||||
Summary: A tool for automatically mounting and unmounting filesystems
|
||||
Name: autofs
|
||||
Version: 5.0.5
|
||||
Release: 22%{?dist}
|
||||
Release: 23%{?dist}
|
||||
Epoch: 1
|
||||
License: GPLv2+
|
||||
Group: System Environment/Daemons
|
||||
@ -33,6 +33,9 @@ Patch20: autofs-5.0.5-fix-disable-timeout.patch
|
||||
Patch21: autofs-5.0.5-fix-strdup-return-value-check.patch
|
||||
Patch22: autofs-5.0.5-fix-reconnect-get-base-dn.patch
|
||||
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
|
||||
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
|
||||
@ -98,6 +101,9 @@ echo %{version}-%{release} > .version
|
||||
%patch21 -p1
|
||||
%patch22 -p1
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
%patch25 -p1
|
||||
%patch26 -p1
|
||||
|
||||
%build
|
||||
#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
|
||||
@ -150,6 +156,11 @@ fi
|
||||
%{_libdir}/autofs/
|
||||
|
||||
%changelog
|
||||
* Wed Mar 17 2010 Ian Kent <kpnt@redhat.com> - 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 <kpnt@redhat.com> - 1:5.0.5-22
|
||||
- add Conflicts to ensure we get fixed cyrus-sasl-lib for rev 21 change.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user