summaryrefslogtreecommitdiff
path: root/source3/libads
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2008-12-02 23:29:57 -0800
committerTim Prouty <tprouty@samba.org>2008-12-03 10:40:20 -0800
commit1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e (patch)
treea43eb854b68ef6d65d6120d5ec0441bc26ea9612 /source3/libads
parentfcbf88115c217cfe5090f8d60ab7627681c648c8 (diff)
downloadsamba-1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e.tar.gz
samba-1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e.tar.bz2
samba-1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e.zip
s3: Change sockaddr util function names for consistency
Also eliminates name conflicts with OneFS system libraries
Diffstat (limited to 'source3/libads')
-rw-r--r--source3/libads/kerberos.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 4658f66cfd..7dfc19b462 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -772,7 +772,7 @@ static char *get_kdc_ip_string(char *mem_ctx,
get_kdc_list(realm, sitename, &ip_srv_site, &count_site);
for (i = 0; i < count_site; i++) {
- if (addr_equal((struct sockaddr *)&ip_srv_site[i].ss,
+ if (sockaddr_equal((struct sockaddr *)&ip_srv_site[i].ss,
(struct sockaddr *)pss)) {
continue;
}
@@ -795,13 +795,13 @@ static char *get_kdc_ip_string(char *mem_ctx,
for (i = 0; i < count_nonsite; i++) {
int j;
- if (addr_equal((struct sockaddr *)&ip_srv_nonsite[i].ss, (struct sockaddr *)pss)) {
+ if (sockaddr_equal((struct sockaddr *)&ip_srv_nonsite[i].ss, (struct sockaddr *)pss)) {
continue;
}
/* Ensure this isn't an IP already seen (YUK! this is n*n....) */
for (j = 0; j < count_site; j++) {
- if (addr_equal((struct sockaddr *)&ip_srv_nonsite[i].ss,
+ if (sockaddr_equal((struct sockaddr *)&ip_srv_nonsite[i].ss,
(struct sockaddr *)&ip_srv_site[j].ss)) {
break;
}