On Wed, Jul 24, 2013 at 10:13 AM, Ian Kent <raven@xxxxxxxxxx> wrote: > On Tue, 2013-07-23 at 18:30 +0800, Dennis Lan (dlan) wrote: >> On Tue, Jul 23, 2013 at 6:10 PM, Ian Kent <raven@xxxxxxxxxx> wrote: >> > On Tue, 2013-07-23 at 17:50 +0800, Ian Kent wrote: >> >> On Mon, 2013-07-22 at 22:59 +0800, Lan Yixun (dlan) wrote: >> >> > From: "Lan Yixun (dlan)" <dennis.yxun@xxxxxxxxx> >> >> > >> >> > autofs will create symbol link mandatory no matter ldap support >> >> > is enabled or not. so, without this patch, lookup_ldaps.so will become >> >> > a dead link. >> >> >> >> I have added this to my patch queue. >> >> It will be committed next time I push patches to the repo. >> > >> > On second thoughts, what if WITH_LDAP is defined and WITH_SASL is not? >> > >> >> HI Ian: >> current logic is: if SASL is not enabled, then the symbol >> lookup_ldaps.so (which link to lookup_ldap.so) will not be created. >> what are you suggesting here? should symbol of lookup_ldaps.so be >> controlled by LDAP ? > > Yes, I think so. > > If lookup_ldap.so has been included in the build then ldaps:// uris > should be able to be used regardless of SASL, as long as the ldap client > library is configured for it, of course. > > This is what I believe it should be: > > autofs-5.0.7 - fix dead LDAP symbolic link when LDAP support is disabled > > From: Lan Yixun (dlan) <dennis.yxun@xxxxxxxxx> > > autofs will create symbol link mandatory no matter ldap support > is enabled or not. so, without this patch, lookup_ldaps.so will become > a dead link. > > Edited by: Ian Kent <raven@xxxxxxxxxx> > - change check from SASL to LDAP since the ldaps lookup module may > still be used ldaps:// as long as LDAP support is built. > --- > CHANGELOG | 1 + > modules/Makefile | 2 ++ > 2 files changed, 3 insertions(+) > > diff --git a/CHANGELOG b/CHANGELOG > index 3c829cf..9755e25 100644 > --- a/CHANGELOG > +++ b/CHANGELOG > @@ -59,6 +59,7 @@ > - dont start readmap unless ready. > - fix typo forced-shutdown should be force-shutdown. > - fix hesiod check error and use correct $(LIBS) setting. > +- fix dead LDAP symbolic link when LDAP support is disabled. > > 25/07/2012 autofs-5.0.7 > ======================= > diff --git a/modules/Makefile b/modules/Makefile > index c5deb24..8c0df18 100644 > --- a/modules/Makefile > +++ b/modules/Makefile > @@ -74,7 +74,9 @@ install: all > -rm -f $(INSTALLROOT)$(autofslibdir)/mount_smbfs.so > ln -fs lookup_file.so $(INSTALLROOT)$(autofslibdir)/lookup_files.so > ln -fs lookup_yp.so $(INSTALLROOT)$(autofslibdir)/lookup_nis.so > +ifeq ($(LDAP), 1) > ln -fs lookup_ldap.so $(INSTALLROOT)$(autofslibdir)/lookup_ldaps.so > +endif > ln -fs mount_nfs.so $(INSTALLROOT)$(autofslibdir)/mount_nfs4.so > ifeq ($(EXT2FS), 1) > ifeq ($(EXT3FS), 1) > > Hi Ian: I'm fine with this, thanks!! Dennis Lan (dlan) -- To unsubscribe from this list: send the line "unsubscribe autofs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
