summaryrefslogtreecommitdiff
path: root/source4/libcli/smb_composite
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-10-23 11:23:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:10 -0500
commit3608b6af426c99eaa99f366d556018193a1aaa2d (patch)
treef821465e78b36898e8a8b49a6e6c47fdf58e1434 /source4/libcli/smb_composite
parente2e2bb9245c2db11b1c4b689344523ee7d180911 (diff)
downloadsamba-3608b6af426c99eaa99f366d556018193a1aaa2d.tar.gz
samba-3608b6af426c99eaa99f366d556018193a1aaa2d.tar.bz2
samba-3608b6af426c99eaa99f366d556018193a1aaa2d.zip
r11264: Winbind does not rely on the hostname resolution mechanisms of
composite_connect, so in io.in.dest_host I'm setting the IP address. Gensec does not like that as a target hostname, so if a called name is present, use that. So we can session setup using kerberos now. Volker (This used to be commit c26b432c27954c8dc6ac8e702bd5e34a351d15bd)
Diffstat (limited to 'source4/libcli/smb_composite')
-rw-r--r--source4/libcli/smb_composite/connect.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index 466d86233a..4e9ee48cb7 100644
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -355,7 +355,11 @@ static NTSTATUS connect_resolve(struct composite_context *c,
conn->in.hostnames = talloc_array(state->conn, const char *, 1);
NT_STATUS_HAVE_NO_MEMORY(conn->in.hostnames);
- conn->in.hostnames[0] = state->io->in.dest_host;
+ if (state->io->in.called_name != NULL) {
+ conn->in.hostnames[0] = state->io->in.called_name;
+ } else {
+ conn->in.hostnames[0] = state->io->in.dest_host;
+ }
conn->in.ports = NULL;
if (state->io->in.port != 0) {