diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 04:02:47 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 04:02:47 +0100 |
commit | 31fa08dcbdc643ec738474c0be471e77925f76fc (patch) | |
tree | c4337b4bd77a31f4f593d8c94bbd15b796123117 /source3/utils/net_dns.c | |
parent | 5a56c0adf2c63602b819d052644cb14caf732438 (diff) | |
parent | 7b186c48d365ae8eda81ae9a0af100d2214bee32 (diff) | |
download | samba-31fa08dcbdc643ec738474c0be471e77925f76fc.tar.gz samba-31fa08dcbdc643ec738474c0be471e77925f76fc.tar.bz2 samba-31fa08dcbdc643ec738474c0be471e77925f76fc.zip |
Merge branch 'master' of /home/jelmer/samba3
Conflicts:
lib/replace/README
lib/replace/libreplace.m4
lib/replace/replace.c
source3/include/proto.h
source3/lib/system.c
Diffstat (limited to 'source3/utils/net_dns.c')
-rw-r--r-- | source3/utils/net_dns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/utils/net_dns.c b/source3/utils/net_dns.c index 4e617a1968..f4ad6f7b47 100644 --- a/source3/utils/net_dns.c +++ b/source3/utils/net_dns.c @@ -169,7 +169,7 @@ int get_my_ip_address( struct sockaddr_storage **pp_ss ) continue; /* Don't register loopback addresses */ - if (is_loopback_addr(nic_sa_storage)) { + if (is_loopback_addr((struct sockaddr *)nic_sa_storage)) { continue; } |