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/web | |
| 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/web')
| -rw-r--r-- | source3/web/diagnose.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c index 227c68dd6d..9aba27c774 100644 --- a/source3/web/diagnose.c +++ b/source3/web/diagnose.c @@ -20,8 +20,6 @@ #include "includes.h" #include "web/swat_proto.h" -extern struct in_addr loopback_ip; - #ifdef WITH_WINBIND /* check to see if winbind is running by pinging it */ @@ -36,9 +34,12 @@ BOOL winbindd_running(void) response */ BOOL nmbd_running(void) { + struct in_addr loopback_ip; int fd, count, flags; struct in_addr *ip_list; + loopback_ip.s_addr = htonl(INADDR_LOOPBACK); + if ((fd = open_socket_in(SOCK_DGRAM, 0, 3, interpret_addr("127.0.0.1"), True)) != -1) { if ((ip_list = name_query(fd, "__SAMBA__", 0, @@ -59,9 +60,12 @@ BOOL nmbd_running(void) then closing it */ BOOL smbd_running(void) { + struct in_addr loopback_ip; NTSTATUS status; struct cli_state *cli; + loopback_ip.s_addr = htonl(INADDR_LOOPBACK); + if ((cli = cli_initialise()) == NULL) return False; |