From 3319957f84cb8d2cff1353c59f0fe4ecf8a70efb Mon Sep 17 00:00:00 2001 From: Olivier Beytrison Date: Sat, 8 Dec 2012 11:40:20 +0100 Subject: [PATCH] fix typo, add doc for ldap-edir, build edir.c with boilermake --- raddb/mods-available/ldap | 5 +++++ raddb/sites-available/default | 5 ++--- src/modules/rlm_ldap/all.mk.in | 2 +- src/modules/rlm_ldap/edir.c | 2 -- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/raddb/mods-available/ldap b/raddb/mods-available/ldap index 875b0f71835..92a5fe72445 100644 --- a/raddb/mods-available/ldap +++ b/raddb/mods-available/ldap @@ -57,6 +57,11 @@ ldap { # if you're not using LDAP to retrieve password values. # expect_password = "yes" + # Set to yes if you have eDirectory and want to use the universal + # password mechanism. Add ldap in post-auth to perform account + # policy checking +# edir = "no" + # # Profile related attributes. # diff --git a/raddb/sites-available/default b/raddb/sites-available/default index 7d5c75ba8da..fd51c6d5785 100644 --- a/raddb/sites-available/default +++ b/raddb/sites-available/default @@ -640,9 +640,8 @@ post-auth { # sql_log # - # Un-comment the following if you have set - # 'edir_account_policy_check = yes' in the ldap module sub-section of - # the 'modules' section. + # Un-comment the following if you have set 'edir = yes' + # in the ldap module sub-section of the 'modules' section. # # ldap diff --git a/src/modules/rlm_ldap/all.mk.in b/src/modules/rlm_ldap/all.mk.in index 591728e52cd..1459ab3dd08 100644 --- a/src/modules/rlm_ldap/all.mk.in +++ b/src/modules/rlm_ldap/all.mk.in @@ -4,7 +4,7 @@ ifneq "$(TARGETNAME)" "" TARGET := $(TARGETNAME).a endif -SOURCES := $(TARGETNAME).c +SOURCES := $(TARGETNAME).c @edir@ SRC_CFLAGS := @ldap_cflags@ TGT_LDLIBS := @ldap_ldflags@ diff --git a/src/modules/rlm_ldap/edir.c b/src/modules/rlm_ldap/edir.c index 08a64e8f66d..e989dfa9ad0 100644 --- a/src/modules/rlm_ldap/edir.c +++ b/src/modules/rlm_ldap/edir.c @@ -60,8 +60,6 @@ int nmasldap_get_password(LDAP *ld,char *objectDN, char *pwd, size_t *pwdSize); * RequestBer contents: * clientVersion INTEGER * targetObjectDN OCTET STRING - * password1 OCTET STRING - * password2 OCTET STRING * * Description: * This function takes the request BER value and input -- 2.47.3