diff options
| author | Jeremy Allison <jra@samba.org> | 2007-10-10 18:25:16 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-10-10 18:25:16 -0700 |
| commit | 8e54530b52fd256137740107e9fdf000f00a7a30 (patch) | |
| tree | f9ca56cc0b2eff78c3550c924c79ee4ca0666fd2 /source3/libsmb/libsmbclient.c | |
| parent | 0ec55a246238b6cfb3727942c20cd55a16ab4d4a (diff) | |
| download | samba-8e54530b52fd256137740107e9fdf000f00a7a30.tar.gz samba-8e54530b52fd256137740107e9fdf000f00a7a30.tar.bz2 samba-8e54530b52fd256137740107e9fdf000f00a7a30.zip | |
Add start of IPv6 implementation. Currently most of this is avoiding
IPv6 in winbindd, but moves most of the socket functions that were
wrongly in lib/util.c into lib/util_sock.c and provides generic
IPv4/6 independent versions of most things. Still lots of work
to do, but now I can see how I'll fix the access check code.
Nasty part that remains is the name resolution code which is
used to returning arrays of in_addr structs.
Jeremy.
(This used to be commit 3f6bd0e1ec5cc6670f3d08f76fc2cd94c9cd1a08)
Diffstat (limited to 'source3/libsmb/libsmbclient.c')
| -rw-r--r-- | source3/libsmb/libsmbclient.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c index 45226a028c..49384e2728 100644 --- a/source3/libsmb/libsmbclient.c +++ b/source3/libsmb/libsmbclient.c @@ -654,7 +654,7 @@ smbc_server(SMBCCTX *context, const char *username_used; NTSTATUS status; - zero_ip(&ip); + zero_ip_v4(&ip); ZERO_STRUCT(c); if (server[0] == 0) { @@ -742,7 +742,7 @@ smbc_server(SMBCCTX *context, again: slprintf(ipenv,sizeof(ipenv)-1,"HOST_%s", server_n); - zero_ip(&ip); + zero_ip_v4(&ip); /* have to open a new connection */ if ((c = cli_initialise()) == NULL) { @@ -796,7 +796,7 @@ smbc_server(SMBCCTX *context, /* Only try this if server is an IP address ... */ - if (is_ipaddress(server) && !tried_reverse) { + if (is_ipaddress_v4(server) && !tried_reverse) { fstring remote_name; struct in_addr rem_ip; @@ -962,7 +962,7 @@ smbc_attr_server(SMBCCTX *context, flags |= CLI_FULL_CONNECTION_USE_KERBEROS; } - zero_ip(&ip); + zero_ip_v4(&ip); nt_status = cli_full_connection(&ipc_cli, global_myname(), server, &ip, 0, "IPC$", "?????", @@ -2761,7 +2761,7 @@ smbc_opendir_ctx(SMBCCTX *context, * LMB or DMB */ if (!srv && - !is_ipaddress(server) && + !is_ipaddress_v4(server) && (resolve_name(server, &rem_ip, 0x1d) || /* LMB */ resolve_name(server, &rem_ip, 0x1b) )) { /* DMB */ |