include/libadminutil/admutil.h | 6 ++++++
lib/libadminutil/admutil.c | 20 ++++++++++++++++++++
lib/libadminutil/admutil_pvt.h | 2 ++
3 files changed, 28 insertions(+)
New commits:
commit 83f800df5019b54c06b3c4cd1d5b64234f1f5d9d
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue Sep 2 11:20:09 2014 -0400
Ticket 47850 - "nsslapd-allow-anonymous-access: rootdse" makes login as
"admin"
fail at the first time
Description: New to add two new config attributes to adm.conf
authdn: <DN of user in o=netscaperoot>
authpw: <password for authdn>
Created getter functions to retrieve these values
https://fedorahosted.org/389/ticket/47850
Reviewed by: rmeggins(Thanks!)
diff --git a/include/libadminutil/admutil.h b/include/libadminutil/admutil.h
index a1baa36..70cde0d 100644
--- a/include/libadminutil/admutil.h
+++ b/include/libadminutil/admutil.h
@@ -214,6 +214,12 @@ PR_IMPLEMENT(char*)
admldapGetLdapStart(AdmldapInfo info);
PR_IMPLEMENT(char*)
+admldapGetAuthPasswd(AdmldapInfo info);
+
+PR_IMPLEMENT(char*)
+admldapGetAuthDN(AdmldapInfo info);
+
+PR_IMPLEMENT(char*)
admldapGetConfigFileName(AdmldapInfo info);
PR_IMPLEMENT(char*)
diff --git a/lib/libadminutil/admutil.c b/lib/libadminutil/admutil.c
index 1ab0151..f896655 100644
--- a/lib/libadminutil/admutil.c
+++ b/lib/libadminutil/admutil.c
@@ -1258,6 +1258,10 @@ admldapBuildInfoOnly(char* configRoot, int *errorcode)
return NULL;
}
+ /* Get the console authentication DN and password - if it is set */
+ admInfo->authDN = treeFindValueAt(admInfo->configInfo, "authdn", 0);
+ admInfo->authPasswd = treeFindValueAt(admInfo->configInfo, "authpw",
0);
+
if (admutil_ldap_url_parse(admInfo->serverDirectoryURL, &ldapInfo, 0,
&admInfo->secure)) {
*errorcode = ADMUTIL_SYSTEM_ERR;
destroyAdmldap((AdmldapInfo)admInfo);
@@ -1788,6 +1792,22 @@ admldapGetLdapStart(AdmldapInfo info)
}
PR_IMPLEMENT(char*)
+admldapGetAuthDN(AdmldapInfo info)
+{
+ AdmldapHdnlPtr admInfo = (AdmldapHdnlPtr)info;
+
+ return admInfo->authDN;
+}
+
+PR_IMPLEMENT(char*)
+admldapGetAuthPasswd(AdmldapInfo info)
+{
+ AdmldapHdnlPtr admInfo = (AdmldapHdnlPtr)info;
+
+ return admInfo->authPasswd;
+}
+
+PR_IMPLEMENT(char*)
admldapGetConfigFileName(AdmldapInfo info)
{
AdmldapHdnlPtr admInfo = (AdmldapHdnlPtr)info;
diff --git a/lib/libadminutil/admutil_pvt.h b/lib/libadminutil/admutil_pvt.h
index c242774..f0cd3fe 100644
--- a/lib/libadminutil/admutil_pvt.h
+++ b/lib/libadminutil/admutil_pvt.h
@@ -59,6 +59,8 @@ typedef struct _AdmldapHdnl {
char *sieDN;
char *userDN;
char *passwd;
+ char *authDN;
+ char *authPasswd;
int secure;
} AdmldapHdnl;