aboutsummaryrefslogtreecommitdiff
path: root/src/server_socket.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/server_socket.c')
-rw-r--r--src/server_socket.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/server_socket.c b/src/server_socket.c
index 39639959..4616fa25 100644
--- a/src/server_socket.c
+++ b/src/server_socket.c
@@ -19,7 +19,7 @@
#include "config.h"
-#ifdef HAVE_STRUCT_UCRED
+#if HAVE_STRUCT_UCRED
#define _GNU_SOURCE 1
#endif
@@ -127,7 +127,7 @@ one_socket_to_string(const struct one_socket *s)
static int
get_remote_uid(int fd)
{
-#ifdef HAVE_STRUCT_UCRED
+#if HAVE_STRUCT_UCRED
struct ucred cred;
socklen_t len = sizeof (cred);
@@ -136,7 +136,7 @@ get_remote_uid(int fd)
return cred.uid;
#else
-#ifdef HAVE_GETPEEREID
+#if HAVE_GETPEEREID
uid_t euid;
gid_t egid;
@@ -346,7 +346,7 @@ server_socket_add_address(struct server_socket *ss,
return s;
}
-#ifdef HAVE_TCP
+#if 1
/**
* Add a listener on a port on all IPv4 interfaces.
@@ -385,13 +385,13 @@ server_socket_add_port_ipv6(struct server_socket *ss, unsigned port)
}
#endif /* HAVE_IPV6 */
-#endif /* HAVE_TCP */
+#endif
bool
server_socket_add_port(struct server_socket *ss, unsigned port,
GError **error_r)
{
-#ifdef HAVE_TCP
+#if 1
if (port == 0 || port > 0xffff) {
g_set_error(error_r, server_socket_quark(), 0,
"Invalid TCP port");
@@ -406,21 +406,21 @@ server_socket_add_port(struct server_socket *ss, unsigned port,
++ss->next_serial;
return true;
-#else /* HAVE_TCP */
+#else
(void)ss;
(void)port;
g_set_error(error_r, server_socket_quark(), 0,
"TCP support is disabled");
return false;
-#endif /* HAVE_TCP */
+#endif
}
bool
server_socket_add_host(struct server_socket *ss, const char *hostname,
unsigned port, GError **error_r)
{
-#ifdef HAVE_TCP
+#if 1
struct addrinfo *ai = resolve_host_port(hostname, port,
AI_PASSIVE, SOCK_STREAM,
error_r);
@@ -435,7 +435,7 @@ server_socket_add_host(struct server_socket *ss, const char *hostname,
++ss->next_serial;
return true;
-#else /* HAVE_TCP */
+#else
(void)ss;
(void)hostname;
(void)port;
@@ -443,14 +443,14 @@ server_socket_add_host(struct server_socket *ss, const char *hostname,
g_set_error(error_r, server_socket_quark(), 0,
"TCP support is disabled");
return false;
-#endif /* HAVE_TCP */
+#endif
}
bool
server_socket_add_path(struct server_socket *ss, const char *path,
GError **error_r)
{
-#ifdef HAVE_UN
+#if CONFIG_UD
struct sockaddr_un s_un;
size_t path_length = strlen(path);
@@ -471,13 +471,13 @@ server_socket_add_path(struct server_socket *ss, const char *path,
s->path = g_strdup(path);
return true;
-#else /* !HAVE_UN */
+#else
(void)ss;
(void)path;
g_set_error(error_r, server_socket_quark(), 0,
"UNIX domain socket support is disabled");
return false;
-#endif /* !HAVE_UN */
+#endif
}