diff options
| author | Gerald Carter <jerry@samba.org> | 2003-06-25 17:41:05 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-06-25 17:41:05 +0000 |
| commit | f51d769dd303027a3dbf46fc89a482933988e866 (patch) | |
| tree | 5bb400a9df1f6fb27f2b045a6521e2995de8c686 /source3/include | |
| parent | eb61c8238298e97644202139e6d7f55e46eb9c26 (diff) | |
| download | samba-f51d769dd303027a3dbf46fc89a482933988e866.tar.gz samba-f51d769dd303027a3dbf46fc89a482933988e866.tar.bz2 samba-f51d769dd303027a3dbf46fc89a482933988e866.zip | |
large change:
*) consolidates the dc location routines again (dns
and netbios) get_dc_list() or get_sorted_dc_list()
is the authoritative means of locating DC's again.
(also inludes a flag to get_dc_list() to define
if this should be a DNS only lookup or not)
(however, if you set "name resolve order = hosts wins"
you could still get DNS queries for domain name IFF
ldap_domain2hostlist() fails. The answer? Fix your DNS
setup)
*) enabled DOMAIN<0x1c> lookups to be funneled through
resolve_hosts resulting in a call to ldap_domain2hostlist()
if lp_security() == SEC_ADS
*) enables name cache for winbind ADS backend
*) enable the negative connection cache for winbind
ADS backend
*) removes some old dead code
*) consolidates some duplicate code
*) moves the internal_name_resolve() to use an IP/port pair
to deal with SRV RR dns replies. The namecache code
also supports the IP:port syntax now as well.
*) removes 'ads server' and moves the functionality back
into 'password server' (which can support "hostname:port"
syntax now but works fine with defaults depending on
the value of lp_security())
(This used to be commit d7f7fcda425bef380441509734eca33da943c091)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/smb.h | 8 | ||||
| -rw-r--r-- | source3/include/smb_macros.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 27c966914f..955a7cfa74 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1618,4 +1618,12 @@ typedef struct { #include "popt_common.h" +#define PORT_NONE 0 + +/* used by the IP comparison function */ +struct ip_service { + struct in_addr ip; + unsigned port; +}; + #endif /* _SMB_H */ diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index aae3b46f7a..7fcf872b60 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -202,6 +202,7 @@ true if two IP addresses are equal ****************************************************************************/ #define ip_equal(ip1,ip2) ((ip1).s_addr == (ip2).s_addr) +#define ip_service_equal(ip1,ip2) ( ((ip1).ip.s_addr == (ip2).ip.s_addr) && ((ip1).port == (ip2).port) ) /***************************************************************** splits out the last subkey of a key |