check for INADDR_LOOPBACK
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1062 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -120,6 +120,10 @@ copy_encrypted (int fd1, int fd2, des_cblock *iv,
|
|||||||
#define X_UNIX_PATH "/tmp/.X11-unix/X"
|
#define X_UNIX_PATH "/tmp/.X11-unix/X"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef INADDR_LOOPBACK
|
||||||
|
#define INADDR_LOOPBACK 0x7f000001
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Allocate and listen on a local X server socket and a TCP socket.
|
* Allocate and listen on a local X server socket and a TCP socket.
|
||||||
* Return the display number.
|
* Return the display number.
|
||||||
@@ -133,7 +137,6 @@ get_xsockets (int *unix_socket, int *tcp_socket)
|
|||||||
struct sockaddr_in tcpaddr;
|
struct sockaddr_in tcpaddr;
|
||||||
int dpy;
|
int dpy;
|
||||||
int oldmask;
|
int oldmask;
|
||||||
struct hostent *h;
|
|
||||||
struct in_addr local;
|
struct in_addr local;
|
||||||
char *dir, *p;
|
char *dir, *p;
|
||||||
|
|
||||||
@@ -148,11 +151,7 @@ get_xsockets (int *unix_socket, int *tcp_socket)
|
|||||||
umask (oldmask);
|
umask (oldmask);
|
||||||
free (dir);
|
free (dir);
|
||||||
|
|
||||||
h = gethostbyname ("localhost");
|
local.s_addr = htonl(INADDR_LOOPBACK);
|
||||||
if (h)
|
|
||||||
memcpy (&local, h->h_addr, sizeof(local));
|
|
||||||
else
|
|
||||||
local.s_addr = INADDR_LOOPBACK;
|
|
||||||
|
|
||||||
for(dpy = 4; dpy < 256; ++dpy) {
|
for(dpy = 4; dpy < 256; ++dpy) {
|
||||||
unixfd = socket (AF_UNIX, SOCK_STREAM, 0);
|
unixfd = socket (AF_UNIX, SOCK_STREAM, 0);
|
||||||
@@ -251,10 +250,6 @@ connect_local_xsocket (unsigned dnr)
|
|||||||
return fd;
|
return fd;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef INADDR_LOOPBACK
|
|
||||||
#define INADDR_LOOPBACK 0x7f000001
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int
|
int
|
||||||
create_and_write_cookie (char *xauthfile,
|
create_and_write_cookie (char *xauthfile,
|
||||||
u_char *cookie,
|
u_char *cookie,
|
||||||
|
Reference in New Issue
Block a user