Attachment #205266 for bug #238465




# $FreeBSD$

PORTNAME=	sssd
PORTVERSION=	1.12.5
PORTREVISION=	18
CATEGORIES=	security
MASTER_SITES=	https://releases.pagure.org/SSSD/${PORTNAME}/


LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libpopt.so:devel/popt \
		libtalloc.so:devel/talloc \
		libtevent.so:devel/tevent \
		libtdb.so:databases/tdb \
		libldb.so:databases/ldb14 \
		libcares.so:dns/c-ares \
		libdbus-1.so:devel/dbus \
		libdhash.so:devel/ding-libs \

		libsasl2.so:security/cyrus-sasl2 \
		libinotify.so:devel/libinotify \
		libplds4.so:devel/nspr
BUILD_DEPENDS=	xmlcatalog:textproc/libxml2 \
		tevent1>0:devel/tevent1 \
		tdb1>0:databases/tdb1 \
		xmlcatalog:textproc/libxml2 \
		docbook-xsl>=1:textproc/docbook-xsl \
		xsltproc:textproc/libxslt \
		xmlcatmgr:textproc/xmlcatmgr \
		krb5>=1.10:security/krb5 \
		nsupdate:dns/bind-tools
RUN_DEPENDS=	talloc1>0:devel/talloc1 \
		tevent1>0:devel/tevent1 \
		tdb1>0:databases/tdb1

USES=		autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \
		python:2.7 shebangfix gssapi:mit

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-selinux=no --with-semanage=no \
		--with-ldb-lib-dir=${LOCALBASE}/lib/shared-modules/ldb \

		--with-libnl=no --with-init-dir=no --datadir=${DATADIR} \
		--docdir=${DOCSDIR} --with-pid-path=/var/run \
		--localstatedir=/var --enable-pammoddir=${PREFIX}/lib \
		--with-db-path=/var/db/sss/db \
		--with-gpo-cache-path=/var/db/sss/gpo_cache \
		--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 \
		--disable-cifs-idmap-plugin --disable-config-lib \
		--with-krb5-conf=/etc/krb5.conf
# TODO: investigate possible sssd/nfsuserd compatibility
CONFIGURE_ARGS+=	--without-nfsv4-idmapd-plugin
CFLAGS+=	-fstack-protector-all
PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
#DEBUG_FLAGS=	-g


USE_LDCONFIG=	yes
USE_OPENLDAP=	yes
USES=		autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \
		python:2.7 shebangfix gssapi:mit
INSTALL_TARGET=	install-strip
CPE_VENDOR=	fedoraproject


	${INSTALL_DATA} ${WRKSRC}/src/examples/sssd-example.conf \
		${STAGEDIR}${ETCDIR}/sssd.conf.sample
	${LN} -sf nss_sss.so ${STAGEDIR}${PREFIX}/lib/nss_sss.so.1
# clean these up from the install; we create them in rc script start_precmd
.for d in db/sss db/sss_mc log/sssd run/sss/krb5.include.d run/sss/private run/sss
	@${RMDIR} ${STAGEDIR}/var/${d}
.endfor
# clean unused man dirs
.for i in nl/man1 nl/man5 pt/man1 pt/man5
	@${RMDIR} ${STAGEDIR}${PREFIX}/man/${i}

Lines 1-2 Link Here

(-)distinfo (-2 / +5 lines)
1	SHA256 (sssd-1.11.7.tar.gz) = ff12d5730a6d7d08fe11140aa58e544900b75c63902b7a07bbbc12d6a99cb5b5	1	TIMESTAMP = 1560438587
2	SIZE (sssd-1.11.7.tar.gz) = 3661227	2	SHA256 (sssd-1.12.5.tar.gz) = 243d8db7c72ecb21aa9db8a09fe9f9b10049dbdb35a1cc2f55e214f21e3ce256
		3	SIZE (sssd-1.12.5.tar.gz) = 4300869
		4	SHA256 (sssd-1.12.5.tar.gz.asc) = b9ec26559d45bf3b6dc2026677b03a3dc7afc6510abc4ddf6c68e11ac48d9205
		5	SIZE (sssd-1.12.5.tar.gz.asc) = 181




--- Makefile.am.orig	2019-06-13 15:09:58 UTC
index fd74d85..4a7e6ae 100644
--- Makefile.am
+++ Makefile.am
@@ -372,6 +372,7 @@ AM_CPPFLAGS = \
     $(LIBNL_CFLAGS) \
     $(OPENLDAP_CFLAGS) \
     $(GLIB2_CFLAGS) \
     $(JOURNALD_CFLAGS) \
+    -DHOST_NAME_MAX=_POSIX_HOST_NAME_MAX \
     -DLIBDIR=\"$(libdir)\" \
     -DVARDIR=\"$(localstatedir)\" \
     -DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -441,6 +442,7 @@ SSSD_LIBS = \
     $(DHASH_LIBS) \
     $(SSS_CRYPT_LIBS) \
     $(OPENLDAP_LIBS) \

     $(TDB_LIBS)
 
 PYTHON_BINDINGS_LIBS = \
@@ -493,6 +495,7 @@ dist_noinst_HEADERS = \
     src/util/sss_ssh.h \
     src/util/sss_ini.h \
     src/util/sss_format.h \
+    src/util/sss_bsd_errno.h \
     src/util/sss_config.h \
     src/util/refcount.h \
     src/util/find_uid.h \
@@ -2288,9 +2291,10 @@ endif
@@ -1700,9 +1703,10 @@ endif
 # Client Libraries #
 ####################
 

     src/sss_client/nss_passwd.c \
     src/sss_client/nss_group.c \
     src/sss_client/nss_netgroup.c \
@@ -2303,9 +2307,9 @@ libnss_sss_la_SOURCES = \
     src/sss_client/nss_mc_passwd.c \
     src/sss_client/nss_mc_group.c \
     src/sss_client/nss_mc.h

     -module \
     -version-info 2:0:0 \
     -Wl,--version-script,$(srcdir)/src/sss_client/sss_nss.exports
@@ -2504,6 +2508,7 @@ libsss_krb5_common_la_CFLAGS = \
 libsss_krb5_common_la_LIBADD = \
     $(KEYUTILS_LIBS) \
     $(DHASH_LIBS) \
+    $(LTLIBINTL) \
     $(KRB5_LIBS)
 libsss_krb5_common_la_LDFLAGS = \
     -avoid-version
@@ -2735,6 +2740,7 @@ ldap_child_LDADD = \
     $(TALLOC_LIBS) \
     $(POPT_LIBS) \
     $(OPENLDAP_LIBS) \
     $(DHASH_LIBS) \
+    $(LTLIBINTL) \
     $(KRB5_LIBS)
 
 if BUILD_SEMANAGE




--- configure.ac.orig	2013-11-06 18:35:03 UTC
+++ configure.ac
@@ -5,15 +5,15 @@ AC_INIT([sssd],
         VERSION_NUMBER,
         [sssd-devel@lists.fedorahosted.org])
 
