From 836dc25a586468a37e645a8b035184c34fedc4bb Mon Sep 17 00:00:00 2001 From: William Grzybowski Date: Fri, 8 Nov 2013 10:58:10 +0000 Subject: security/sssd: update to 1.9.6 - Update to 1.9.6 - Remove FreeBSD < 8.0-RELEASE check (unsupported) PR: ports/183750 Submitted by: Lukas Slebodnik (maintainer) --- security/sssd/Makefile | 23 ++- security/sssd/distinfo | 4 +- security/sssd/files/bsdnss.c | 179 +++++++++++---------- security/sssd/files/patch-Makefile.am | 60 ++----- security/sssd/files/patch-configure.ac | 24 --- security/sssd/files/patch-src__confdb__confdb.c | 10 +- .../sssd/files/patch-src__external__inotify.m4 | 29 ++++ .../files/patch-src__lib__idmap__sss_idmap_conv.c | 24 --- security/sssd/files/patch-src__monitor__monitor.c | 40 ----- .../files/patch-src__providers__data_provider_be.c | 34 ---- .../sssd/files/patch-src__providers__fail_over.c | 16 +- .../files/patch-src__providers__ipa__ipa_hbac.h | 24 --- ...ers__krb5__krb5_delayed_online_authentication.c | 32 ++++ .../files/patch-src__providers__ldap__ldap_child.c | 25 --- .../patch-src__providers__ldap__ldap_common.c | 25 --- .../patch-src__providers__ldap__sdap_access.c | 34 ++-- .../patch-src__providers__proxy__proxy_init.c | 111 ------------- ...atch-src__responder__common__responder_common.c | 25 --- .../patch-src__responder__common__responder_dp.c | 34 ---- ...atch-src__responder__common__responder_packet.c | 25 --- .../patch-src__responder__pac__pacsrv_utils.c | 23 --- .../sssd/files/patch-src__sss_client__common.c | 46 ++---- .../sssd/files/patch-src__sss_client__nss_group.c | 53 +++--- ...__util__crypto__libcrypto__crypto_sha512crypt.c | 59 +++---- ...patch-src__util__crypto__nss__nss_sha512crypt.c | 57 +++---- security/sssd/files/patch-src__util__find_uid.c | 20 ++- security/sssd/files/patch-src__util__murmurhash3.c | 27 ---- security/sssd/files/patch-src__util__server.c | 15 +- security/sssd/files/patch-src__util__util.c | 24 --- security/sssd/files/patch-src__util__util.h | 49 ++---- security/sssd/files/sss_bsd_errno.h | 58 +++++++ security/sssd/pkg-plist | 57 ++++++- 32 files changed, 447 insertions(+), 819 deletions(-) delete mode 100644 security/sssd/files/patch-configure.ac create mode 100644 security/sssd/files/patch-src__external__inotify.m4 delete mode 100644 security/sssd/files/patch-src__lib__idmap__sss_idmap_conv.c delete mode 100644 security/sssd/files/patch-src__monitor__monitor.c delete mode 100644 security/sssd/files/patch-src__providers__data_provider_be.c delete mode 100644 security/sssd/files/patch-src__providers__ipa__ipa_hbac.h create mode 100644 security/sssd/files/patch-src__providers__krb5__krb5_delayed_online_authentication.c delete mode 100644 security/sssd/files/patch-src__providers__ldap__ldap_child.c delete mode 100644 security/sssd/files/patch-src__providers__ldap__ldap_common.c delete mode 100644 security/sssd/files/patch-src__providers__proxy__proxy_init.c delete mode 100644 security/sssd/files/patch-src__responder__common__responder_common.c delete mode 100644 security/sssd/files/patch-src__responder__common__responder_dp.c delete mode 100644 security/sssd/files/patch-src__responder__common__responder_packet.c delete mode 100644 security/sssd/files/patch-src__responder__pac__pacsrv_utils.c delete mode 100644 security/sssd/files/patch-src__util__murmurhash3.c delete mode 100644 security/sssd/files/patch-src__util__util.c create mode 100644 security/sssd/files/sss_bsd_errno.h (limited to 'security/sssd') diff --git a/security/sssd/Makefile b/security/sssd/Makefile index 2aff70491693..2c78eeac3246 100644 --- a/security/sssd/Makefile +++ b/security/sssd/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sssd -DISTVERSION= 1.9.5 +DISTVERSION= 1.9.6 CATEGORIES= security MASTER_SITES= https://fedorahosted.org/released/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ @@ -15,7 +15,6 @@ LICENSE= GPLv3 LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \ libtalloc.so:${PORTSDIR}/devel/talloc \ libtevent.so:${PORTSDIR}/devel/tevent \ - libxslt.so:${PORTSDIR}/textproc/libxslt \ libtdb.so:${PORTSDIR}/databases/tdb \ libldb.so:${PORTSDIR}/databases/ldb \ libcares.so:${PORTSDIR}/dns/c-ares \ @@ -30,6 +29,7 @@ LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \ libinotify.so:${PORTSDIR}/devel/libinotify BUILD_DEPENDS= xmlcatalog:${PORTSDIR}/textproc/libxml2 \ docbook-xsl>=1:${PORTSDIR}/textproc/docbook-xsl \ + xsltproc:${PORTSDIR}/textproc/libxslt \ xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr \ krb5>=1.10:${PORTSDIR}/security/krb5 \ nsupdate:${PORTSDIR}/dns/bind99 @@ -44,14 +44,13 @@ CONFIGURE_ARGS= --with-selinux=no --with-semanage=no \ --with-db-path=/var/db/sss --with-pipe-path=/var/run/sss \ --with-pubconf-path=/var/run/sss --with-mcache-path=/var/db/sss_mc \ --with-unicode-lib=libunistring --with-autofs=no -CFLAGS+= -fstack-protector-all -Wno-format -LDFLAGS+= -L${LOCALBASE}/lib -linotify +CFLAGS= -fstack-protector-all PLIST_SUB= PYTHON_VER=${PYTHON_VER} #DEBUG_FLAGS= -g MAKE_ENV+= LINGUAS="bg de eu es fr hu id it ja nb nl pl pt ru sv tg tr uk zh_CN zh_TW" SUB_FILES= pkg-message -USE_AUTOTOOLS= autoconf automake aclocal +USE_AUTOTOOLS= autoconf automake aclocal libtool AUTOMAKE_ARGS= --add-missing USE_LDCONFIG= yes USE_PYTHON= yes @@ -63,9 +62,6 @@ PORTDATA= * .include -.if ${OSVERSION} < 800107 -IGNORE= is not supported prior to 8.0-RELEASE -.endif .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not link on ia64, powerpc, or sparc64 .endif @@ -73,11 +69,11 @@ BROKEN= Does not link on ia64, powerpc, or sparc64 post-patch: @${REINPLACE_CMD} -e 's|SIGCLD|SIGCHLD|g' ${WRKSRC}/src/util/signal.c @${REINPLACE_CMD} -e '/#define SIZE_T_MAX ((size_t) -1)/d' \ - ${WRKSRC}/src/util/util.h + ${WRKSRC}/src/util/util.h @${REINPLACE_CMD} -e '/pam_misc/d' \ - ${WRKSRC}/src/sss_client/pam_test_client.c + ${WRKSRC}/src/sss_client/pam_test_client.c @${REINPLACE_CMD} -e 's|security/pam_misc.h||g' \ - ${WRKSRC}/configure* ${WRKSRC}/src/external/pam.m4 + ${WRKSRC}/configure* ${WRKSRC}/src/external/pam.m4 @${REINPLACE_CMD} -e 's|NSS_STATUS_NOTFOUND|NS_NOTFOUND|g' \ -e 's|NSS_STATUS_UNAVAIL|NS_UNAVAIL|g' \ -e 's|NSS_STATUS_TRYAGAIN|NS_TRYAGAIN|g' \ @@ -85,7 +81,7 @@ post-patch: -e 's|NSS_STATUS_SUCCESS|NS_SUCCESS|g' \ ${WRKSRC}/src/sss_client/common.c @${REINPLACE_CMD} -e 's|security/_pam_macros.h|pam_macros.h|g' \ - ${WRKSRC}/src/sss_client/sss_pam_macros.h + ${WRKSRC}/src/sss_client/sss_pam_macros.h @${REINPLACE_CMD} -e 's|#include ||g' \ -e 's|PAM_BAD_ITEM|PAM_USER_UNKNOWN|g' \ -e 's|security/pam_ext.h|security/pam_appl.h|g' \ @@ -93,7 +89,7 @@ post-patch: -e 's|pam_vsyslog(pamh,|vsyslog(|g' \ ${WRKSRC}/src/sss_client/pam_sss.c @${REINPLACE_CMD} -e '/..MAKE. ..AM_MAKEFLAGS. install-data-hook/d' \ - ${WRKSRC}/Makefile.in + ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' \ -e 's|install-data-hook install-dist_initSCRIPTS|install-dist_initSCRIPTS|g' \ -e 's|install-data-hook|notinstall-data-hook|g' \ @@ -104,6 +100,7 @@ post-patch: ${WRKSRC}/src/man/*xml @${CP} ${FILESDIR}/pam_macros.h ${WRKSRC}/pam_macros.h @${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}/src/sss_client/bsdnss.c + @${CP} ${FILESDIR}/sss_bsd_errno.h ${WRKSRC}/src/util/sss_bsd_errno.h post-install: ${INSTALL_DATA} ${WRKSRC}/src/examples/sssd-example.conf ${STAGEDIR}${ETCDIR}/sssd.conf.sample diff --git a/security/sssd/distinfo b/security/sssd/distinfo index a77fe48a9abc..5efc50253346 100644 --- a/security/sssd/distinfo +++ b/security/sssd/distinfo @@ -1,2 +1,2 @@ -SHA256 (sssd-1.9.5.tar.gz) = a377c436901e92d689de811d48e37d88764460e889e47bfddd90626f0a8a015c -SIZE (sssd-1.9.5.tar.gz) = 3106988 +SHA256 (sssd-1.9.6.tar.gz) = ca96e8d98eb4113396b13d9601dbdd20f4b2f2613d0f29a0157ffd05e3748601 +SIZE (sssd-1.9.6.tar.gz) = 3180066 diff --git a/security/sssd/files/bsdnss.c b/security/sssd/files/bsdnss.c index 147d4554c670..6a1152100c67 100644 --- a/security/sssd/files/bsdnss.c +++ b/security/sssd/files/bsdnss.c @@ -7,37 +7,43 @@ #include extern enum nss_status _nss_sss_getgrent_r(struct group *, char *, size_t, - int *); + int *); extern enum nss_status _nss_sss_getgrnam_r(const char *, struct group *, - char *, size_t, int *); + char *, size_t, int *); extern enum nss_status _nss_sss_getgrgid_r(gid_t gid, struct group *, char *, - size_t, int *); + size_t, int *); extern enum nss_status _nss_sss_setgrent(void); extern enum nss_status _nss_sss_endgrent(void); extern enum nss_status _nss_sss_getpwent_r(struct passwd *, char *, size_t, - int *); + int *); extern enum nss_status _nss_sss_getpwnam_r(const char *, struct passwd *, - char *, size_t, int *); + char *, size_t, int *); extern enum nss_status _nss_sss_getpwuid_r(gid_t gid, struct passwd *, char *, - size_t, int *); + size_t, int *); extern enum nss_status _nss_sss_setpwent(void); extern enum nss_status _nss_sss_endpwent(void); -extern enum nss_status _nss_sss_gethostbyname_r (const char *name, struct hostent * result, - char *buffer, size_t buflen, int *errnop, - int *h_errnop); - -extern enum nss_status _nss_sss_gethostbyname2_r (const char *name, int af, struct hostent * result, - char *buffer, size_t buflen, int *errnop, - int *h_errnop); -extern enum nss_status _nss_sss_gethostbyaddr_r (struct in_addr * addr, int len, int type, - struct hostent * result, char *buffer, - size_t buflen, int *errnop, int *h_errnop); - -extern enum nss_status _nss_sss_getgroupmembership(const char *uname, gid_t agroup, gid_t *groups, - int maxgrp, int *grpcnt); - +extern enum nss_status _nss_sss_gethostbyname_r(const char *name, + struct hostent * result, + char *buffer, size_t buflen, + int *errnop, + int *h_errnop); + +extern enum nss_status _nss_sss_gethostbyname2_r(const char *name, int af, + struct hostent * result, + char *buffer, size_t buflen, + int *errnop, + int *h_errnop); +extern enum nss_status _nss_sss_gethostbyaddr_r(struct in_addr * addr, int len, + int type, + struct hostent * result, + char *buffer, size_t buflen, + int *errnop, int *h_errnop); + +extern enum nss_status _nss_sss_getgroupmembership(const char *uname, + gid_t agroup, gid_t *groups, + int maxgrp, int *grpcnt); NSS_METHOD_PROTOTYPE(__nss_compat_getgroupmembership); NSS_METHOD_PROTOTYPE(__nss_compat_getgrnam_r); @@ -91,24 +97,24 @@ static ns_mtab methods[] = { ns_mtab * nss_module_register(const char *source, unsigned int *mtabsize, - nss_module_unregister_fn *unreg) + nss_module_unregister_fn *unreg) { - *mtabsize = sizeof(methods)/sizeof(methods[0]); - *unreg = NULL; - return (methods); + *mtabsize = sizeof(methods)/sizeof(methods[0]); + *unreg = NULL; + return (methods); } int __nss_compat_getgroupmembership(void *retval, void *mdata, va_list ap) { int (*fn)(const char *, gid_t, gid_t *, int, int *); - - const char *uname; - gid_t agroup; - gid_t *groups; - int maxgrp; - int *grpcnt; - int errnop; - enum nss_status status; + + const char *uname; + gid_t agroup; + gid_t *groups; + int maxgrp; + int *grpcnt; + int errnop = 0; + enum nss_status status; fn = mdata; uname = va_arg(ap, const char *); @@ -123,65 +129,68 @@ int __nss_compat_getgroupmembership(void *retval, void *mdata, va_list ap) int __nss_compat_gethostbyname(void *retval, void *mdata, va_list ap) { - enum nss_status (*fn)(const char *, struct hostent *, char *, size_t, int *, int *); - const char *name; - struct hostent *result; - char buffer[1024]; - size_t buflen = 1024; - int errnop; - int h_errnop; - int af; - enum nss_status status; - fn = mdata; - name = va_arg(ap, const char*); - af = va_arg(ap,int); - result = va_arg(ap,struct hostent *); - status = fn(name, result, buffer, buflen, &errnop, &h_errnop); - status = __nss_compat_result(status,errnop); - h_errno = h_errnop; - return (status); + enum nss_status (*fn)(const char *, struct hostent *, char *, size_t, int *, int *); + const char *name; + struct hostent *result; + char buffer[1024]; + size_t buflen = 1024; + int errnop; + int h_errnop; + int af; + enum nss_status status; + + fn = mdata; + name = va_arg(ap, const char*); + af = va_arg(ap,int); + result = va_arg(ap,struct hostent *); + status = fn(name, result, buffer, buflen, &errnop, &h_errnop); + status = __nss_compat_result(status,errnop); + h_errno = h_errnop; + return (status); } int __nss_compat_gethostbyname2(void *retval, void *mdata, va_list ap) { - enum nss_status (*fn)(const char *, struct hostent *, char *, size_t, int *, int *); - const char *name; - struct hostent *result; - char buffer[1024]; - size_t buflen = 1024; - int errnop; - int h_errnop; - int af; - enum nss_status status; - fn = mdata; - name = va_arg(ap, const char*); - af = va_arg(ap,int); - result = va_arg(ap,struct hostent *); - status = fn(name, result, buffer, buflen, &errnop, &h_errnop); - status = __nss_compat_result(status,errnop); - h_errno = h_errnop; - return (status); + enum nss_status (*fn)(const char *, struct hostent *, char *, size_t, int *, int *); + const char *name; + struct hostent *result; + char buffer[1024]; + size_t buflen = 1024; + int errnop; + int h_errnop; + int af; + enum nss_status status; + + fn = mdata; + name = va_arg(ap, const char*); + af = va_arg(ap,int); + result = va_arg(ap,struct hostent *); + status = fn(name, result, buffer, buflen, &errnop, &h_errnop); + status = __nss_compat_result(status,errnop); + h_errno = h_errnop; + return (status); } int __nss_compat_gethostbyaddr(void *retval, void *mdata, va_list ap) { - struct in_addr *addr; - int len; - int type; - struct hostent *result; - char buffer[1024]; - size_t buflen = 1024; - int errnop; - int h_errnop; - enum nss_status (*fn)(struct in_addr *, int, int, struct hostent *, char *, size_t, int *, int *); - enum nss_status status; - fn = mdata; - addr = va_arg(ap, struct in_addr*); - len = va_arg(ap,int); - type = va_arg(ap,int); - result = va_arg(ap, struct hostent*); - status = fn(addr, len, type, result, buffer, buflen, &errnop, &h_errnop); - status = __nss_compat_result(status,errnop); - h_errno = h_errnop; - return (status); + struct in_addr *addr; + int len; + int type; + struct hostent *result; + char buffer[1024]; + size_t buflen = 1024; + int errnop; + int h_errnop; + enum nss_status (*fn)(struct in_addr *, int, int, struct hostent *, char *, size_t, int *, int *); + enum nss_status status; + + fn = mdata; + addr = va_arg(ap, struct in_addr*); + len = va_arg(ap,int); + type = va_arg(ap,int); + result = va_arg(ap, struct hostent*); + status = fn(addr, len, type, result, buffer, buflen, &errnop, &h_errnop); + status = __nss_compat_result(status,errnop); + h_errno = h_errnop; + return (status); } diff --git a/security/sssd/files/patch-Makefile.am b/security/sssd/files/patch-Makefile.am index 505afc5bbdaa..8070f22bd4d2 100644 --- a/security/sssd/files/patch-Makefile.am +++ b/security/sssd/files/patch-Makefile.am @@ -1,34 +1,25 @@ -From 2f2d2045b64edf63bbfb845095dbfaf754dc5ad3 Mon Sep 17 00:00:00 2001 +From e40f55767383f300f71103ca404b7839b8499104 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 01/34] patch-Makefile.am +Date: Wed, 6 Nov 2013 22:01:20 +0100 +Subject: [PATCH 01/25] patch-Makefile.am --- - Makefile.am | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) + Makefile.am | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) diff --git Makefile.am Makefile.am -index f0ee88b..10e1e73 100644 +index 04df7cb..e2558f7 100644 --- Makefile.am +++ Makefile.am -@@ -649,7 +649,6 @@ sssd_be_SOURCES = \ - src/providers/data_provider_callbacks.c \ - $(SSSD_FAILOVER_OBJ) - sssd_be_LDADD = \ -- -ldl \ - $(SSSD_LIBS) \ - $(CARES_LIBS) \ - libsss_util.la -@@ -772,7 +771,7 @@ sss_sudo_cli_SOURCES = \ - src/sss_client/sudo/sss_sudo_response.c \ - src/sss_client/sudo_testcli/sudo_testcli.c - sss_sudo_cli_CFLAGS = $(AM_CFLAGS) --sss_sudo_cli_LDFLAGS = $(CLIENT_LIBS) -+sss_sudo_cli_LDFLAGS = $(CLIENT_LIBS) -lintl - endif - - if BUILD_SSH -@@ -1159,7 +1158,7 @@ noinst_PROGRAMS += autofs_test_client +@@ -369,6 +369,7 @@ dist_noinst_HEADERS = \ + src/util/sss_selinux.h \ + src/util/sss_utf8.h \ + src/util/sss_ssh.h \ ++ src/util/sss_bsd_errno.h \ + src/util/refcount.h \ + src/util/find_uid.h \ + src/util/user_info_msg.h \ +@@ -1170,7 +1171,7 @@ noinst_PROGRAMS += autofs_test_client endif pam_test_client_SOURCES = src/sss_client/pam_test_client.c @@ -37,7 +28,7 @@ index f0ee88b..10e1e73 100644 if BUILD_AUTOFS autofs_test_client_SOURCES = src/sss_client/autofs/autofs_test_client.c \ -@@ -1173,9 +1172,10 @@ endif +@@ -1184,9 +1185,10 @@ endif # Client Libraries # #################### @@ -50,7 +41,7 @@ index f0ee88b..10e1e73 100644 src/sss_client/nss_passwd.c \ src/sss_client/nss_group.c \ src/sss_client/nss_netgroup.c \ -@@ -1187,7 +1187,7 @@ libnss_sss_la_SOURCES = \ +@@ -1198,7 +1200,7 @@ libnss_sss_la_SOURCES = \ src/sss_client/nss_mc_passwd.c \ src/sss_client/nss_mc_group.c \ src/sss_client/nss_mc.h @@ -59,23 +50,6 @@ index f0ee88b..10e1e73 100644 $(CLIENT_LIBS) \ -module \ -version-info 2:0:0 \ -@@ -1203,6 +1203,7 @@ pam_sss_la_SOURCES = \ - - pam_sss_la_LDFLAGS = \ - $(CLIENT_LIBS) \ -+ -lintl \ - -lpam \ - -module \ - -avoid-version \ -@@ -1727,7 +1728,7 @@ else - mkdir -p $(DESTDIR)$(initdir) - endif - --install-data-hook: -+nopenopeinstall-data-hook: - rm $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2 \ - $(DESTDIR)/$(nsslibdir)/libnss_sss.so - mv $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2.0.0 $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2 -- 1.8.0 diff --git a/security/sssd/files/patch-configure.ac b/security/sssd/files/patch-configure.ac deleted file mode 100644 index 5b846c2b1650..000000000000 --- a/security/sssd/files/patch-configure.ac +++ /dev/null @@ -1,24 +0,0 @@ -From 281379e22034335ebcc64b1759564310cad91bce Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 02/34] patch-configure.ac - ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git configure.ac configure.ac -index 70671ae..0668884 100644 ---- configure.ac -+++ configure.ac -@@ -18,6 +18,7 @@ AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax]) - AM_PROG_CC_C_O - AC_DISABLE_STATIC - AC_PROG_INSTALL -+AM_PROG_AR - AC_PROG_LIBTOOL - AC_CONFIG_MACRO_DIR([m4]) - AM_GNU_GETTEXT([external]) --- -1.8.0 - diff --git a/security/sssd/files/patch-src__confdb__confdb.c b/security/sssd/files/patch-src__confdb__confdb.c index 35e7ecf2e036..ed672f9ce480 100644 --- a/security/sssd/files/patch-src__confdb__confdb.c +++ b/security/sssd/files/patch-src__confdb__confdb.c @@ -1,14 +1,14 @@ -From 18614fe436d525826e260e7a0e8334c41bd2ce37 Mon Sep 17 00:00:00 2001 +From 756e37d0ef957b15d782d5dd87d24e9359541931 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 03/34] patch-src__confdb__confdb.c +Date: Wed, 6 Nov 2013 22:01:20 +0100 +Subject: [PATCH 02/25] patch-src__confdb__confdb.c --- src/confdb/confdb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git src/confdb/confdb.c src/confdb/confdb.c -index d70dc36..9ee1f8c 100644 +index 72c74fe..78b69b8 100644 --- src/confdb/confdb.c +++ src/confdb/confdb.c @@ -28,6 +28,11 @@ @@ -17,7 +17,7 @@ index d70dc36..9ee1f8c 100644 +char *strchrnul(const char *s, int ch) { + char *ret = strchr(s, ch); -+ return ret == NULL ? ((char *)s) + strlen(s) : ret; ++ return ret == NULL ? discard_const_p(char, s) + strlen(s) : ret; +} + #define CONFDB_ZERO_CHECK_OR_JUMP(var, ret, err, label) do { \ diff --git a/security/sssd/files/patch-src__external__inotify.m4 b/security/sssd/files/patch-src__external__inotify.m4 new file mode 100644 index 000000000000..15653cc20910 --- /dev/null +++ b/security/sssd/files/patch-src__external__inotify.m4 @@ -0,0 +1,29 @@ +From 558989d6ac329b4036e02873fb7c981c5912040c Mon Sep 17 00:00:00 2001 +From: Lukas Slebodnik +Date: Thu, 7 Nov 2013 13:28:13 +0100 +Subject: [PATCH] patch-src__external__inotify.m4 + +--- + src/external/inotify.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git src/external/inotify.m4 src/external/inotify.m4 +index 9572f6d2fefedf8a1d6a2468c712a83e7db2969f..2a5a8cf00d80e0979dca50fd102c3dc2872b2970 100644 +--- src/external/inotify.m4 ++++ src/external/inotify.m4 +@@ -20,10 +20,10 @@ int main () { + AS_IF([test x"$inotify_works" != xyes], + [AC_CHECK_LIB([inotify], + [inotify_init], +- [INOTIFY_LIBS="$sss_extra_libdir -linotify" ++ [INOTIFY_LIBS="-L$sss_extra_libdir -linotify" + inotify_works=yes], + [inotify_works=no], +- [$sss_extra_libdir])] ++ [-L$sss_extra_libdir])] + ) + + AS_IF([test x"$inotify_works" = xyes], +-- +1.8.3.1 + diff --git a/security/sssd/files/patch-src__lib__idmap__sss_idmap_conv.c b/security/sssd/files/patch-src__lib__idmap__sss_idmap_conv.c deleted file mode 100644 index 2f85f153e39f..000000000000 --- a/security/sssd/files/patch-src__lib__idmap__sss_idmap_conv.c +++ /dev/null @@ -1,24 +0,0 @@ -From 194aa2e2960a2a67f9c0beb771635b8392e6e337 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 27 Jul 2013 15:25:53 +0200 -Subject: [PATCH 34/34] patch-src__lib__idmap__sss_idmap_conv.c - ---- - src/lib/idmap/sss_idmap_conv.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git src/lib/idmap/sss_idmap_conv.c src/lib/idmap/sss_idmap_conv.c -index a336042..ac07746 100644 ---- src/lib/idmap/sss_idmap_conv.c -+++ src/lib/idmap/sss_idmap_conv.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include "lib/idmap/sss_idmap.h" - #include "lib/idmap/sss_idmap_private.h" --- -1.8.0 - diff --git a/security/sssd/files/patch-src__monitor__monitor.c b/security/sssd/files/patch-src__monitor__monitor.c deleted file mode 100644 index 13bf2c068e07..000000000000 --- a/security/sssd/files/patch-src__monitor__monitor.c +++ /dev/null @@ -1,40 +0,0 @@ -From 628c783aa78c576f10087e3e4812904b90d218b0 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 04/34] patch-src__monitor__monitor.c - ---- - src/monitor/monitor.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git src/monitor/monitor.c src/monitor/monitor.c -index 8612524..3d3cab8 100644 ---- src/monitor/monitor.c -+++ src/monitor/monitor.c -@@ -90,6 +90,11 @@ int cmdline_debug_level; - int cmdline_debug_timestamps; - int cmdline_debug_microseconds; - -+errno_t monitor_config_file_fallback(TALLOC_CTX *mem_ctx, -+ struct mt_ctx *ctx, -+ const char *file, -+ monitor_reconf_fn fn, -+ bool ignore_missing); - struct svc_spy; - - enum mt_svc_type { -@@ -1792,11 +1797,6 @@ done: - talloc_free(tmp_ctx); - } - --errno_t monitor_config_file_fallback(TALLOC_CTX *mem_ctx, -- struct mt_ctx *ctx, -- const char *file, -- monitor_reconf_fn fn, -- bool ignore_missing); - static void rewatch_config_file(struct tevent_context *ev, - struct tevent_timer *te, - struct timeval t, void *ptr) --- -1.8.0 - diff --git a/security/sssd/files/patch-src__providers__data_provider_be.c b/security/sssd/files/patch-src__providers__data_provider_be.c deleted file mode 100644 index 51d5b27516fc..000000000000 --- a/security/sssd/files/patch-src__providers__data_provider_be.c +++ /dev/null @@ -1,34 +0,0 @@ -From f6d110d1f78a78ee957f7fce975d09fc698e0949 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 05/34] patch-src__providers__data_provider_be.c - ---- - src/providers/data_provider_be.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git src/providers/data_provider_be.c src/providers/data_provider_be.c -index 33590ae..1a25959 100644 ---- src/providers/data_provider_be.c -+++ src/providers/data_provider_be.c -@@ -2316,7 +2316,7 @@ static int load_backend_module(struct be_ctx *ctx, - if (!handle) { - DEBUG(0, ("Unable to load %s module with path (%s), error: %s\n", - mod_name, path, dlerror())); -- ret = ELIBACC; -+ ret = ENOENT; - goto done; - } - -@@ -2336,7 +2336,7 @@ static int load_backend_module(struct be_ctx *ctx, - } else { - DEBUG(0, ("Unable to load init fn %s from module %s, error: %s\n", - mod_init_fn_name, mod_name, dlerror())); -- ret = ELIBBAD; -+ ret = ENOENT; - } - goto done; - } --- -1.8.0 - diff --git a/security/sssd/files/patch-src__providers__fail_over.c b/security/sssd/files/patch-src__providers__fail_over.c index b6bd5607d602..b4e30908c064 100644 --- a/security/sssd/files/patch-src__providers__fail_over.c +++ b/security/sssd/files/patch-src__providers__fail_over.c @@ -1,26 +1,26 @@ -From 9c10da92d16e5daa9589ca0e3e5f43f399844071 Mon Sep 17 00:00:00 2001 +From 08bc75705abe29a9e046a0a8871adcf42eeee35c Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 06/34] patch-src__providers__fail_over.c +Date: Wed, 6 Nov 2013 22:01:20 +0100 +Subject: [PATCH 07/25] patch-src__providers__fail_over.c --- src/providers/fail_over.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git src/providers/fail_over.c src/providers/fail_over.c -index e7c4417..120022a 100644 +index 59cbacd..197c0ef 100644 --- src/providers/fail_over.c +++ src/providers/fail_over.c -@@ -1320,7 +1320,7 @@ resolve_srv_recv(struct tevent_req *req, struct fo_server **server) +@@ -1331,7 +1331,7 @@ resolve_srv_recv(struct tevent_req *req, struct fo_server **server) *******************************************************************/ struct resolve_get_domain_state { char *fqdn; - char hostname[HOST_NAME_MAX]; -+ char hostname[_POSIX_HOST_NAME_MAX]; ++ char hostname[_POSIX_HOST_NAME_MAX + 1]; }; static void resolve_get_domain_done(struct tevent_req *subreq); -@@ -1340,13 +1340,13 @@ resolve_get_domain_send(TALLOC_CTX *mem_ctx, +@@ -1351,13 +1351,13 @@ resolve_get_domain_send(TALLOC_CTX *mem_ctx, return NULL; } @@ -32,7 +32,7 @@ index e7c4417..120022a 100644 return NULL; } - state->hostname[HOST_NAME_MAX-1] = '\0'; -+ state->hostname[_POSIX_HOST_NAME_MAX-1] = '\0'; ++ state->hostname[_POSIX_HOST_NAME_MAX] = '\0'; DEBUG(7, ("Host name is: %s\n", state->hostname)); subreq = resolv_gethostbyname_send(state, ev, resolv, diff --git a/security/sssd/files/patch-src__providers__ipa__ipa_hbac.h b/security/sssd/files/patch-src__providers__ipa__ipa_hbac.h deleted file mode 100644 index a3cdad6efd28..000000000000 --- a/security/sssd/files/patch-src__providers__ipa__ipa_hbac.h +++ /dev/null @@ -1,24 +0,0 @@ -From 08d2bd8bcd975f1bbd2ea3671ba42f022779d3a8 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 08/34] patch-src__providers__ipa__ipa_hbac.h - ---- - src/providers/ipa/ipa_hbac.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git src/providers/ipa/ipa_hbac.h src/providers/ipa/ipa_hbac.h -index 02077e3..b1d8efa 100644 ---- src/providers/ipa/ipa_hbac.h -+++ src/providers/ipa/ipa_hbac.h -@@ -39,6 +39,7 @@ - - #include - #include -+#include - - /** Result of HBAC evaluation */ - enum hbac_eval_result { --- -1.8.0 - diff --git a/security/sssd/files/patch-src__providers__krb5__krb5_delayed_online_authentication.c b/security/sssd/files/patch-src__providers__krb5__krb5_delayed_online_authentication.c new file mode 100644 index 000000000000..88d0a715defb --- /dev/null +++ b/security/sssd/files/patch-src__providers__krb5__krb5_delayed_online_authentication.c @@ -0,0 +1,32 @@ +From eba3efda911eb0212a98353740e13ad619aaa282 Mon Sep 17 00:00:00 2001 +From: Lukas Slebodnik +Date: Wed, 6 Nov 2013 22:01:20 +0100 +Subject: [PATCH 09/25] patch-src__providers__krb5__krb5_delayed_online_authentication.c + +--- + src/providers/krb5/krb5_delayed_online_authentication.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git src/providers/krb5/krb5_delayed_online_authentication.c src/providers/krb5/krb5_delayed_online_authentication.c +index d5dea3b..da6b6bb 100644 +--- src/providers/krb5/krb5_delayed_online_authentication.c ++++ src/providers/krb5/krb5_delayed_online_authentication.c +@@ -296,6 +296,7 @@ errno_t init_delayed_online_authentication(struct krb5_ctx *krb5_ctx, + struct tevent_context *ev) + { + int ret; ++#ifdef __linux__ + hash_table_t *tmp_table; + + ret = get_uid_table(krb5_ctx, &tmp_table); +@@ -314,6 +315,7 @@ errno_t init_delayed_online_authentication(struct krb5_ctx *krb5_ctx, + DEBUG(1, ("hash_destroy failed [%s].\n", hash_error_string(ret))); + return EFAULT; + } ++#endif /* __linux__ */ + + krb5_ctx->deferred_auth_ctx = talloc_zero(krb5_ctx, + struct deferred_auth_ctx); +-- +1.8.0 + diff --git a/security/sssd/files/patch-src__providers__ldap__ldap_child.c b/security/sssd/files/patch-src__providers__ldap__ldap_child.c deleted file mode 100644 index 4fee65214a83..000000000000 --- a/security/sssd/files/patch-src__providers__ldap__ldap_child.c +++ /dev/null @@ -1,25 +0,0 @@ -From 144bf96dbd929248159bf932c1d3b5bccf451bee Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 10/34] patch-src__providers__ldap__ldap_child.c - ---- - src/providers/ldap/ldap_child.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/providers/ldap/ldap_child.c src/providers/ldap/ldap_child.c -index f35d946..9a45cf5 100644 ---- src/providers/ldap/ldap_child.c -+++ src/providers/ldap/ldap_child.c -@@ -206,7 +206,7 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, - } - - realm_name = talloc_strdup(memctx, default_realm); -- krb5_free_default_realm(context, default_realm); -+ free(default_realm); - if (!realm_name) { - krberr = KRB5KRB_ERR_GENERIC; - goto done; --- -1.8.0 - diff --git a/security/sssd/files/patch-src__providers__ldap__ldap_common.c b/security/sssd/files/patch-src__providers__ldap__ldap_common.c deleted file mode 100644 index 18e180313ec2..000000000000 --- a/security/sssd/files/patch-src__providers__ldap__ldap_common.c +++ /dev/null @@ -1,25 +0,0 @@ -From 5becc163a7101c94c84c4b7e330b62eb137c3bd7 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 11/34] patch-src__providers__ldap__ldap_common.c - ---- - src/providers/ldap/ldap_common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/providers/ldap/ldap_common.c src/providers/ldap/ldap_common.c -index f8b921a..84e51ae 100644 ---- src/providers/ldap/ldap_common.c -+++ src/providers/ldap/ldap_common.c -@@ -1109,7 +1109,7 @@ sdap_gssapi_get_default_realm(TALLOC_CTX *mem_ctx) - } - - realm = talloc_strdup(mem_ctx, krb5_realm); -- krb5_free_default_realm(context, krb5_realm); -+ free(krb5_realm); - if (!realm) { - DEBUG(0, ("Out of memory\n")); - goto done; --- -1.8.0 - diff --git a/security/sssd/files/patch-src__providers__ldap__sdap_access.c b/security/sssd/files/patch-src__providers__ldap__sdap_access.c index dc782c5e19b6..6fa0970e421c 100644 --- a/security/sssd/files/patch-src__providers__ldap__sdap_access.c +++ b/security/sssd/files/patch-src__providers__ldap__sdap_access.c @@ -1,14 +1,14 @@ -From cebca2806d06fce5a5c610a39044a5a4039f71ef Mon Sep 17 00:00:00 2001 +From 9a3d9a05b2c8790c771c166b42f8b80e76b4b336 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 12/34] patch-src__providers__ldap__sdap_access.c +Date: Wed, 6 Nov 2013 22:01:20 +0100 +Subject: [PATCH 11/25] patch-src__providers__ldap__sdap_access.c --- - src/providers/ldap/sdap_access.c | 43 +++++++++++++++++++--------------------- - 1 file changed, 20 insertions(+), 23 deletions(-) + src/providers/ldap/sdap_access.c | 46 +++++++++++++++++++--------------------- + 1 file changed, 22 insertions(+), 24 deletions(-) diff --git src/providers/ldap/sdap_access.c src/providers/ldap/sdap_access.c -index b198e04..37eae45 100644 +index b198e04..1eaedf7 100644 --- src/providers/ldap/sdap_access.c +++ src/providers/ldap/sdap_access.c @@ -22,9 +22,7 @@ @@ -155,11 +155,25 @@ index b198e04..37eae45 100644 unsigned int i; char *host; - char hostname[HOST_NAME_MAX+1]; -+ char hostname[_POSIX_HOST_NAME_MAX+1]; ++ char hostname[_POSIX_HOST_NAME_MAX + 1]; req = tevent_req_create(mem_ctx, &state, struct sdap_access_host_ctx); if (!req) { -@@ -1365,7 +1362,7 @@ static void sdap_access_host_done(struct tevent_req *subreq) +@@ -1285,11 +1282,12 @@ static struct tevent_req *sdap_access_host_send( + goto done; + } + +- if (gethostname(hostname, sizeof(hostname)) == -1) { ++ if (gethostname(hostname, _POSIX_HOST_NAME_MAX) == -1) { + DEBUG(1, ("Unable to get system hostname. Access denied\n")); + ret = EOK; + goto done; + } ++ hostname[_POSIX_HOST_NAME_MAX] = '\0'; + + /* FIXME: PADL's pam_ldap also calls gethostbyname() on the hostname + * in some attempt to get aliases and/or FQDN for the machine. +@@ -1365,7 +1363,7 @@ static void sdap_access_host_done(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK) { DEBUG(1, ("Error retrieving access check result.\n")); @@ -168,7 +182,7 @@ index b198e04..37eae45 100644 tevent_req_error(req, ret); return; } -@@ -1391,7 +1388,7 @@ sdap_access_recv(struct tevent_req *req, int *pam_status) +@@ -1391,7 +1389,7 @@ sdap_access_recv(struct tevent_req *req, int *pam_status) static void sdap_access_done(struct tevent_req *req) { errno_t ret; @@ -177,7 +191,7 @@ index b198e04..37eae45 100644 struct be_req *breq = tevent_req_callback_data(req, struct be_req); -@@ -1399,7 +1396,7 @@ static void sdap_access_done(struct tevent_req *req) +@@ -1399,7 +1397,7 @@ static void sdap_access_done(struct tevent_req *req) talloc_zfree(req); if (ret != EOK) { DEBUG(1, ("Error retrieving access check result.\n")); diff --git a/security/sssd/files/patch-src__providers__proxy__proxy_init.c b/security/sssd/files/patch-src__providers__proxy__proxy_init.c deleted file mode 100644 index fb672747a7c6..000000000000 --- a/security/sssd/files/patch-src__providers__proxy__proxy_init.c +++ /dev/null @@ -1,111 +0,0 @@ -From 6d9c90d8cd4dedbc0f3642e9fc8287eb34504e1a Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 13/34] patch-src__providers__proxy__proxy_init.c - ---- - src/providers/proxy/proxy_init.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git src/providers/proxy/proxy_init.c src/providers/proxy/proxy_init.c -index de4d7b6..99b464a 100644 ---- src/providers/proxy/proxy_init.c -+++ src/providers/proxy/proxy_init.c -@@ -123,7 +123,7 @@ int sssm_proxy_id_init(struct be_ctx *bectx, - if (!ctx->handle) { - DEBUG(0, ("Unable to load %s module with path, error: %s\n", - libpath, dlerror())); -- ret = ELIBACC; -+ ret = ENOENT; - goto done; - } - -@@ -131,7 +131,7 @@ int sssm_proxy_id_init(struct be_ctx *bectx, - libname); - if (!ctx->ops.getpwnam_r) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); -- ret = ELIBBAD; -+ ret = ENOENT; - goto done; - } - -@@ -139,14 +139,14 @@ int sssm_proxy_id_init(struct be_ctx *bectx, - libname); - if (!ctx->ops.getpwuid_r) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); -- ret = ELIBBAD; -+ ret = ENOENT; - goto done; - } - - ctx->ops.setpwent = proxy_dlsym(ctx->handle, "_nss_%s_setpwent", libname); - if (!ctx->ops.setpwent) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); -- ret = ELIBBAD; -+ ret = ENOENT; - goto done; - } - -@@ -154,14 +154,14 @@ int sssm_proxy_id_init(struct be_ctx *bectx, - libname); - if (!ctx->ops.getpwent_r) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); -- ret = ELIBBAD; -+ ret = ENOENT; - goto done; - } - - ctx->ops.endpwent = proxy_dlsym(ctx->handle, "_nss_%s_endpwent", libname); - if (!ctx->ops.endpwent) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); -- ret = ELIBBAD; -+ ret = ENOENT; - goto done; - } - -@@ -169,7 +169,7 @@ int sssm_proxy_id_init(struct be_ctx *bectx, - libname); - if (!ctx->ops.getgrnam_r) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); -- ret = ELIBBAD; -+ ret = ENOENT; - goto done; - } - -@@ -177,14 +177,14 @@ int sssm_proxy_id_init(struct be_ctx *bectx, - libname); - if (!ctx->ops.getgrgid_r) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); -- ret = ELIBBAD; -+ ret = ENOENT; - goto done; - } - - ctx->ops.setgrent = proxy_dlsym(ctx->handle, "_nss_%s_setgrent", libname); - if (!ctx->ops.setgrent) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); -- ret = ELIBBAD; -+ ret = ENOENT; - goto done; - } - -@@ -192,14 +192,14 @@ int sssm_proxy_id_init(struct be_ctx *bectx, - libname); - if (!ctx->ops.getgrent_r) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); -- ret = ELIBBAD; -+ ret = ENOENT; - goto done; - } - - ctx->ops.endgrent = proxy_dlsym(ctx->handle, "_nss_%s_endgrent", libname); - if (!ctx->ops.endgrent) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); -- ret = ELIBBAD; -+ ret = ENOENT; - goto done; - } - --- -1.8.0 - diff --git a/security/sssd/files/patch-src__responder__common__responder_common.c b/security/sssd/files/patch-src__responder__common__responder_common.c deleted file mode 100644 index c18ef760eb0c..000000000000 --- a/security/sssd/files/patch-src__responder__common__responder_common.c +++ /dev/null @@ -1,25 +0,0 @@ -From b668ec58a5d60c65e24c3b123ab7589fb28c3e83 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 15/34] patch-src__responder__common__responder_common.c - ---- - src/responder/common/responder_common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/responder/common/responder_common.c src/responder/common/responder_common.c -index c5d7577..965a870 100644 ---- src/responder/common/responder_common.c -+++ src/responder/common/responder_common.c -@@ -308,7 +308,7 @@ static void client_recv(struct cli_ctx *cctx) - talloc_free(cctx); - break; - -- case ENODATA: -+ case ECONNRESET: - DEBUG(5, ("Client disconnected!\n")); - talloc_free(cctx); - break; --- -1.8.0 - diff --git a/security/sssd/files/patch-src__responder__common__responder_dp.c b/security/sssd/files/patch-src__responder__common__responder_dp.c deleted file mode 100644 index 021e7ef91ff3..000000000000 --- a/security/sssd/files/patch-src__responder__common__responder_dp.c +++ /dev/null @@ -1,34 +0,0 @@ -From e98e59d8a6958ac1dc87b53f71aa9f51251b4568 Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 16/34] patch-src__responder__common__responder_dp.c - ---- - src/responder/common/responder_dp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git src/responder/common/responder_dp.c src/responder/common/responder_dp.c -index d15ca4d..3cb406a 100644 ---- src/responder/common/responder_dp.c -+++ src/responder/common/responder_dp.c -@@ -213,7 +213,7 @@ static int sss_dp_get_reply(DBusPendingCall *pending, - case DBUS_MESSAGE_TYPE_ERROR: - if (strcmp(dbus_message_get_error_name(reply), - DBUS_ERROR_NO_REPLY) == 0) { -- err = ETIME; -+ err = ETIMEDOUT; - goto done; - } - DEBUG(0,("The Data Provider returned an error [%s]\n", -@@ -734,7 +734,7 @@ static void sss_dp_internal_get_done(DBusPendingCall *pending, void *ptr) - &sdp_req->dp_ret, - &sdp_req->err_msg); - if (ret != EOK) { -- if (ret == ETIME) { -+ if (ret == ETIMEDOUT) { - sdp_req->dp_err = DP_ERR_TIMEOUT; - sdp_req->dp_ret = ret; - sdp_req->err_msg = talloc_strdup(sdp_req, "Request timed out"); --- -1.8.0 - diff --git a/security/sssd/files/patch-src__responder__common__responder_packet.c b/security/sssd/files/patch-src__responder__common__responder_packet.c deleted file mode 100644 index cbe5cc4d69ed..000000000000 --- a/security/sssd/files/patch-src__responder__common__responder_packet.c +++ /dev/null @@ -1,25 +0,0 @@ -From dd2d4ee745852a6d059b07966d1728b10c1240ff Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 17/34] patch-src__responder__common__responder_packet.c - ---- - src/responder/common/responder_packet.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/responder/common/responder_packet.c src/responder/common/responder_packet.c -index 5132d95..09b8d6d 100644 ---- src/responder/common/responder_packet.c -+++ src/responder/common/responder_packet.c -@@ -192,7 +192,7 @@ int sss_packet_recv(struct sss_packet *packet, int fd) - } - - if (rb == 0) { -- return ENODATA; -+ return ECONNRESET; - } - - if (*packet->len > packet->memsize) { --- -1.8.0 - diff --git a/security/sssd/files/patch-src__responder__pac__pacsrv_utils.c b/security/sssd/files/patch-src__responder__pac__pacsrv_utils.c deleted file mode 100644 index 531aa14cc6d8..000000000000 --- a/security/sssd/files/patch-src__responder__pac__pacsrv_utils.c +++ /dev/null @@ -1,23 +0,0 @@ -From 93a41acb0f1434d1638cc796c4529a135d61409d Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Wed, 30 Oct 2013 10:49:27 +0100 -Subject: [PATCH 4/4] patch-src__responder__pac__pacsrv_utils.c - ---- - src/responder/pac/pacsrv_utils.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git src/responder/pac/pacsrv_utils.c src/responder/pac/pacsrv_utils.c -index 3ac7b84..6052432 100644 ---- src/responder/pac/pacsrv_utils.c -+++ src/responder/pac/pacsrv_utils.c -@@ -18,6 +18,7 @@ - You should have received a copy of the GNU General Public License - along with this program. If not, see . - */ -+#include - #include - #include - #include --- -1.8.0 diff --git a/security/sssd/files/patch-src__sss_client__common.c b/security/sssd/files/patch-src__sss_client__common.c index bb7beed38179..9a42b98c1367 100644 --- a/security/sssd/files/patch-src__sss_client__common.c +++ b/security/sssd/files/patch-src__sss_client__common.c @@ -1,14 +1,14 @@ -From f40ad7e39f68345f3bfec169556463c1a13706e0 Mon Sep 17 00:00:00 2001 +From 6874fb930a30eac6fe12104923ab97083f58bcf9 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 18/34] patch-src__sss_client__common.c +Date: Wed, 6 Nov 2013 22:01:20 +0100 +Subject: [PATCH 14/25] patch-src__sss_client__common.c --- - src/sss_client/common.c | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) + src/sss_client/common.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) diff --git src/sss_client/common.c src/sss_client/common.c -index 6639ae1..d0b5c6d 100644 +index ec5c708..5d17eed 100644 --- src/sss_client/common.c +++ src/sss_client/common.c @@ -25,6 +25,7 @@ @@ -19,18 +19,15 @@ index 6639ae1..d0b5c6d 100644 #include #include #include -@@ -61,6 +62,10 @@ - #define SSS_DEFAULT_WRITE_FLAGS 0 - #endif +@@ -43,6 +44,7 @@ + #include + #define _(STRING) dgettext (PACKAGE, STRING) + #include "sss_cli.h" ++#include "util/sss_bsd_errno.h" -+#ifndef EOWNERDEAD -+#define EOWNERDEAD 130 -+#endif -+ - /* common functions */ - - int sss_cli_sd = -1; /* the sss client socket descriptor */ -@@ -124,7 +129,6 @@ static enum sss_status sss_cli_send_req(enum sss_cli_command cmd, + #if HAVE_PTHREAD + #include +@@ -124,7 +126,6 @@ static enum sss_status sss_cli_send_req(enum sss_cli_command cmd, *errnop = error; break; case 0: @@ -38,7 +35,7 @@ index 6639ae1..d0b5c6d 100644 break; case 1: if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { -@@ -232,7 +236,6 @@ static enum sss_status sss_cli_recv_rep(enum sss_cli_command cmd, +@@ -232,7 +233,6 @@ static enum sss_status sss_cli_recv_rep(enum sss_cli_command cmd, *errnop = error; break; case 0: @@ -46,7 +43,7 @@ index 6639ae1..d0b5c6d 100644 break; case 1: if (pfd.revents & (POLLHUP)) { -@@ -669,7 +672,6 @@ static enum sss_status sss_cli_check_socket(int *errnop, const char *socket_name +@@ -669,7 +669,6 @@ static enum sss_status sss_cli_check_socket(int *errnop, const char *socket_name *errnop = error; break; case 0: @@ -54,7 +51,7 @@ index 6639ae1..d0b5c6d 100644 break; case 1: if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { -@@ -719,23 +721,23 @@ enum nss_status sss_nss_make_request(enum sss_cli_command cmd, +@@ -719,23 +718,23 @@ enum nss_status sss_nss_make_request(enum sss_cli_command cmd, /* avoid looping in the nss daemon */ envval = getenv("_SSS_LOOPS"); if (envval && strcmp(envval, "NO") == 0) { @@ -83,15 +80,6 @@ index 6639ae1..d0b5c6d 100644 } } -@@ -984,7 +986,7 @@ errno_t sss_strnlen(const char *str, size_t maxlen, size_t *len) - *len = 0; - while (*len < maxlen) { - if (str[*len] == '\0') break; -- len++; -+ ++*len; - } - #endif - -- 1.8.0 diff --git a/security/sssd/files/patch-src__sss_client__nss_group.c b/security/sssd/files/patch-src__sss_client__nss_group.c index 9cf5f5f0e7d0..ed5ebd284fd3 100644 --- a/security/sssd/files/patch-src__sss_client__nss_group.c +++ b/security/sssd/files/patch-src__sss_client__nss_group.c @@ -1,44 +1,45 @@ -From 36ea9e6d18578237b9e7ffef382788736eab49f5 Mon Sep 17 00:00:00 2001 +From 5a0c2079efae0f9734d85932ed72645808b32091 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:11 +0200 -Subject: [PATCH 19/34] patch-src__sss_client__nss_group.c +Date: Wed, 6 Nov 2013 22:01:20 +0100 +Subject: [PATCH 15/25] patch-src__sss_client__nss_group.c --- - src/sss_client/nss_group.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 71 insertions(+) + src/sss_client/nss_group.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 70 insertions(+) diff --git src/sss_client/nss_group.c src/sss_client/nss_group.c -index e6ea54b..88cd1ab 100644 +index e6ea54b..b27b671 100644 --- src/sss_client/nss_group.c +++ src/sss_client/nss_group.c -@@ -343,6 +343,77 @@ out: +@@ -343,6 +343,76 @@ out: } +#define MIN(a, b)((a) < (b) ? (a) : (b)) + -+gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *grpcnt) ++int gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *grpcnt) +{ -+ int ret, dupc; ++ int ret, dupc; + -+ for (dupc = 0; dupc < MIN(maxgrp, *grpcnt); dupc++) { -+ if (groups[dupc] == gid) -+ return 1; -+ } ++ for (dupc = 0; dupc < MIN(maxgrp, *grpcnt); dupc++) { ++ if (groups[dupc] == gid) ++ return 1; ++ } + -+ ret = 1; -+ if (*grpcnt < maxgrp) -+ groups[*grpcnt] = gid; -+ else -+ ret = 0; ++ ret = 1; ++ if (*grpcnt < maxgrp) ++ groups[*grpcnt] = gid; ++ else ++ ret = 0; + -+ (*grpcnt)++; ++ (*grpcnt)++; + -+ return ret; ++ return ret; +} + -+enum nss_status _nss_sss_getgroupmembership(const char *uname, gid_t agroup, gid_t *groups, -+ int maxgrp, int *grpcnt) ++enum nss_status _nss_sss_getgroupmembership(const char *uname, gid_t agroup, ++ gid_t *groups, int maxgrp, ++ int *grpcnt) +{ + struct sss_cli_req_data rd; + uint8_t *repbuf; @@ -57,7 +58,7 @@ index e6ea54b..88cd1ab 100644 + nret = sss_nss_make_request(SSS_NSS_INITGR, &rd, + &repbuf, &replen, &errnop); + if (nret != NSS_STATUS_SUCCESS) { -+ goto out; ++ goto done; + } + + /* no results if not found */ @@ -65,7 +66,7 @@ index e6ea54b..88cd1ab 100644 + if (num_ret == 0) { + free(repbuf); + nret = NSS_STATUS_NOTFOUND; -+ goto out; ++ goto done; + } + max_ret = num_ret; + @@ -79,11 +80,9 @@ index e6ea54b..88cd1ab 100644 + free(repbuf); + nret = NSS_STATUS_SUCCESS; + -+out: ++done: + sss_nss_unlock(); + return nret; -+ -+ +} + enum nss_status _nss_sss_getgrnam_r(const char *name, struct group *result, diff --git a/security/sssd/files/patch-src__util__crypto__libcrypto__crypto_sha512crypt.c b/security/sssd/files/patch-src__util__crypto__libcrypto__crypto_sha512crypt.c index 247c32109c27..79a73a2a96e7 100644 --- a/security/sssd/files/patch-src__util__crypto__libcrypto__crypto_sha512crypt.c +++ b/security/sssd/files/patch-src__util__crypto__libcrypto__crypto_sha512crypt.c @@ -1,54 +1,31 @@ -From 557ea27d9f1a8f86dc769ea6c174055992ebf803 Mon Sep 17 00:00:00 2001 +From 74422233fe8c6efa826b20c6b579f4c99e45ff87 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:12 +0200 -Subject: [PATCH 22/34] patch-src__util__crypto__libcrypto__crypto_sha512crypt.c +Date: Wed, 6 Nov 2013 22:01:21 +0100 +Subject: [PATCH 19/25] patch-src__util__crypto__libcrypto__crypto_sha512crypt.c --- - src/util/crypto/libcrypto/crypto_sha512crypt.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + src/util/crypto/libcrypto/crypto_sha512crypt.c | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git src/util/crypto/libcrypto/crypto_sha512crypt.c src/util/crypto/libcrypto/crypto_sha512crypt.c -index f4c3e0d..ed77fa6 100644 +index 88628b6..4510403 100644 --- src/util/crypto/libcrypto/crypto_sha512crypt.c +++ src/util/crypto/libcrypto/crypto_sha512crypt.c -@@ -10,9 +10,7 @@ - /* SHA512-based Unix crypt implementation. - Released into the Public Domain by Ulrich Drepper . */ - --#include "config.h" -- --#include -+#include - #include - #include - #include -@@ -41,6 +39,8 @@ const char sha512_rounds_prefix[] = "rounds="; - #define ROUNDS_MIN 1000 - #define ROUNDS_MAX 999999999 +@@ -28,6 +28,14 @@ + #include + #include +#define __stpncpy(x, y, z) stpncpy(x, y, z) + - /* Table with characters for base64 transformation. */ - const char b64t[64] = - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -@@ -198,7 +198,7 @@ static int sha512_crypt_r(const char *key, - /* Create byte sequence P. */ - cp = p_bytes = alloca(key_len); - for (cnt = key_len; cnt >= 64; cnt -= 64) { -- cp = mempcpy(cp, temp_result, 64); -+ cp = (char *) memcpy(cp, temp_result, 64) + 64; - } - memcpy(cp, temp_result, cnt); - -@@ -219,7 +219,7 @@ static int sha512_crypt_r(const char *key, - /* Create byte sequence S. */ - cp = s_bytes = alloca(salt_len); - for (cnt = salt_len; cnt >= 64; cnt -= 64) { -- cp = mempcpy(cp, temp_result, 64); -+ cp = (char *) memcpy(cp, temp_result, 64) + 64; - } - memcpy(cp, temp_result, cnt); - ++void * ++mempcpy (void *dest, const void *src, size_t n) ++{ ++ return (char *) memcpy (dest, src, n) + n; ++} ++ + /* Define our magic string to mark salt for SHA512 "encryption" replacement. */ + const char sha512_salt_prefix[] = "$6$"; + #define SALT_PREF_SIZE (sizeof(sha512_salt_prefix) - 1) -- 1.8.0 diff --git a/security/sssd/files/patch-src__util__crypto__nss__nss_sha512crypt.c b/security/sssd/files/patch-src__util__crypto__nss__nss_sha512crypt.c index e0b4523cdedc..71da7f7d4108 100644 --- a/security/sssd/files/patch-src__util__crypto__nss__nss_sha512crypt.c +++ b/security/sssd/files/patch-src__util__crypto__nss__nss_sha512crypt.c @@ -1,52 +1,31 @@ -From f5fbf2eee46f33a4614f0553403c8590ca04bb59 Mon Sep 17 00:00:00 2001 +From be27b76238aa49ac0ace123f80c9957ae25501fa Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:12 +0200 -Subject: [PATCH 23/34] patch-src__util__crypto__nss__nss_sha512crypt.c +Date: Wed, 6 Nov 2013 22:01:21 +0100 +Subject: [PATCH 20/25] patch-src__util__crypto__nss__nss_sha512crypt.c --- - src/util/crypto/nss/nss_sha512crypt.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) + src/util/crypto/nss/nss_sha512crypt.c | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git src/util/crypto/nss/nss_sha512crypt.c src/util/crypto/nss/nss_sha512crypt.c -index 76eb8a6..db7582d 100644 +index 2838c47..a6cf43f 100644 --- src/util/crypto/nss/nss_sha512crypt.c +++ src/util/crypto/nss/nss_sha512crypt.c -@@ -10,7 +10,7 @@ - - #include "config.h" - --#include -+#include - #include - #include - #include -@@ -42,6 +42,8 @@ const char sha512_rounds_prefix[] = "rounds="; - #define ROUNDS_MIN 1000 - #define ROUNDS_MAX 999999999 +@@ -29,6 +29,14 @@ + #include + #include +#define __stpncpy(x, y, z) stpncpy(x, y, z) + - /* Table with characters for base64 transformation. */ - const char b64t[64] = - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -@@ -205,7 +207,7 @@ static int sha512_crypt_r(const char *key, - /* Create byte sequence P. */ - cp = p_bytes = alloca(key_len); - for (cnt = key_len; cnt >= 64; cnt -= 64) { -- cp = mempcpy(cp, temp_result, 64); -+ cp = (char *) memcpy(cp, temp_result, 64) + 64; - } - memcpy(cp, temp_result, cnt); - -@@ -223,7 +225,7 @@ static int sha512_crypt_r(const char *key, - /* Create byte sequence S. */ - cp = s_bytes = alloca(salt_len); - for (cnt = salt_len; cnt >= 64; cnt -= 64) { -- cp = mempcpy(cp, temp_result, 64); -+ cp = (char *) memcpy(cp, temp_result, 64) + 64; - } - memcpy(cp, temp_result, cnt); - ++static void * ++mempcpy (void *dest, const void *src, size_t n) ++{ ++ return (char *) memcpy (dest, src, n) + n; ++} ++ + /* Define our magic string to mark salt for SHA512 "encryption" replacement. */ + const char sha512_salt_prefix[] = "$6$"; + #define SALT_PREF_SIZE (sizeof(sha512_salt_prefix) - 1) -- 1.8.0 diff --git a/security/sssd/files/patch-src__util__find_uid.c b/security/sssd/files/patch-src__util__find_uid.c index aea7803302fc..eef9470b363c 100644 --- a/security/sssd/files/patch-src__util__find_uid.c +++ b/security/sssd/files/patch-src__util__find_uid.c @@ -1,14 +1,14 @@ -From 0b1b319b34db96e2088c1f71d51ce95f819ccce8 Mon Sep 17 00:00:00 2001 +From ccc51217c877dde1857300662fdacab2298f5816 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:12 +0200 -Subject: [PATCH 24/34] patch-src__util__find_uid.c +Date: Wed, 6 Nov 2013 22:01:21 +0100 +Subject: [PATCH 21/25] patch-src__util__find_uid.c --- - src/util/find_uid.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) + src/util/find_uid.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) diff --git src/util/find_uid.c src/util/find_uid.c -index d34a4ab..b309b19 100644 +index d34a4ab..9dec900 100644 --- src/util/find_uid.c +++ src/util/find_uid.c @@ -67,7 +67,7 @@ static errno_t get_uid_from_pid(const pid_t pid, uid_t *uid) @@ -20,7 +20,13 @@ index d34a4ab..b309b19 100644 if (ret < 0) { DEBUG(1, ("snprintf failed")); return EINVAL; -@@ -206,7 +206,7 @@ static errno_t get_active_uid_linux(hash_table_t *table, uid_t search_uid) +@@ -201,12 +201,12 @@ static errno_t get_active_uid_linux(hash_table_t *table, uid_t search_uid) + struct dirent *dirent; + int ret, err; + pid_t pid = -1; +- uid_t uid; ++ uid_t uid = -1; + hash_key_t key; hash_value_t value; diff --git a/security/sssd/files/patch-src__util__murmurhash3.c b/security/sssd/files/patch-src__util__murmurhash3.c deleted file mode 100644 index aed45c78b2fe..000000000000 --- a/security/sssd/files/patch-src__util__murmurhash3.c +++ /dev/null @@ -1,27 +0,0 @@ -From 1295f600b3e94e02d8c5181b1b156325619c449f Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:12 +0200 -Subject: [PATCH 25/34] patch-src__util__murmurhash3.c - ---- - src/util/murmurhash3.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git src/util/murmurhash3.c src/util/murmurhash3.c -index 80e52ed..341505c 100644 ---- src/util/murmurhash3.c -+++ src/util/murmurhash3.c -@@ -8,9 +8,8 @@ - - #include - #include --#include -+#include - #include --#include - - /* support RHEL5 lack of definitions */ - #ifndef le32toh --- -1.8.0 - diff --git a/security/sssd/files/patch-src__util__server.c b/security/sssd/files/patch-src__util__server.c index acf6afd3c455..233af445a670 100644 --- a/security/sssd/files/patch-src__util__server.c +++ b/security/sssd/files/patch-src__util__server.c @@ -1,17 +1,17 @@ -From 43f9d669315d710d8479b259e33d1f16afcba1d2 Mon Sep 17 00:00:00 2001 +From cc6cab9e45ba978eaf33c6fa1860ee94166780be Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik -Date: Sat, 4 May 2013 16:08:12 +0200 -Subject: [PATCH 26/34] patch-src__util__server.c +Date: Wed, 6 Nov 2013 22:01:21 +0100 +Subject: [PATCH 22/25] patch-src__util__server.c --- - src/util/server.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) + src/util/server.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) diff --git src/util/server.c src/util/server.c -index b3073fc..2def1f6 100644 +index b3073fc..ddc124f 100644 --- src/util/server.c +++ src/util/server.c -@@ -321,12 +321,13 @@ static void setup_signals(void) +@@ -321,12 +321,14 @@ static void setup_signals(void) BlockSignals(false, SIGTERM); CatchSignal(SIGHUP, sig_hup); @@ -23,6 +23,7 @@ index b3073fc..2def1f6 100644 - CatchSignal(SIGABRT, sig_segv_abrt); + /* If prctl is not defined on the system, try to handle + * some common termination signals gracefully */ ++ (void) sig_segv_abrt; /* unused */ + /* + CatchSignal(SIGSEGV, sig_segv_abrt); + CatchSignal(SIGABRT, sig_segv_abrt); diff --git a/security/sssd/files/patch-src__util__util.c b/security/sssd/files/patch-src__util__util.c deleted file mode 100644 index 55f7df46f46d..000000000000 --- a/security/sssd/files/patch-src__util__util.c +++ /dev/null @@ -1,24 +0,0 @@ -From a6a31d9de9d15c1e4627f2a7cfb8cb83a6d3e99a Mon Sep 17 00:00:00 2001 -From: Lukas Slebodnik -Date: Sat, 4 May 2013 17:08:09 +0200 -Subject: [PATCH 28/34] patch-src__util__util.c - ---- - src/util/util.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git src/util/util.c src/util/util.c -index ab98077..e279a2e 100644 ---- src/util/util.c -+++ src/util/util.c -@@ -18,6 +18,7 @@ - along with this program. If not, see . - */ - -+#include - #include - #include - #include --- -1.8.0 - diff --git a/security/sssd/files/patch-src__util__util.h b/security/sssd/files/patch-src__util__util.h index 774f5239ba4f..bd3bc8baf656 100644 --- a/security/sssd/files/patch-src__util__util.h +++ b/security/sssd/files/patch-src__util__util.h @@ -1,48 +1,23 @@ -From 4fb9ecea7fca68a58515e1552dfdb408ae28baeb Mon Sep 17 00:00:00 2001 +From 5fcf9d93df255105ec065b168ddc11d98b5bb5d1 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik -Date: Sat, 27 Jul 2013 14:59:04 +0200 -Subject: [PATCH 29/34] patch-src__util__util.h +Date: Wed, 6 Nov 2013 22:01:21 +0100 +Subject: [PATCH 24/25] patch-src__util__util.h --- - src/util/util.h | 25 +++++++------------------ - 1 file changed, 7 insertions(+), 18 deletions(-) + src/util/util.h | 2 ++ + 1 file changed, 2 insertions(+) diff --git src/util/util.h src/util/util.h -index 1f7c6c3..82988eb 100644 +index eab1f78..8e29fb5 100644 --- src/util/util.h +++ src/util/util.h -@@ -567,24 +567,13 @@ struct sss_domain_info *copy_subdomain(TALLOC_CTX *mem_ctx, - errno_t sss_br_lock_file(int fd, size_t start, size_t len, - int num_tries, useconds_t wait); +@@ -571,4 +571,6 @@ errno_t sss_br_lock_file(int fd, size_t start, size_t len, + #define BUILD_WITH_PAC_RESPONDER false + #endif --/* Endianness-compatibility for systems running older versions of glibc */ -- --#ifndef le32toh --#include -- --/* Copied from endian.h on glibc 2.15 */ --#ifdef __USE_BSD --/* Conversion interfaces. */ --# if __BYTE_ORDER == __LITTLE_ENDIAN --# define le32toh(x) (x) --# define htole32(x) (x) --# else --# define le32toh(x) __bswap_32 (x) --# define htole32(x) __bswap_32 (x) --# endif --#endif /* __USE_BSD */ -- --#endif /* le32toh */ -+#define BSD_ERR_MASK (0xB5DE <<16) -+#ifndef EUCLEAN -+#define EUCLEAN (BSD_ERR_MASK | 117) -+#endif -+#ifndef EMEDIUMTYPE -+#define EMEDIUMTYPE (BSD_ERR_MASK | 124) -+#endif - - #ifdef HAVE_PAC_RESPONDER - #define BUILD_WITH_PAC_RESPONDER true ++#include "util/sss_bsd_errno.h" ++ + #endif /* __SSSD_UTIL_H__ */ -- 1.8.0 diff --git a/security/sssd/files/sss_bsd_errno.h b/security/sssd/files/sss_bsd_errno.h new file mode 100644 index 000000000000..b7bd215249f3 --- /dev/null +++ b/security/sssd/files/sss_bsd_errno.h @@ -0,0 +1,58 @@ +/* + SSSD + + Authors: + Lukas Slebodnik + + Copyright (C) 2013 Red Hat + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef SSS_BSD_ERRNO_H_ +#define SSS_BSD_ERRNO_H_ + +#include + +#define BSD_ERR_MASK (0xB5DE <<16) + +#ifndef EUCLEAN +#define EUCLEAN (BSD_ERR_MASK | 117) +#endif +#ifndef EMEDIUMTYPE +#define EMEDIUMTYPE (BSD_ERR_MASK | 124) +#endif +#ifndef EOWNERDEAD +#define EOWNERDEAD (BSD_ERR_MASK | 130) +#endif +#ifndef ECONNRESET +#define ECONNRESET (BSD_ERR_MASK | 104) +#endif +#ifndef ETIMEDOUT +#define ETIMEDOUT (BSD_ERR_MASK | 110) +#endif +#ifndef ENODATA +#define ENODATA (BSD_ERR_MASK | 61) +#endif +#ifndef ETIME +#define ETIME (BSD_ERR_MASK | 62) +#endif +#ifndef ELIBACC +#define ELIBACC (BSD_ERR_MASK | 79) +#endif +#ifndef ELIBBAD +#define ELIBBAD (BSD_ERR_MASK | 80) +#endif + +#endif /* SSS_BSD_ERRNO_H_ */ diff --git a/security/sssd/pkg-plist b/security/sssd/pkg-plist index 48130167d516..bf22ac22d2c1 100644 --- a/security/sssd/pkg-plist +++ b/security/sssd/pkg-plist @@ -12,6 +12,53 @@ sbin/sss_cache sbin/sss_seed bin/sss_ssh_authorizedkeys bin/sss_ssh_knownhostsproxy +man/es/man1/sss_ssh_authorizedkeys.1.gz +man/es/man1/sss_ssh_knownhostsproxy.1.gz +man/es/man5/sssd-ad.5.gz +man/es/man5/sssd-ipa.5.gz +man/es/man5/sssd-ldap.5.gz +man/es/man5/sssd-simple.5.gz +man/es/man5/sssd-sudo.5.gz +man/es/man5/sssd.conf.5.gz +man/es/man8/pam_sss.8.gz +man/es/man8/sss_cache.8.gz +man/es/man8/sss_debuglevel.8.gz +man/es/man8/sss_groupadd.8.gz +man/es/man8/sss_groupdel.8.gz +man/es/man8/sss_groupmod.8.gz +man/es/man8/sss_groupshow.8.gz +man/es/man8/sss_obfuscate.8.gz +man/es/man8/sss_seed.8.gz +man/es/man8/sss_useradd.8.gz +man/es/man8/sss_userdel.8.gz +man/es/man8/sss_usermod.8.gz +man/es/man8/sssd.8.gz +man/es/man8/sssd_krb5_locator_plugin.8.gz +man/fr/man1/sss_ssh_authorizedkeys.1.gz +man/fr/man1/sss_ssh_knownhostsproxy.1.gz +man/fr/man5/sssd-ad.5.gz +man/fr/man5/sssd-ipa.5.gz +man/fr/man5/sssd-krb5.5.gz +man/fr/man5/sssd-ldap.5.gz +man/fr/man5/sssd-simple.5.gz +man/fr/man5/sssd-sudo.5.gz +man/fr/man5/sssd.conf.5.gz +man/fr/man8/pam_sss.8.gz +man/fr/man8/sss_cache.8.gz +man/fr/man8/sss_debuglevel.8.gz +man/fr/man8/sss_groupadd.8.gz +man/fr/man8/sss_groupdel.8.gz +man/fr/man8/sss_groupmod.8.gz +man/fr/man8/sss_groupshow.8.gz +man/fr/man8/sss_obfuscate.8.gz +man/fr/man8/sss_seed.8.gz +man/fr/man8/sss_useradd.8.gz +man/fr/man8/sss_userdel.8.gz +man/fr/man8/sss_usermod.8.gz +man/fr/man8/sssd.8.gz +man/fr/man8/sssd_krb5_locator_plugin.8.gz +man/ja/man5/sssd-ad.5.gz +man/ja/man5/sssd-krb5.5.gz man/ja/man1/sss_ssh_authorizedkeys.1.gz man/ja/man1/sss_ssh_knownhostsproxy.1.gz man/ja/man5/sssd-ipa.5.gz @@ -133,7 +180,7 @@ lib/shared-modules/ldb/memberof.la %%PYTHON_SITELIBDIR%%/SSSDConfig/ipachangeconf.py %%PYTHON_SITELIBDIR%%/SSSDConfig/sssd_upgrade_config.pyc %%PYTHON_SITELIBDIR%%/SSSDConfig/sssd_upgrade_config.py -%%PYTHON_SITELIBDIR%%/SSSDConfig-1.9.5-py%%PYTHON_VER%%.egg-info +%%PYTHON_SITELIBDIR%%/SSSDConfig-1.9.6-py%%PYTHON_VER%%.egg-info include/ipa_hbac.h include/sss_sudo.h include/sss_idmap.h @@ -154,6 +201,14 @@ include/sss_idmap.h @dirrmtry man/nl/man5 @dirrmtry man/nl/man1 @dirrmtry man/nl +@dirrmtry man/fr/man8 +@dirrmtry man/fr/man5 +@dirrmtry man/fr/man1 +@dirrmtry man/fr +@dirrmtry man/es/man8 +@dirrmtry man/es/man5 +@dirrmtry man/es/man1 +@dirrmtry man/es @dirrmtry etc/sssd @dirrmtry share/sssd/sssd/sssd.api.d @dirrmtry share/sssd/sssd -- cgit v1.2.3