diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-10 18:42:07 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:19 +0100 |
| commit | 3da665e9ac324320fed68a21163fffdf4bd3df89 (patch) | |
| tree | d9c3dd8c580d04d6ff9ec4549cbda7f1e096489f /source4/libcli | |
| parent | 3971827b6ee7c84beaf4449e3c12dfe9f2d62c77 (diff) | |
| download | samba-3da665e9ac324320fed68a21163fffdf4bd3df89.tar.gz samba-3da665e9ac324320fed68a21163fffdf4bd3df89.tar.bz2 samba-3da665e9ac324320fed68a21163fffdf4bd3df89.zip | |
r26385: Integrate gensec-socket into gensec.
(This used to be commit 78bb444b4b73df9a84f8702814f9b30b32ffd885)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/ldap/ldap_bind.c | 3 | ||||
| -rw-r--r-- | source4/libcli/nbt/namerefresh.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c index bd548be38e..fd15ff2fc7 100644 --- a/source4/libcli/ldap/ldap_bind.c +++ b/source4/libcli/ldap/ldap_bind.c @@ -26,7 +26,6 @@ #include "libcli/ldap/ldap_client.h" #include "lib/tls/tls.h" #include "auth/gensec/gensec.h" -#include "auth/gensec/socket.h" #include "auth/credentials/credentials.h" #include "lib/stream/packet.h" #include "param/param.h" @@ -221,6 +220,8 @@ NTSTATUS ldap_bind_sasl(struct ldap_connection *conn, NULL }; + gensec_init(lp_ctx); + status = gensec_client_start(conn, &conn->gensec, NULL, lp_ctx); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Failed to start GENSEC engine (%s)\n", nt_errstr(status))); diff --git a/source4/libcli/nbt/namerefresh.c b/source4/libcli/nbt/namerefresh.c index 3e99854215..8408b4e3c3 100644 --- a/source4/libcli/nbt/namerefresh.c +++ b/source4/libcli/nbt/namerefresh.c @@ -137,7 +137,7 @@ NTSTATUS nbt_name_refresh(struct nbt_name_socket *nbtsock, -/* +/** a wins name refresh with multiple WINS servers and multiple addresses to refresh. Try each WINS server in turn, until we get a reply for each address @@ -152,7 +152,7 @@ struct refresh_wins_state { }; -/* +/** state handler for WINS multi-homed multi-server name refresh */ static void name_refresh_wins_handler(struct nbt_name_request *req) |