+AC_CONFIG_SRCDIR([BUILD.txt])
+AC_CONFIG_AUX_DIR([build])
+
 m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
     [AC_USE_SYSTEM_EXTENSIONS],
     [AC_GNU_SOURCE])
 
 CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
 
-AC_CONFIG_SRCDIR([BUILD.txt])
-AC_CONFIG_AUX_DIR([build])
-
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax])
 AM_PROG_CC_C_O
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])




--- src/util/util.c.orig	2015-06-12 09:02:30 UTC
+++ src/util/util.c
@@ -900,7 +900,7 @@ errno_t sss_utc_to_time_t(const char *st
     len = strlen(str);
     if (str[len-1] != 'Z') {
         DEBUG(SSSDBG_TRACE_INTERNAL,
-              "%s does not seem to be in UTZ time zone.\n", str);
+              "%s does not seem to be in UTC time zone.\n", str);
         return ERR_TIMESPEC_NOT_SUPPORTED;
     }
 
@@ -921,15 +921,13 @@ errno_t sss_utc_to_time_t(const char *st
         return EINVAL;
     }
 
-    ut = mktime(&tm);
+    ut = timegm(&tm);
     if (ut == -1) {
         DEBUG(SSSDBG_TRACE_INTERNAL,
-              "mktime failed to convert [%s].\n", str);
+              "timegm failed to convert [%s].\n", str);
         return EINVAL;
     }
 
-    tzset();
-    ut -= timezone;
     *_unix_time = ut;
     return EOK;
 }




--- src/sss_client/common.c.orig	2015-06-12 09:02:30 UTC
index ec5c708..5d17eed 100644
--- src/sss_client/common.c
+++ src/sss_client/common.c
@@ -25,6 +25,7 @@
 #include "config.h"

 
 #if HAVE_PTHREAD
 #include <pthread.h>
