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/nmbd/nmbd_browsesync.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/nmbd/nmbd_browsesync.c')
| -rw-r--r-- | source3/nmbd/nmbd_browsesync.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/nmbd/nmbd_browsesync.c b/source3/nmbd/nmbd_browsesync.c index 2e12f72b33..e141b3e288 100644 --- a/source3/nmbd/nmbd_browsesync.c +++ b/source3/nmbd/nmbd_browsesync.c @@ -103,7 +103,7 @@ static void announce_local_master_browser_to_domain_master_browser( struct work_ unstring dmb_name; char *p; - if(ismyip(work->dmb_addr)) { + if(ismyip_v4(work->dmb_addr)) { if( DEBUGLVL( 2 ) ) { dbgtext( "announce_local_master_browser_to_domain_master_browser:\n" ); dbgtext( "We are both a domain and a local master browser for " ); @@ -291,7 +291,7 @@ static void find_domain_master_name_query_success(struct subnet_record *subrec, /* First check if we already have a dmb for this workgroup. */ - if(!is_zero_ip(work->dmb_addr) && ip_equal(work->dmb_addr, answer_ip)) { + if(!is_zero_ip_v4(work->dmb_addr) && ip_equal(work->dmb_addr, answer_ip)) { /* Do the local master browser announcement to the domain master browser name and IP. */ announce_local_master_browser_to_domain_master_browser( work ); @@ -300,7 +300,7 @@ static void find_domain_master_name_query_success(struct subnet_record *subrec, sync_with_dmb(work); return; } else { - zero_ip(&work->dmb_addr); + zero_ip_v4(&work->dmb_addr); } /* Now initiate the node status request. */ @@ -526,7 +526,7 @@ static void find_all_domain_master_names_query_success(struct subnet_record *sub * Don't send node status requests to ourself. */ - if(ismyip( send_ip )) { + if(ismyip_v4( send_ip )) { if( DEBUGLVL( 5 ) ) { dbgtext( "find_all_domain_master_names_query_succes:\n" ); dbgtext( "Not sending node status to our own IP " ); |