summaryrefslogtreecommitdiffstats
path: root/server/providers
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2009-10-13 12:11:07 +0200
committerStephen Gallagher <sgallagh@redhat.com>2009-10-13 14:01:17 -0400
commit0ab357e3c9dc9cbadc808367db99908591942780 (patch)
tree9510c54f5750336fc2df3f97fd1031e829964a8d /server/providers
parent71159cf77a3534bad75acbafd3120b860ab182e8 (diff)
downloadsssd-0ab357e3c9dc9cbadc808367db99908591942780.tar.gz
sssd-0ab357e3c9dc9cbadc808367db99908591942780.tar.xz
sssd-0ab357e3c9dc9cbadc808367db99908591942780.zip
add a replacement if ldap_control_create is missing
Diffstat (limited to 'server/providers')
-rw-r--r--server/providers/ldap/sdap.c1
-rw-r--r--server/providers/ldap/sdap.h2
-rw-r--r--server/providers/ldap/sdap_async.c12
3 files changed, 7 insertions, 8 deletions
diff --git a/server/providers/ldap/sdap.c b/server/providers/ldap/sdap.c
index 47f76f9cd..ba234ed09 100644
--- a/server/providers/ldap/sdap.c
+++ b/server/providers/ldap/sdap.c
@@ -20,7 +20,6 @@
*/
#define LDAP_DEPRECATED 1
-#include <ldap.h>
#include "util/util.h"
#include "confdb/confdb.h"
#include "providers/ldap/sdap.h"
diff --git a/server/providers/ldap/sdap.h b/server/providers/ldap/sdap.h
index 3aa29a377..650ce5f1e 100644
--- a/server/providers/ldap/sdap.h
+++ b/server/providers/ldap/sdap.h
@@ -21,7 +21,7 @@
#include "confdb/confdb.h"
#include "db/sysdb.h"
-#include <ldap.h>
+#include "util/sss_ldap.h"
struct sdap_msg {
struct sdap_msg *next;
diff --git a/server/providers/ldap/sdap_async.c b/server/providers/ldap/sdap_async.c
index 80b7e046c..4f9294c51 100644
--- a/server/providers/ldap/sdap_async.c
+++ b/server/providers/ldap/sdap_async.c
@@ -676,10 +676,10 @@ static struct tevent_req *simple_bind_send(TALLOC_CTX *memctx,
state->user_dn = user_dn;
state->pw = pw;
- ret = ldap_control_create(LDAP_CONTROL_PASSWORDPOLICYREQUEST, 0, NULL, 0,
- &request_controls[0]);
+ ret = sss_ldap_control_create(LDAP_CONTROL_PASSWORDPOLICYREQUEST,
+ 0, NULL, 0, &request_controls[0]);
if (ret != LDAP_SUCCESS) {
- DEBUG(1, ("ldap_control_create failed.\n"));
+ DEBUG(1, ("sss_ldap_control_create failed.\n"));
goto fail;
}
request_controls[1] = NULL;
@@ -2699,10 +2699,10 @@ struct tevent_req *sdap_exop_modify_passwd_send(TALLOC_CTX *memctx,
return NULL;
}
- ret = ldap_control_create(LDAP_CONTROL_PASSWORDPOLICYREQUEST, 0, NULL, 0,
- &request_controls[0]);
+ ret = sss_ldap_control_create(LDAP_CONTROL_PASSWORDPOLICYREQUEST,
+ 0, NULL, 0, &request_controls[0]);
if (ret != LDAP_SUCCESS) {
- DEBUG(1, ("ldap_control_create failed.\n"));
+ DEBUG(1, ("sss_ldap_control_create failed.\n"));
goto fail;
}
request_controls[1] = NULL;