rpms/sssd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix multicast checks in the SSSD

Browse Source 
- Resolves: rhbz#1007475 - The multicast check is wrong in the sudo source
                           code getting the host info
This commit is contained in:
Jakub Hrozek 2013-09-26 01:33:52 +02:00
parent 8d72fcd900
commit 3ec8adb72a
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
0015-Convert-IN_MULTICAST-parameter-to-host-order.patch Normal file
View File

@ -0,0 +1,57 @@
From a9b2c8fb47fc334c7ba9b229cde18d168059c096 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Thu, 12 Sep 2013 18:45:54 +0200
Subject: [PATCH] Convert IN_MULTICAST parameter to host order
https://fedorahosted.org/sssd/ticket/2087
IN_MULTICAST accepts address in the host order, but network order was
supplied.
---
src/monitor/monitor_netlink.c | 2 +-
src/providers/dp_dyndns.c | 2 +-
src/providers/ldap/sdap_async_sudo_hostinfo.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/monitor/monitor_netlink.c b/src/monitor/monitor_netlink.c
index c013423780f318f2a0f12dd5fa50babe12cdcd18..6baf13652b3c42ad92669272f262ac8b59450efe 100644
--- a/src/monitor/monitor_netlink.c
+++ b/src/monitor/monitor_netlink.c
@@ -610,7 +610,7 @@ static bool route_is_multicast(struct rtnl_route *route_obj)
return false;
}
- return IN_MULTICAST(addr4->s_addr);
+ return IN_MULTICAST(ntohl(addr4->s_addr));
} else if (nl_addr_get_family(nl) == AF_INET6) {
addr6 = nl_addr_get_binary_addr(nl);
if (!addr6) {
diff --git a/src/providers/dp_dyndns.c b/src/providers/dp_dyndns.c
index 7a342d1edd14a023322d0f9ac92fcf6bea728571..cd11431324112eb16a249fabd29721a650142456 100644
--- a/src/providers/dp_dyndns.c
+++ b/src/providers/dp_dyndns.c
@@ -184,7 +184,7 @@ ok_for_dns(struct sockaddr *sa)
} else if (inet_netof(*addr) == IN_LOOPBACKNET) {
DEBUG(SSSDBG_FUNC_DATA, ("Loopback IPv4 address %s\n", straddr));
return false;
- } else if ((addr->s_addr & 0xffff0000) == 0xa9fe0000) {
+ } else if ((addr->s_addr & htonl(0xffff0000)) == htonl(0xa9fe0000)) {
/* 169.254.0.0/16 */
DEBUG(SSSDBG_FUNC_DATA, ("Link-local IPv4 address %s\n", straddr));
return false;
diff --git a/src/providers/ldap/sdap_async_sudo_hostinfo.c b/src/providers/ldap/sdap_async_sudo_hostinfo.c
index 4e33babd505dd218ddfd37af21e62fb0bcbe451c..f0c728108f19d965c4b1f07f1067d6862fd0c371 100644
--- a/src/providers/ldap/sdap_async_sudo_hostinfo.c
+++ b/src/providers/ldap/sdap_async_sudo_hostinfo.c
@@ -239,7 +239,7 @@ static int sdap_sudo_get_ip_addresses(TALLOC_CTX *mem_ctx,
}
/* ignore multicast */
- if (IN_MULTICAST(ip4_addr->sin_addr.s_addr)) {
+ if (IN_MULTICAST(ntohl(ip4_addr->sin_addr.s_addr))) {
continue;
}
--
1.8.3.1

8
sssd.spec
View File

@ -8,7 +8,7 @@
Name: sssd
Version: 1.11.0
Release: 2%{?dist}
Release: 3%{?dist}
Group: Applications/System
Summary: System Security Services Daemon
License: GPLv3+
@ -31,6 +31,7 @@ Patch0011: 0011-krb5-Remove-unused-function.patch
Patch0012: 0012-krb5-Add-file-dir-path-precheck.patch
Patch0013: 0013-krb5_child-Simplify-ccache-creation.patch
Patch0014: 0014-krb5-Remove-unused-helper-functions.patch
Patch0015: 0015-Convert-IN_MULTICAST-parameter-to-host-order.patch
### Dependencies ###
Requires: sssd-common = %{version}-%{release}
@ -690,6 +691,11 @@ fi
%postun -n libsss_idmap -p /sbin/ldconfig
%changelog
* Thu Sep 26 2013 Jakub Hrozek <jhrozek@redhat.com> - 1.11.0-3
- Fix multicast checks in the SSSD
- Resolves: rhbz#1007475 - The multicast check is wrong in the sudo source
code getting the host info
* Wed Aug 28 2013 Jakub Hrozek <jhrozek@redhat.com> - 1.11.0-2
- Backport simplification of ccache management from 1.11.1
- Resolves: rhbz#1010553 - sssd setting KRB5CCNAME=(null) on login