diff options
| author | Jeremy Allison <jra@samba.org> | 2009-07-28 11:51:58 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-07-28 11:51:58 -0700 |
| commit | 5d05d2299983b5d34615cd269b04806bba173c0d (patch) | |
| tree | 05b72de06182ef588d5cf1bc14806a0d22144b92 /source3/libsmb/libsmb_dir.c | |
| parent | 571f20cd4db48c8d510e10b7188678d585abb2d1 (diff) | |
| download | samba-5d05d2299983b5d34615cd269b04806bba173c0d.tar.gz samba-5d05d2299983b5d34615cd269b04806bba173c0d.tar.bz2 samba-5d05d2299983b5d34615cd269b04806bba173c0d.zip | |
Added prefer_ipv4 bool parameter to resolve_name().
W2K3 DC's can have IPv6 addresses but won't serve
krb5/ldap or cldap on those addresses. Make sure when
we're asking for DC's we prefer IPv4.
If you have an IPv6-only network this prioritizing code
will be a no-op. And if you have a mixed network then you
need to prioritize IPv4 due to W2K3 DC's.
Jeremy.
Diffstat (limited to 'source3/libsmb/libsmb_dir.c')
| -rw-r--r-- | source3/libsmb/libsmb_dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c index a3f63f204d..7a6632ae4e 100644 --- a/source3/libsmb/libsmb_dir.c +++ b/source3/libsmb/libsmb_dir.c @@ -615,8 +615,8 @@ SMBC_opendir_ctx(SMBCCTX *context, */ if (!srv && !is_ipaddress(server) && - (resolve_name(server, &rem_ss, 0x1d) || /* LMB */ - resolve_name(server, &rem_ss, 0x1b) )) { /* DMB */ + (resolve_name(server, &rem_ss, 0x1d, false) || /* LMB */ + resolve_name(server, &rem_ss, 0x1b, false) )) { /* DMB */ fstring buserver; @@ -675,7 +675,7 @@ SMBC_opendir_ctx(SMBCCTX *context, return NULL; } } else if (srv || - (resolve_name(server, &rem_ss, 0x20))) { + (resolve_name(server, &rem_ss, 0x20, false))) { /* * If we hadn't found the server, get one now |