@@ -124,7 +126,6 @@ static enum sss_status sss_cli_send_req(
             *errnop = error;
             break;
         case 0:

             break;
         case 1:
             if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
@@ -232,7 +233,6 @@ static enum sss_status sss_cli_recv_rep(
             *errnop = error;
             break;
         case 0:

             break;
         case 1:
             if (pfd.revents & (POLLHUP)) {
@@ -669,7 +669,6 @@ static enum sss_status sss_cli_check_soc
             *errnop = error;
             break;
         case 0:

             break;
         case 1:
             if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
@@ -719,7 +718,7 @@ enum nss_status sss_nss_make_request(enu
     /* avoid looping in the nss daemon */
     envval = getenv("_SSS_LOOPS");
     if (envval && strcmp(envval, "NO") == 0) {

     }
 
     ret = sss_cli_check_socket(errnop, SSS_NSS_SOCKET_NAME);
@@ -727,26 +726,26 @@ enum nss_status sss_nss_make_request(enu
 #ifdef NONSTANDARD_SSS_NSS_BEHAVIOUR
         *errnop = 0;
         errno = 0;
-        return NSS_STATUS_NOTFOUND;
+        return NS_NOTFOUND;
 #else
-        return NSS_STATUS_UNAVAIL;
+        return NS_UNAVAIL;
 #endif
     }
 
     ret = sss_cli_make_request_nochecks(cmd, rd, repbuf, replen, errnop);
     switch (ret) {
     case SSS_STATUS_TRYAGAIN:
-        return NSS_STATUS_TRYAGAIN;
+        return NS_TRYAGAIN;
     case SSS_STATUS_SUCCESS:
-        return NSS_STATUS_SUCCESS;
+        return NS_SUCCESS;
     case SSS_STATUS_UNAVAIL:
     default:
 #ifdef NONSTANDARD_SSS_NSS_BEHAVIOUR
         *errnop = 0;
         errno = 0;
-        return NSS_STATUS_NOTFOUND;
+        return NS_NOTFOUND;
 #else
-        return NSS_STATUS_UNAVAIL;
+        return NS_UNAVAIL;
 #endif
     }
 }
@@ -775,23 +774,23 @@ int sss_pac_make_request(enum sss_cli_co
     /* avoid looping in the nss daemon */
     envval = getenv("_SSS_LOOPS");
     if (envval && strcmp(envval, "NO") == 0) {
-        return NSS_STATUS_NOTFOUND;
+        return NS_NOTFOUND;
     }
 
     ret = sss_cli_check_socket(errnop, SSS_PAC_SOCKET_NAME);
     if (ret != SSS_STATUS_SUCCESS) {
-        return NSS_STATUS_UNAVAIL;
+        return NS_UNAVAIL;




--- src/util/server.c.orig	2015-06-12 09:02:30 UTC
index 343668c..f8a1627 100644
--- src/util/server.c
+++ src/util/server.c
@@ -308,8 +308,11 @@ static void setup_signals(void)
     BlockSignals(false, SIGTERM);
 
     CatchSignal(SIGHUP, sig_hup);
-
 #ifndef HAVE_PRCTL
         /* If prctl is not defined on the system, try to handle
          * some common termination signals gracefully */
-    CatchSignal(SIGSEGV, sig_segv_abrt);
-    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);




diff --git src/util/signal.c src/util/signal.c
index 053457b..bb8f8be 100644
--- src/util/signal.c
+++ src/util/signal.c
@@ -28,45 +28,6 @@
  * @brief Signal handling
  */
 
-/****************************************************************************
- Catch child exits and reap the child zombie status.
-****************************************************************************/
-
-static void sig_cld(int signum)
-{
-	while (waitpid((pid_t)-1,(int *)NULL, WNOHANG) > 0)
-		;
-
-	/*
-	 * Turns out it's *really* important not to
-	 * restore the signal handler here if we have real POSIX
-	 * signal handling. If we do, then we get the signal re-delivered
-	 * immediately - hey presto - instant loop ! JRA.
-	 */
-
-#if !defined(HAVE_SIGACTION)
-	CatchSignal(SIGCLD, sig_cld);
-#endif
-}
-
-/****************************************************************************
-catch child exits - leave status;
-****************************************************************************/
-
-static void sig_cld_leave_status(int signum)
-{
-	/*
-	 * Turns out it's *really* important not to
-	 * restore the signal handler here if we have real POSIX
-	 * signal handling. If we do, then we get the signal re-delivered
-	 * immediately - hey presto - instant loop ! JRA.
-	 */
-
-#if !defined(HAVE_SIGACTION)
-	CatchSignal(SIGCLD, sig_cld_leave_status);
-#endif
-}
-
 /**
  Block sigs.
 **/
@@ -126,21 +87,3 @@ void (*CatchSignal(int signum,void (*handler)(int )))(int)
 	return signal(signum, handler);
 #endif
 }
-
-/**
- Ignore SIGCLD via whatever means is necessary for this OS.
-**/
-
-void CatchChild(void)
-{
-	CatchSignal(SIGCLD, sig_cld);
-}
-
-/**
- Catch SIGCLD but leave the child around so it's status can be reaped.
-**/
-
-void CatchChildLeaveStatus(void)
-{
-	CatchSignal(SIGCLD, sig_cld_leave_status);
-}




--- src/util/util.h.orig	2015-06-12 09:02:30 UTC
index 7a66846..5e63275 100644
--- src/util/util.h
+++ src/util/util.h
@@ -647,5 +647,6 @@ int get_seuser(TALLOC_CTX *mem_ctx, cons
 #include <signal.h>
 void BlockSignals(bool block, int signum);
 void (*CatchSignal(int signum,void (*handler)(int )))(int);
-void CatchChild(void);
-void CatchChildLeaveStatus(void);
 
 /* convert time from generalized form to unix time */
 errno_t sss_utc_to_time_t(const char *str, const char *format, time_t *unix_time);
@@ -542,5 +540,6 @@ char * sss_replace_space(TALLOC_CTX *mem_ctx,
 char * sss_reverse_replace_space(TALLOC_CTX *mem_ctx,
                                  const char *orig_name,
                                  const char replace_char);
+#include "util/sss_bsd_errno.h"
 
 #endif /* __SSSD_UTIL_H__ */




--- src/external/pac_responder.m4.orig	2015-06-12 09:02:30 UTC
+++ src/external/pac_responder.m4
@@ -14,7 +14,7 @@ then
     PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac, ndr_krb5pac_ok=yes,
         AC_MSG_WARN([Cannot build pac responder without libndr_krb5pac]))
 

     AC_MSG_CHECKING(for supported MIT krb5 version)
     KRB5_VERSION="`$KRB5_CONFIG --version`"
     case $KRB5_VERSION in
@@ -22,7 +22,11 @@ then
         Kerberos\ 5\ release\ 1.10* | \
         Kerberos\ 5\ release\ 1.11* | \
         Kerberos\ 5\ release\ 1.12* | \
-        Kerberos\ 5\ release\ 1.13*)
+        Kerberos\ 5\ release\ 1.13* | \
+        Kerberos\ 5\ release\ 1.14* | \
+        Kerberos\ 5\ release\ 1.15* | \

Lines 34-40 Link Here

(-)files/sssd.in (-1 / +1 lines)
34		34
35	sssd_prestart()	35	sssd_prestart()
36	{	36	{
37	for i in db/sss db/sss_mc log/sssd run/sss/krb5.include.d run/sss/private run/sss; do	37	for i in db/sss db/sss/db db/sss/gpo_cache db/sss/mc log/sssd run/sss/krb5.include.d run/sss/private run/sss; do
38	if [ ! -d var/${i} ]; then mkdir -p /var/${i}; fi	38	if [ ! -d var/${i} ]; then mkdir -p /var/${i}; fi
39	done	39	done
40	}	40	}

Lines 5-10 Link Here

(-)pkg-plist (-37 / +48 lines)
5	include/ipa_hbac.h	5	include/ipa_hbac.h
6	include/sss_idmap.h	6	include/sss_idmap.h
7	include/sss_nss_idmap.h	7	include/sss_nss_idmap.h
		8	include/sss_sifp_dbus.h
		9	include/sss_sifp.h
		10	include/wbclient_sssd.h
8	%%SMB%%lib/krb5/plugins/authdata/sssd_pac_plugin.so	11	%%SMB%%lib/krb5/plugins/authdata/sssd_pac_plugin.so
9	lib/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so	12	lib/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
10	lib/libipa_hbac.so	13	lib/libipa_hbac.so
Lines 15-21 Link Here
15	lib/libsss_idmap.so.0.4.0	18	lib/libsss_idmap.so.0.4.0
16	lib/libsss_nss_idmap.so	19	lib/libsss_nss_idmap.so
17	lib/libsss_nss_idmap.so.0	20	lib/libsss_nss_idmap.so.0
18	lib/libsss_nss_idmap.so.0.0.1	21	lib/libsss_nss_idmap.so.0.1.0
		22	lib/libsss_simpleifp.so
		23	lib/libsss_simpleifp.so.0
		24	lib/libsss_simpleifp.so.0.0.1
19	lib/libsss_sudo.so	25	lib/libsss_sudo.so
20	lib/nss_sss.so	26	lib/nss_sss.so
21	lib/nss_sss.so.1	27	lib/nss_sss.so.1
Lines 22-28 Link Here
22	lib/nss_sss.so.2	28	lib/nss_sss.so.2
23	lib/nss_sss.so.2.0.0	29	lib/nss_sss.so.2.0.0
24	lib/pam_sss.so	30	lib/pam_sss.so
25	%%PYTHON_SITELIBDIR%%/SSSDConfig-1.11.7-py%%PYTHON_VER%%.egg-info	31	%%PYTHON_SITELIBDIR%%/SSSDConfig-1.12.5-py%%PYTHON_VER%%.egg-info
26	%%PYTHON_SITELIBDIR%%/SSSDConfig/__init__.py	32	%%PYTHON_SITELIBDIR%%/SSSDConfig/__init__.py
27	%%PYTHON_SITELIBDIR%%/SSSDConfig/__init__.pyc	33	%%PYTHON_SITELIBDIR%%/SSSDConfig/__init__.pyc
28	%%PYTHON_SITELIBDIR%%/SSSDConfig/ipachangeconf.py	34	%%PYTHON_SITELIBDIR%%/SSSDConfig/ipachangeconf.py
Lines 46-54 Link Here
46	lib/sssd/libsss_proxy.so	52	lib/sssd/libsss_proxy.so
47	lib/sssd/libsss_simple.so	53	lib/sssd/libsss_simple.so
48	lib/sssd/libsss_util.so	54	lib/sssd/libsss_util.so
		55	lib/sssd/libsss_semanage.so
		56	lib/sssd/modules/libwbclient.so
		57	lib/sssd/modules/libwbclient.so.0
		58	lib/sssd/modules/libwbclient.so.0.12.0
		59	lib/sssd/modules/sssd_krb5_localauth_plugin.so
49	libdata/pkgconfig/ipa_hbac.pc	60	libdata/pkgconfig/ipa_hbac.pc
50	libdata/pkgconfig/sss_idmap.pc	61	libdata/pkgconfig/sss_idmap.pc
51	libdata/pkgconfig/sss_nss_idmap.pc	62	libdata/pkgconfig/sss_nss_idmap.pc
		63	libdata/pkgconfig/sss_simpleifp.pc
		64	libdata/pkgconfig/wbclient_sssd.pc
52	libexec/sssd/krb5_child	65	libexec/sssd/krb5_child
53	libexec/sssd/ldap_child	66	libexec/sssd/ldap_child
54	libexec/sssd/proxy_child	67	libexec/sssd/proxy_child
Lines 60-72 Link Here
60	libexec/sssd/sssd_pam	73	libexec/sssd/sssd_pam
61	libexec/sssd/sssd_ssh	74	libexec/sssd/sssd_ssh
62	libexec/sssd/sssd_sudo	75	libexec/sssd/sssd_sudo
63	man/es/man1/sss_ssh_authorizedkeys.1.gz	76	man/de/man1/sss_ssh_authorizedkeys.1.gz
		77	man/de/man1/sss_ssh_knownhostsproxy.1.gz
		78	man/de/man5/sssd-ifp.5.gz
		79	man/de/man5/sssd-krb5.5.gz
		80	man/de/man5/sssd-ldap.5.gz
		81	man/de/man5/sssd-simple.5.gz
		82	man/de/man5/sssd-sudo.5.gz
		83	man/de/man5/sssd.conf.5.gz
		84	man/de/man8/pam_sss.8.gz
		85	man/de/man8/sss_cache.8.gz
		86	man/de/man8/sss_debuglevel.8.gz
		87	man/de/man8/sss_groupadd.8.gz
		88	man/de/man8/sss_groupdel.8.gz
		89	man/de/man8/sss_groupmod.8.gz
		90	man/de/man8/sss_groupshow.8.gz
		91	man/de/man8/sss_obfuscate.8.gz
		92	man/de/man8/sss_seed.8.gz
		93	man/de/man8/sss_useradd.8.gz
		94	man/de/man8/sss_userdel.8.gz
		95	man/de/man8/sss_usermod.8.gz
		96	man/de/man8/sssd_krb5_locator_plugin.8.gz
		97	man/de/man8/sssd.8.gz
64	man/es/man1/sss_ssh_knownhostsproxy.1.gz	98	man/es/man1/sss_ssh_knownhostsproxy.1.gz
65	man/es/man5/sssd-ldap.5.gz	99	man/es/man5/sssd-ldap.5.gz
66	man/es/man5/sssd-simple.5.gz	100	man/es/man5/sssd-simple.5.gz
67	man/es/man5/sssd-sudo.5.gz	101	man/es/man5/sssd-sudo.5.gz
68	man/es/man5/sssd.conf.5.gz
69	man/es/man8/pam_sss.8.gz
70	man/es/man8/sss_cache.8.gz	102	man/es/man8/sss_cache.8.gz
71	man/es/man8/sss_debuglevel.8.gz	103	man/es/man8/sss_debuglevel.8.gz
72	man/es/man8/sss_groupadd.8.gz	104	man/es/man8/sss_groupadd.8.gz
Lines 82-88 Link Here
82	man/es/man8/sssd_krb5_locator_plugin.8.gz	114	man/es/man8/sssd_krb5_locator_plugin.8.gz
83	man/fr/man1/sss_ssh_authorizedkeys.1.gz	115	man/fr/man1/sss_ssh_authorizedkeys.1.gz
84	man/fr/man1/sss_ssh_knownhostsproxy.1.gz	116	man/fr/man1/sss_ssh_knownhostsproxy.1.gz
85	man/fr/man5/sssd-ad.5.gz
86	man/fr/man5/sssd-krb5.5.gz	117	man/fr/man5/sssd-krb5.5.gz
87	man/fr/man5/sssd-ldap.5.gz	118	man/fr/man5/sssd-ldap.5.gz
88	man/fr/man5/sssd-simple.5.gz	119	man/fr/man5/sssd-simple.5.gz
Lines 107-114 Link Here
107	man/ja/man5/sssd-krb5.5.gz	138	man/ja/man5/sssd-krb5.5.gz
108	man/ja/man5/sssd-ldap.5.gz	139	man/ja/man5/sssd-ldap.5.gz
109	man/ja/man5/sssd-simple.5.gz	140	man/ja/man5/sssd-simple.5.gz
110	man/ja/man5/sssd.conf.5.gz
111	man/ja/man8/pam_sss.8.gz
112	man/ja/man8/sss_cache.8.gz	141	man/ja/man8/sss_cache.8.gz
113	man/ja/man8/sss_debuglevel.8.gz	142	man/ja/man8/sss_debuglevel.8.gz
114	man/ja/man8/sss_groupadd.8.gz	143	man/ja/man8/sss_groupadd.8.gz
Lines 123-131 Link Here
123	man/ja/man8/sssd_krb5_locator_plugin.8.gz	152	man/ja/man8/sssd_krb5_locator_plugin.8.gz
124	man/man1/sss_ssh_authorizedkeys.1.gz	153	man/man1/sss_ssh_authorizedkeys.1.gz
125	man/man1/sss_ssh_knownhostsproxy.1.gz	154	man/man1/sss_ssh_knownhostsproxy.1.gz
126	man/man5/sssd-ad.5.gz	155	%%SMB%%man/man5/sssd-ad.5.gz
127	man/man5/sssd-ifp.5.gz	156	man/man5/sssd-ifp.5.gz
128	man/man5/sssd-ipa.5.gz	157	%%SMB%%man/man5/sssd-ipa.5.gz
129	man/man5/sssd-krb5.5.gz	158	man/man5/sssd-krb5.5.gz
130	man/man5/sssd-ldap.5.gz	159	man/man5/sssd-ldap.5.gz
131	man/man5/sssd-simple.5.gz	160	man/man5/sssd-simple.5.gz
Lines 148-176 Link Here
148	man/nl/man8/sss_groupmod.8.gz	177	man/nl/man8/sss_groupmod.8.gz
149	man/pt/man8/sss_groupdel.8.gz	178	man/pt/man8/sss_groupdel.8.gz
150	man/pt/man8/sss_groupmod.8.gz	179	man/pt/man8/sss_groupmod.8.gz
151	man/uk/man1/sss_ssh_authorizedkeys.1.gz
152	man/uk/man1/sss_ssh_knownhostsproxy.1.gz
153	man/uk/man5/sssd-ad.5.gz
154	man/uk/man5/sssd-ifp.5.gz
155	man/uk/man5/sssd-krb5.5.gz
156	man/uk/man5/sssd-ldap.5.gz
157	man/uk/man5/sssd-simple.5.gz
158	man/uk/man5/sssd-sudo.5.gz
159	man/uk/man5/sssd.conf.5.gz
160	man/uk/man8/pam_sss.8.gz
161	man/uk/man8/sss_cache.8.gz
162	man/uk/man8/sss_debuglevel.8.gz
163	man/uk/man8/sss_groupadd.8.gz
164	man/uk/man8/sss_groupdel.8.gz
165	man/uk/man8/sss_groupmod.8.gz
166	man/uk/man8/sss_groupshow.8.gz
167	man/uk/man8/sss_obfuscate.8.gz
168	man/uk/man8/sss_seed.8.gz
169	man/uk/man8/sss_useradd.8.gz
170	man/uk/man8/sss_userdel.8.gz
171	man/uk/man8/sss_usermod.8.gz
172	man/uk/man8/sssd.8.gz
173	man/uk/man8/sssd_krb5_locator_plugin.8.gz
174	sbin/sss_cache	180	sbin/sss_cache
175	sbin/sss_debuglevel	181	sbin/sss_debuglevel
176	sbin/sss_groupadd	182	sbin/sss_groupadd
Lines 188-196 Link Here
188	%%PORTDOCS%%@dir %%DOCSDIR%%/doc	194	%%PORTDOCS%%@dir %%DOCSDIR%%/doc
189	%%PORTDOCS%%@dir %%DOCSDIR%%/hbac_doc	195	%%PORTDOCS%%@dir %%DOCSDIR%%/hbac_doc
190	%%PORTDOCS%%@dir %%DOCSDIR%%/idmap_doc	196	%%PORTDOCS%%@dir %%DOCSDIR%%/idmap_doc
		197	%%PORTDOCS%%@dir %%DOCSDIR%%/libsss_simpleifp_doc
191	%%PORTDOCS%%@dir %%DOCSDIR%%/libsss_sudo_doc	198	%%PORTDOCS%%@dir %%DOCSDIR%%/libsss_sudo_doc
192	%%PORTDOCS%%@dir %%DOCSDIR%%/nss_idmap_doc	199	%%PORTDOCS%%@dir %%DOCSDIR%%/nss_idmap_doc
193	@unexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi	200	@dir /var/db/sss
194	@unexec if [ -d /var/db/sss ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf /var/db/sss`` to remove any additional files."; fi	201	@dir /var/db/sss/db
195	@unexec if [ -d /var/db/sss_mc ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf /var/db/sss_mc`` to remove any additional files."; fi	202	@dir /var/db/sss/gpo_cache
196	@unexec if [ -d /var/run/sss ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf /var/run/sss`` to remove any additional files."; fi	203	@dir /var/db/sss/mc
		204	@dir /var/log/sssd
		205	@dir /var/run/sss
		206	@dir /var/run/sss/krb5.include.d
		207	@dir /var/run/sss/private

Return to bug 238465

Lines 2-9 Link Here

(-)Makefile (-18 / +15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sssd	4	PORTNAME= sssd
5	PORTVERSION= 1.11.7	5	PORTVERSION= 1.12.5
6	PORTREVISION= 18
7	CATEGORIES= security	6	CATEGORIES= security
8	MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/	7	MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/
9		8
Lines 14-20 Link Here
14	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	LIB_DEPENDS= libpopt.so:devel/popt \	15	LIB_DEPENDS= libpopt.so:devel/popt \
17	libldb.so:databases/ldb \	16	libtalloc.so:devel/talloc \
		17	libtevent.so:devel/tevent \
		18	libtdb.so:databases/tdb \
		19	libldb.so:databases/ldb14 \
18	libcares.so:dns/c-ares \	20	libcares.so:dns/c-ares \
19	libdbus-1.so:devel/dbus \	21	libdbus-1.so:devel/dbus \
20	libdhash.so:devel/ding-libs \	22	libdhash.so:devel/ding-libs \
Lines 24-42 Link Here
24	libsasl2.so:security/cyrus-sasl2 \	26	libsasl2.so:security/cyrus-sasl2 \
25	libinotify.so:devel/libinotify \	27	libinotify.so:devel/libinotify \
26	libplds4.so:devel/nspr	28	libplds4.so:devel/nspr
27	BUILD_DEPENDS= talloc1>0:devel/talloc1 \	29	BUILD_DEPENDS= xmlcatalog:textproc/libxml2 \
28	tevent1>0:devel/tevent1 \
29	tdb1>0:databases/tdb1 \
30	xmlcatalog:textproc/libxml2 \
31	docbook-xsl>=1:textproc/docbook-xsl \	30	docbook-xsl>=1:textproc/docbook-xsl \
32	xsltproc:textproc/libxslt \	31	xsltproc:textproc/libxslt \
33	xmlcatmgr:textproc/xmlcatmgr \	32	xmlcatmgr:textproc/xmlcatmgr \
34	krb5>=1.10:security/krb5 \	33	krb5>=1.10:security/krb5 \
35	nsupdate:dns/bind-tools	34	nsupdate:dns/bind-tools
36	RUN_DEPENDS= talloc1>0:devel/talloc1 \
37	tevent1>0:devel/tevent1 \
38	tdb1>0:databases/tdb1
39		35
		36	USES= autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \
		37	python:2.7 shebangfix gssapi:mit
		38
40	GNU_CONFIGURE= yes	39	GNU_CONFIGURE= yes
41	CONFIGURE_ARGS= --with-selinux=no --with-semanage=no \	40	CONFIGURE_ARGS= --with-selinux=no --with-semanage=no \
42	--with-ldb-lib-dir=${LOCALBASE}/lib/shared-modules/ldb \	41	--with-ldb-lib-dir=${LOCALBASE}/lib/shared-modules/ldb \
Lines 44-54 Link Here
44	--with-libnl=no --with-init-dir=no --datadir=${DATADIR} \	43	--with-libnl=no --with-init-dir=no --datadir=${DATADIR} \
45	--docdir=${DOCSDIR} --with-pid-path=/var/run \	44	--docdir=${DOCSDIR} --with-pid-path=/var/run \
46	--localstatedir=/var --enable-pammoddir=${PREFIX}/lib \	45	--localstatedir=/var --enable-pammoddir=${PREFIX}/lib \
47	--with-db-path=/var/db/sss --with-pipe-path=/var/run/sss \	46	--with-db-path=/var/db/sss/db \
48	--with-pubconf-path=/var/run/sss --with-mcache-path=/var/db/sss_mc \	47	--with-gpo-cache-path=/var/db/sss/gpo_cache \
		48	--with-pipe-path=/var/run/sss \
		49	--with-pubconf-path=/var/run/sss --with-mcache-path=/var/db/sss/mc \
49	--with-unicode-lib=libunistring --with-autofs=no \	50	--with-unicode-lib=libunistring --with-autofs=no \
50	--disable-cifs-idmap-plugin --disable-config-lib \	51	--disable-cifs-idmap-plugin --disable-config-lib \
51	--with-krb5-conf=/etc/krb5.conf	52	--with-krb5-conf=/etc/krb5.conf
		53	# TODO: investigate possible sssd/nfsuserd compatibility
		54	CONFIGURE_ARGS+= --without-nfsv4-idmapd-plugin
52	CFLAGS+= -fstack-protector-all	55	CFLAGS+= -fstack-protector-all
53	PLIST_SUB= PYTHON_VER=${PYTHON_VER}	56	PLIST_SUB= PYTHON_VER=${PYTHON_VER}
54	#DEBUG_FLAGS= -g	57	#DEBUG_FLAGS= -g
Lines 57-64 Link Here
57		60
58	USE_LDCONFIG= yes	61	USE_LDCONFIG= yes
59	USE_OPENLDAP= yes	62	USE_OPENLDAP= yes
60	USES= autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \
61	python:2.7 shebangfix gssapi:mit
62	INSTALL_TARGET= install-strip	63	INSTALL_TARGET= install-strip
63	CPE_VENDOR= fedoraproject	64	CPE_VENDOR= fedoraproject
64		65
Lines 100-109 Link Here
100	${INSTALL_DATA} ${WRKSRC}/src/examples/sssd-example.conf \	101	${INSTALL_DATA} ${WRKSRC}/src/examples/sssd-example.conf \
101	${STAGEDIR}${ETCDIR}/sssd.conf.sample	102	${STAGEDIR}${ETCDIR}/sssd.conf.sample
102	${LN} -sf nss_sss.so ${STAGEDIR}${PREFIX}/lib/nss_sss.so.1	103	${LN} -sf nss_sss.so ${STAGEDIR}${PREFIX}/lib/nss_sss.so.1
103	# clean these up from the install; we create them in rc script start_precmd
104	.for d in db/sss db/sss_mc log/sssd run/sss/krb5.include.d run/sss/private run/sss
105	@${RMDIR} ${STAGEDIR}/var/${d}
106	.endfor
107	# clean unused man dirs	104	# clean unused man dirs
108	.for i in nl/man1 nl/man5 pt/man1 pt/man5	105	.for i in nl/man1 nl/man5 pt/man1 pt/man5
109	@${RMDIR} ${STAGEDIR}${PREFIX}/man/${i}	106	@${RMDIR} ${STAGEDIR}${PREFIX}/man/${i}

Lines 1-16 Link Here

(-)files/patch-Makefile.am (-14 / +20 lines)
1	diff --git Makefile.am Makefile.am	1	--- Makefile.am.orig 2019-06-13 15:09:58 UTC
2	index fd74d85..4a7e6ae 100644
3	--- Makefile.am
4	+++ Makefile.am	2	+++ Makefile.am
5	@@ -311,6 +311,7 @@ AM_CPPFLAGS = \	3	@@ -372,6 +372,7 @@ AM_CPPFLAGS = \
6	$(LIBNL_CFLAGS) \
7	$(OPENLDAP_CFLAGS) \	4	$(OPENLDAP_CFLAGS) \
8	$(GLIB2_CFLAGS) \	5	$(GLIB2_CFLAGS) \
		6	$(JOURNALD_CFLAGS) \
9	+ -DHOST_NAME_MAX=_POSIX_HOST_NAME_MAX \	7	+ -DHOST_NAME_MAX=_POSIX_HOST_NAME_MAX \
10	-DLIBDIR=\"$(libdir)\" \	8	-DLIBDIR=\"$(libdir)\" \
11	-DVARDIR=\"$(localstatedir)\" \	9	-DVARDIR=\"$(localstatedir)\" \
12	-DSHLIBEXT=\"$(SHLIBEXT)\" \	10	-DSYSCONFDIR=\"$(sysconfdir)\" \
13	@@ -378,6 +379,7 @@ SSSD_LIBS = \	11	@@ -441,6 +442,7 @@ SSSD_LIBS = \
14	$(DHASH_LIBS) \	12	$(DHASH_LIBS) \
15	$(SSS_CRYPT_LIBS) \	13	$(SSS_CRYPT_LIBS) \
16	$(OPENLDAP_LIBS) \	14	$(OPENLDAP_LIBS) \
Lines 18-32 Link Here
18	$(TDB_LIBS)	16	$(TDB_LIBS)
19		17
20	PYTHON_BINDINGS_LIBS = \	18	PYTHON_BINDINGS_LIBS = \
21	@@ -433,6 +435,7 @@ dist_noinst_HEADERS = \	19	@@ -493,6 +495,7 @@ dist_noinst_HEADERS = \
22	src/util/sss_ssh.h \	20	src/util/sss_ssh.h \
23	src/util/sss_ini.h \	21	src/util/sss_ini.h \
24	src/util/sss_format.h \	22	src/util/sss_format.h \
25	+ src/util/sss_bsd_errno.h \	23	+ src/util/sss_bsd_errno.h \
		24	src/util/sss_config.h \
26	src/util/refcount.h \	25	src/util/refcount.h \
27	src/util/find_uid.h \	26	src/util/find_uid.h \
28	src/util/user_info_msg.h \	27	@@ -2288,9 +2291,10 @@ endif
29	@@ -1700,9 +1703,10 @@ endif
30	# Client Libraries #	28	# Client Libraries #
31	####################	29	####################
32		30
Lines 39-45 Link Here
39	src/sss_client/nss_passwd.c \	37	src/sss_client/nss_passwd.c \
40	src/sss_client/nss_group.c \	38	src/sss_client/nss_group.c \
41	src/sss_client/nss_netgroup.c \	39	src/sss_client/nss_netgroup.c \
42	@@ -1715,9 +1719,9 @@ libnss_sss_la_SOURCES = \	40	@@ -2303,9 +2307,9 @@ libnss_sss_la_SOURCES = \
43	src/sss_client/nss_mc_passwd.c \	41	src/sss_client/nss_mc_passwd.c \
44	src/sss_client/nss_mc_group.c \	42	src/sss_client/nss_mc_group.c \
45	src/sss_client/nss_mc.h	43	src/sss_client/nss_mc.h
Lines 51-61 Link Here
51	-module \	49	-module \
52	-version-info 2:0:0 \	50	-version-info 2:0:0 \
53	-Wl,--version-script,$(srcdir)/src/sss_client/sss_nss.exports	51	-Wl,--version-script,$(srcdir)/src/sss_client/sss_nss.exports
54	@@ -2086,6 +2090,7 @@ ldap_child_LDADD = \	52	@@ -2504,6 +2508,7 @@ libsss_krb5_common_la_CFLAGS = \
		53	libsss_krb5_common_la_LIBADD = \
		54	$(KEYUTILS_LIBS) \
		55	$(DHASH_LIBS) \
		56	+ $(LTLIBINTL) \
		57	$(KRB5_LIBS)
		58	libsss_krb5_common_la_LDFLAGS = \
		59	-avoid-version
		60	@@ -2735,6 +2740,7 @@ ldap_child_LDADD = \
		61	$(TALLOC_LIBS) \
55	$(POPT_LIBS) \	62	$(POPT_LIBS) \
56	$(OPENLDAP_LIBS) \
57	$(DHASH_LIBS) \	63	$(DHASH_LIBS) \
58	+ $(LTLIBINTL) \	64	+ $(LTLIBINTL) \
59	$(KRB5_LIBS)	65	$(KRB5_LIBS)
60		66
61	proxy_child_SOURCES = \	67	if BUILD_SEMANAGE

Lines 1-21 Link Here

(-)files/patch-configure.ac (-21 lines)
1	--- configure.ac.orig 2013-11-06 18:35:03 UTC
2	+++ configure.ac
3	@@ -5,15 +5,15 @@ AC_INIT([sssd],
4	VERSION_NUMBER,
5	[sssd-devel@lists.fedorahosted.org])
6
7	+AC_CONFIG_SRCDIR([BUILD.txt])
8	+AC_CONFIG_AUX_DIR([build])
9	+
10	m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
11	[AC_USE_SYSTEM_EXTENSIONS],
12	[AC_GNU_SOURCE])
13
14	CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
15
16	-AC_CONFIG_SRCDIR([BUILD.txt])
17	-AC_CONFIG_AUX_DIR([build])
18	-
19	AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax])
20	AM_PROG_CC_C_O
21	m4_ifdef([AM_PROG_AR], [AM_PROG_AR])

Line 0 Link Here

(-)files/patch-src-util-util.c (+29 lines)
	1	--- src/util/util.c.orig 2015-06-12 09:02:30 UTC
	2	+++ src/util/util.c
	3	@@ -900,7 +900,7 @@ errno_t sss_utc_to_time_t(const char *st
	4	len = strlen(str);
	5	if (str[len-1] != 'Z') {
	6	DEBUG(SSSDBG_TRACE_INTERNAL,
	7	- "%s does not seem to be in UTZ time zone.\n", str);
	8	+ "%s does not seem to be in UTC time zone.\n", str);
	9	return ERR_TIMESPEC_NOT_SUPPORTED;
	10	}
	11
	12	@@ -921,15 +921,13 @@ errno_t sss_utc_to_time_t(const char *st
	13	return EINVAL;
	14	}
	15
	16	- ut = mktime(&tm);
	17	+ ut = timegm(&tm);
	18	if (ut == -1) {
	19	DEBUG(SSSDBG_TRACE_INTERNAL,
	20	- "mktime failed to convert [%s].\n", str);
	21	+ "timegm failed to convert [%s].\n", str);
	22	return EINVAL;
	23	}
	24
	25	- tzset();
	26	- ut -= timezone;
	27	*_unix_time = ut;
	28	return EOK;
	29	}

Lines 1-6 Link Here

(-)files/patch-src__sss_client__common.c (-7 / +47 lines)
1	diff --git src/sss_client/common.c src/sss_client/common.c	1	--- src/sss_client/common.c.orig 2015-06-12 09:02:30 UTC
2	index ec5c708..5d17eed 100644
3	--- src/sss_client/common.c
4	+++ src/sss_client/common.c	2	+++ src/sss_client/common.c
5	@@ -25,6 +25,7 @@	3	@@ -25,6 +25,7 @@
6	#include "config.h"	4	#include "config.h"
Lines 18-24 Link Here
18		16
19	#if HAVE_PTHREAD	17	#if HAVE_PTHREAD
20	#include <pthread.h>	18	#include <pthread.h>
21	@@ -124,7 +126,6 @@ static enum sss_status sss_cli_send_req(enum sss_cli_command cmd,	19	@@ -124,7 +126,6 @@ static enum sss_status sss_cli_send_req(
22	*errnop = error;	20	*errnop = error;
23	break;	21	break;
24	case 0:	22	case 0:
Lines 26-32 Link Here
26	break;	24	break;
27	case 1:	25	case 1:
28	if (pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL)) {	26	if (pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL)) {
29	@@ -232,7 +233,6 @@ static enum sss_status sss_cli_recv_rep(enum sss_cli_command cmd,	27	@@ -232,7 +233,6 @@ static enum sss_status sss_cli_recv_rep(
30	*errnop = error;	28	*errnop = error;
31	break;	29	break;
32	case 0:	30	case 0:
Lines 34-40 Link Here
34	break;	32	break;
35	case 1:	33	case 1:
36	if (pfd.revents & (POLLHUP)) {	34	if (pfd.revents & (POLLHUP)) {
37	@@ -669,7 +669,6 @@ static enum sss_status sss_cli_check_socket(int errnop, const char socket_name	35	@@ -669,7 +669,6 @@ static enum sss_status sss_cli_check_soc
38	*errnop = error;	36	*errnop = error;
39	break;	37	break;
40	case 0:	38	case 0:
Lines 42-48 Link Here
42	break;	40	break;
43	case 1:	41	case 1:
44	if (pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL)) {	42	if (pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL)) {
45	@@ -719,23 +718,23 @@ enum nss_status sss_nss_make_request(enum sss_cli_command cmd,	43	@@ -719,7 +718,7 @@ enum nss_status sss_nss_make_request(enu
46	/* avoid looping in the nss daemon */	44	/* avoid looping in the nss daemon */
47	envval = getenv("_SSS_LOOPS");	45	envval = getenv("_SSS_LOOPS");
48	if (envval && strcmp(envval, "NO") == 0) {	46	if (envval && strcmp(envval, "NO") == 0) {
Lines 51-56 Link Here
51	}	49	}
52		50
53	ret = sss_cli_check_socket(errnop, SSS_NSS_SOCKET_NAME);	51	ret = sss_cli_check_socket(errnop, SSS_NSS_SOCKET_NAME);
		52	@@ -727,26 +726,26 @@ enum nss_status sss_nss_make_request(enu
		53	#ifdef NONSTANDARD_SSS_NSS_BEHAVIOUR
		54	*errnop = 0;
		55	errno = 0;
		56	- return NSS_STATUS_NOTFOUND;
		57	+ return NS_NOTFOUND;
		58	#else
		59	- return NSS_STATUS_UNAVAIL;
		60	+ return NS_UNAVAIL;
		61	#endif
		62	}
		63
		64	ret = sss_cli_make_request_nochecks(cmd, rd, repbuf, replen, errnop);
		65	switch (ret) {
		66	case SSS_STATUS_TRYAGAIN:
		67	- return NSS_STATUS_TRYAGAIN;
		68	+ return NS_TRYAGAIN;
		69	case SSS_STATUS_SUCCESS:
		70	- return NSS_STATUS_SUCCESS;
		71	+ return NS_SUCCESS;
		72	case SSS_STATUS_UNAVAIL:
		73	default:
		74	#ifdef NONSTANDARD_SSS_NSS_BEHAVIOUR
		75	*errnop = 0;
		76	errno = 0;
		77	- return NSS_STATUS_NOTFOUND;
		78	+ return NS_NOTFOUND;
		79	#else
		80	- return NSS_STATUS_UNAVAIL;
		81	+ return NS_UNAVAIL;
		82	#endif
		83	}
		84	}
		85	@@ -775,23 +774,23 @@ int sss_pac_make_request(enum sss_cli_co
		86	/* avoid looping in the nss daemon */
		87	envval = getenv("_SSS_LOOPS");
		88	if (envval && strcmp(envval, "NO") == 0) {
		89	- return NSS_STATUS_NOTFOUND;
		90	+ return NS_NOTFOUND;
		91	}
		92
		93	ret = sss_cli_check_socket(errnop, SSS_PAC_SOCKET_NAME);
54	if (ret != SSS_STATUS_SUCCESS) {	94	if (ret != SSS_STATUS_SUCCESS) {
55	- return NSS_STATUS_UNAVAIL;	95	- return NSS_STATUS_UNAVAIL;
56	+ return NS_UNAVAIL;	96	+ return NS_UNAVAIL;

Lines 1-19 Link Here

(-)files/patch-src__util__server.c (-12 / +4 lines)
1	diff --git src/util/server.c src/util/server.c	1	--- src/util/server.c.orig 2015-06-12 09:02:30 UTC
2	index 343668c..f8a1627 100644
3	--- src/util/server.c
4	+++ src/util/server.c	2	+++ src/util/server.c
5	@@ -322,12 +322,14 @@ static void setup_signals(void)	3	@@ -308,8 +308,11 @@ static void setup_signals(void)
6	BlockSignals(false, SIGTERM);
7
8	CatchSignal(SIGHUP, sig_hup);
9	-
10	#ifndef HAVE_PRCTL	4	#ifndef HAVE_PRCTL
11	- /* If prctl is not defined on the system, try to handle	5	/* If prctl is not defined on the system, try to handle
12	- * some common termination signals gracefully */	6	* some common termination signals gracefully */
13	- CatchSignal(SIGSEGV, sig_segv_abrt);	7	- CatchSignal(SIGSEGV, sig_segv_abrt);
14	- CatchSignal(SIGABRT, sig_segv_abrt);	8	- CatchSignal(SIGABRT, sig_segv_abrt);
15	+ /* If prctl is not defined on the system, try to handle
16	+ * some common termination signals gracefully */
17	+ (void) sig_segv_abrt; /* unused */	9	+ (void) sig_segv_abrt; /* unused */
18	+ /*	10	+ /*
19	+ CatchSignal(SIGSEGV, sig_segv_abrt);	11	+ CatchSignal(SIGSEGV, sig_segv_abrt);

Lines 1-72 Link Here

(-)files/patch-src__util__signal.c (-72 lines)
1	diff --git src/util/signal.c src/util/signal.c
2	index 053457b..bb8f8be 100644
3	--- src/util/signal.c
4	+++ src/util/signal.c
5	@@ -28,45 +28,6 @@
6	* @brief Signal handling
7	*/
8
9	-/****************************************************************************
10	- Catch child exits and reap the child zombie status.
11	-****************************************************************************/
12	-
13	-static void sig_cld(int signum)
14	-{
15	- while (waitpid((pid_t)-1,(int *)NULL, WNOHANG) > 0)
16	- ;
17	-
18	- /*
19	- * Turns out it's really important not to
20	- * restore the signal handler here if we have real POSIX
21	- * signal handling. If we do, then we get the signal re-delivered
22	- * immediately - hey presto - instant loop ! JRA.
23	- */
24	-
25	-#if !defined(HAVE_SIGACTION)
26	- CatchSignal(SIGCLD, sig_cld);
27	-#endif
28	-}
29	-
30	-/****************************************************************************
31	-catch child exits - leave status;
32	-****************************************************************************/
33	-
34	-static void sig_cld_leave_status(int signum)
35	-{
36	- /*
37	- * Turns out it's really important not to
38	- * restore the signal handler here if we have real POSIX
39	- * signal handling. If we do, then we get the signal re-delivered
40	- * immediately - hey presto - instant loop ! JRA.
41	- */
42	-
43	-#if !defined(HAVE_SIGACTION)
44	- CatchSignal(SIGCLD, sig_cld_leave_status);
45	-#endif
46	-}
47	-
48	/**
49	Block sigs.
50	**/
51	@@ -126,21 +87,3 @@ void (CatchSignal(int signum,void (handler)(int )))(int)
52	return signal(signum, handler);
53	#endif
54	}
55	-
56	-/**
57	- Ignore SIGCLD via whatever means is necessary for this OS.
58	-**/
59	-
60	-void CatchChild(void)
61	-{
62	- CatchSignal(SIGCLD, sig_cld);
63	-}
64	-
65	-/**
66	- Catch SIGCLD but leave the child around so it's status can be reaped.
67	-**/
68	-
69	-void CatchChildLeaveStatus(void)
70	-{
71	- CatchSignal(SIGCLD, sig_cld_leave_status);
72	-}

Lines 1-20 Link Here

(-)files/patch-src__util__util.h (-15 / +4 lines)
1	diff --git src/util/util.h src/util/util.h	1	--- src/util/util.h.orig 2015-06-12 09:02:30 UTC
2	index 7a66846..5e63275 100644
3	--- src/util/util.h
4	+++ src/util/util.h	2	+++ src/util/util.h
5	@@ -227,8 +227,6 @@ void sig_term(int sig);	3	@@ -647,5 +647,6 @@ int get_seuser(TALLOC_CTX *mem_ctx, cons
6	#include <signal.h>
7	void BlockSignals(bool block, int signum);
8	void (CatchSignal(int signum,void (handler)(int )))(int);
9	-void CatchChild(void);
10	-void CatchChildLeaveStatus(void);
11		4
12	/* from memory.c */	5	/* convert time from generalized form to unix time */
13	typedef int (void_destructor_fn_t)(void *);	6	errno_t sss_utc_to_time_t(const char str, const char format, time_t *unix_time);
14	@@ -542,5 +540,6 @@ char * sss_replace_space(TALLOC_CTX *mem_ctx,
15	char * sss_reverse_replace_space(TALLOC_CTX *mem_ctx,
16	const char *orig_name,
17	const char replace_char);
18	+#include "util/sss_bsd_errno.h"	7	+#include "util/sss_bsd_errno.h"
19		8
20	#endif /* __SSSD_UTIL_H__ */	9	#endif /* __SSSD_UTIL_H__ */

Lines 1-6 Link Here

(-)files/patch-src_external_pac__responder.m4 (-5 / +5 lines)
1	--- src/external/pac_responder.m4.orig 2014-09-17 13:01:37 UTC	1	--- src/external/pac_responder.m4.orig 2015-06-12 09:02:30 UTC
2	+++ src/external/pac_responder.m4	2	+++ src/external/pac_responder.m4
3	@@ -14,14 +14,19 @@ then	3	@@ -14,7 +14,7 @@ then
4	PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac, ndr_krb5pac_ok=yes,	4	PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac, ndr_krb5pac_ok=yes,
5	AC_MSG_WARN([Cannot build pac responder without libndr_krb5pac]))	5	AC_MSG_WARN([Cannot build pac responder without libndr_krb5pac]))
6		6
Lines 9-19 Link Here
9	AC_MSG_CHECKING(for supported MIT krb5 version)	9	AC_MSG_CHECKING(for supported MIT krb5 version)
10	KRB5_VERSION="`$KRB5_CONFIG --version`"	10	KRB5_VERSION="`$KRB5_CONFIG --version`"
11	case $KRB5_VERSION in	11	case $KRB5_VERSION in
12	Kerberos\ 5\ release\ 1.9* \| \	12	@@ -22,7 +22,11 @@ then
13	Kerberos\ 5\ release\ 1.10* \| \	13	Kerberos\ 5\ release\ 1.10* \| \
14	Kerberos\ 5\ release\ 1.11* \| \	14	Kerberos\ 5\ release\ 1.11* \| \
15	- Kerberos\ 5\ release\ 1.12*)	15	Kerberos\ 5\ release\ 1.12* \| \
16	+ Kerberos\ 5\ release\ 1.12* \| \	16	- Kerberos\ 5\ release\ 1.13*)
17	+ Kerberos\ 5\ release\ 1.13* \| \	17	+ Kerberos\ 5\ release\ 1.13* \| \
18	+ Kerberos\ 5\ release\ 1.14* \| \	18	+ Kerberos\ 5\ release\ 1.14* \| \
19	+ Kerberos\ 5\ release\ 1.15* \| \	19	+ Kerberos\ 5\ release\ 1.15* \| \