summaryrefslogtreecommitdiffstats
path: root/src/providers/ldap
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2010-05-07 17:19:00 -0400
committerStephen Gallagher <sgallagh@redhat.com>2010-05-07 17:19:00 -0400
commit57614e56dd272db0f71abc442b1515d79fd16169 (patch)
treea69750b3275692fd6dd370da90cce74ad2615e2a /src/providers/ldap
parent973b7c27c0b294b8b2f120296f64c6a3a36e44b7 (diff)
downloadsssd-57614e56dd272db0f71abc442b1515d79fd16169.tar.gz
sssd-57614e56dd272db0f71abc442b1515d79fd16169.tar.xz
sssd-57614e56dd272db0f71abc442b1515d79fd16169.zip
Revert "Add dynamic DNS updates to FreeIPA"
This reverts commit 973b7c27c0b294b8b2f120296f64c6a3a36e44b7. While this patch applied cleanly, it was uncompilable. Reverting until it can be properly merged.
Diffstat (limited to 'src/providers/ldap')
-rw-r--r--src/providers/ldap/sdap_async_private.h2
-rw-r--r--src/providers/ldap/sdap_fd_events.c28
2 files changed, 14 insertions, 16 deletions
diff --git a/src/providers/ldap/sdap_async_private.h b/src/providers/ldap/sdap_async_private.h
index c74a7e60c..75597c6d3 100644
--- a/src/providers/ldap/sdap_async_private.h
+++ b/src/providers/ldap/sdap_async_private.h
@@ -34,8 +34,6 @@ void sdap_ldap_result(struct tevent_context *ev, struct tevent_fd *fde,
int setup_ldap_connection_callbacks(struct sdap_handle *sh,
struct tevent_context *ev);
-int get_fd_from_ldap(LDAP *ldap, int *fd);
-
errno_t sdap_set_connected(struct sdap_handle *sh, struct tevent_context *ev);
int sdap_op_add(TALLOC_CTX *memctx, struct tevent_context *ev,
diff --git a/src/providers/ldap/sdap_fd_events.c b/src/providers/ldap/sdap_fd_events.c
index 327829630..11527789f 100644
--- a/src/providers/ldap/sdap_fd_events.c
+++ b/src/providers/ldap/sdap_fd_events.c
@@ -33,20 +33,6 @@ struct sdap_fd_events {
#endif
};
-int get_fd_from_ldap(LDAP *ldap, int *fd)
-{
- int ret;
-
- ret = ldap_get_option(ldap, LDAP_OPT_DESC, fd);
- if (ret != LDAP_OPT_SUCCESS) {
- DEBUG(1, ("Failed to get fd from ldap!!\n"));
- *fd = -1;
- return EIO;
- }
-
- return EOK;
-}
-
#ifdef HAVE_LDAP_CONNCB
static int remove_connection_callback(TALLOC_CTX *mem_ctx)
{
@@ -149,6 +135,20 @@ static void sdap_ldap_connect_callback_del(LDAP *ld, Sockbuf *sb,
#else
+static int get_fd_from_ldap(LDAP *ldap, int *fd)
+{
+ int ret;
+
+ ret = ldap_get_option(ldap, LDAP_OPT_DESC, fd);
+ if (ret != LDAP_OPT_SUCCESS) {
+ DEBUG(1, ("Failed to get fd from ldap!!\n"));
+ *fd = -1;
+ return EIO;
+ }
+
+ return EOK;
+}
+
static int sdap_install_ldap_callbacks(struct sdap_handle *sh,
struct tevent_context *ev)
{