diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-05-29 12:49:47 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-05-31 11:09:41 +0900 |
| commit | 00463fbf0dcdc9e66bd295dd3ba60454ce59a331 (patch) | |
| tree | 3617ffc2d2e7c422a1d188b13011ac0ad9d60806 /src/core/dbus-socket.c | |
| parent | fa65c28176c09a8f56953898771af25db0d67d79 (diff) | |
| download | systemd-00463fbf0dcdc9e66bd295dd3ba60454ce59a331.tar.gz | |
load-fragment: make SocketProtocol= accept the empty string
Diffstat (limited to 'src/core/dbus-socket.c')
| -rw-r--r-- | src/core/dbus-socket.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c index 73bb4c74c8..88e180a037 100644 --- a/src/core/dbus-socket.c +++ b/src/core/dbus-socket.c @@ -142,7 +142,10 @@ static inline bool check_size_t_truncation(uint64_t t) { return (size_t) t == t; } -static inline const char* socket_protocol_to_name_supported(int32_t i) { +static inline const char* supported_socket_protocol_to_string(int32_t i) { + if (i == IPPROTO_IP) + return ""; + if (!IN_SET(i, IPPROTO_UDPLITE, IPPROTO_SCTP)) return NULL; @@ -156,7 +159,7 @@ static BUS_DEFINE_SET_TRANSIENT_PARSE(bind_ipv6_only, SocketAddressBindIPv6Only, static BUS_DEFINE_SET_TRANSIENT_STRING_WITH_CHECK(fdname, fdname_is_valid); static BUS_DEFINE_SET_TRANSIENT_STRING_WITH_CHECK(ifname, ifname_valid); static BUS_DEFINE_SET_TRANSIENT_TO_STRING_ALLOC(ip_tos, "i", int32_t, int, "%" PRIi32, ip_tos_to_string_alloc); -static BUS_DEFINE_SET_TRANSIENT_TO_STRING(socket_protocol, "i", int32_t, int, "%" PRIi32, socket_protocol_to_name_supported); +static BUS_DEFINE_SET_TRANSIENT_TO_STRING(socket_protocol, "i", int32_t, int, "%" PRIi32, supported_socket_protocol_to_string); static int bus_socket_set_transient_property( Socket *s, |