Attachment #205304 for bug #238465




# $FreeBSD$

PORTNAME=	sssd
PORTVERSION=	1.13.4
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/talloc1 \
		libtevent.so:devel/tevent1 \
		libtdb.so:databases/tdb1 \
		libldb.so:databases/ldb13 \
		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 \
		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
# add __STDC_WANT_LIB_EXT1__ - see https://stackoverflow.com/questions/24206989/error-use-of-undeclared-identifier-errno-t
#CPPFLAGS+=	-D__STDC_WANT_LIB_EXT1__
#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_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


USE_RC_SUBR=	${PORTNAME}
PORTDATA=	*

OPTIONS_DEFINE=		DOCS SMB
OPTIONS_DEFAULT=	PYTHON3
OPTIONS_RADIO=		PYTHON
OPTIONS_RADIO_PYTHON=	PYTHON2 PYTHON3
OPTIONS_SUB=	yes

PYTHON2_CONFIGURE_WITH=	python2-bindings
PYTHON2_USES=	python:2.7
PYTHON2_VARS=	PYTHON2_CMD=${PYTHON_CMD:T} PYTHON3_CMD=
PYTHON3_CONFIGURE_WITH=	python3-bindings
PYTHON3_USES=	python:3.5+
PYTHON3_VARS=	PYTHON2_CMD= PYTHON3_CMD=${PYTHON_CMD:T}

PLIST_SUB+= PORTVERSION=${PORTVERSION} \
	PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR} \
	PYTHON_VER=${PYTHON_VER}

SMB_DESC=		Install IPA and AD providers (requires Samba4)
SMB_USES=		samba:lib # libndr-krb5pac libndr-nbt libndr libsamba-util
SMB_CONFIGURE_WITH=	samba
# PAC (Privilege Attribute Certificate) responder currently needs samba
SMB_CONFIGURE_ENABLE=	pac-responder

post-patch:
	@${REINPLACE_CMD} -e 's|SIGCLD|SIGCHLD|g' ${WRKSRC}/src/util/signal.c

	@${REINPLACE_CMD} -e 's|/etc/sssd/|${ETCDIR}/|g' \
		-e 's|/etc/openldap/|${LOCALBASE}/etc/openldap/|g' \
		${WRKSRC}/src/man/*xml
	@${REINPLACE_CMD} 's|%%PYTHON2_CMD%%|${PYTHON2_CMD}|g; \
		s|%%PYTHON3_CMD%%|${PYTHON3_CMD}|g' \
		${WRKSRC}/configure.ac
	@${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}/src/sss_client/bsdnss.c
	@${CP} ${FILESDIR}/sss_bsd_errno.h ${WRKSRC}/src/util/sss_bsd_errno.h


	${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}
.endfor

.include <bsd.port.options.mk>

.if empty(PORT_OPTIONS:MPYTHON2) && empty(PORT_OPTIONS:MPYTHON3)
PLIST_SUB+=	PYTHON="@comment "
USES+=		python:3.5+,build
.else
PLIST_SUB+=	PYTHON=
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +5 lines)
1	SHA256 (sssd-1.11.7.tar.gz) = ff12d5730a6d7d08fe11140aa58e544900b75c63902b7a07bbbc12d6a99cb5b5	1	TIMESTAMP = 1560523527
2	SIZE (sssd-1.11.7.tar.gz) = 3661227	2	SHA256 (sssd-1.13.4.tar.gz) = 0a7bba7697088734c5fa1844dbb6de4f1f11afd30df02f0c1dd2579114c0a194
		3	SIZE (sssd-1.13.4.tar.gz) = 4730392
		4	SHA256 (sssd-1.13.4.tar.gz.asc) = adf1ebfd023079092748f4998e4d8476014ee78f30ce59e0a464f841aef79afa
		5	SIZE (sssd-1.13.4.tar.gz.asc) = 181




--- Makefile.am.orig	2019-04-13 14:48:41 UTC
index fd74d85..4a7e6ae 100644
--- Makefile.am
+++ Makefile.am
@@ -54,7 +54,7 @@ sssddatadir = $(datadir)/sssd
 sssdapiplugindir = $(sssddatadir)/sssd.api.d
 dbuspolicydir = $(sysconfdir)/dbus-1/system.d
 dbusservicedir = $(datadir)/dbus-1/system-services
-sss_statedir = $(localstatedir)/lib/sss
+sss_statedir = $(localstatedir)/db/sss
 localedir = @localedir@
 nsslibdir = @nsslibdir@
 pamlibdir = @pammoddir@
@@ -96,6 +96,9 @@
                  -fno-strict-aliasing \
                  -std=gnu99
 endif
+if HAVE_ERRNO_T
+    AM_CFLAGS += -D__STDC_WANT_LIB_EXT1__
+endif

 pkgconfig_DATA =

@@ -427,6 +427,7 @@ AM_CPPFLAGS = \
     $(OPENLDAP_CFLAGS) \
     $(GLIB2_CFLAGS) \
     $(JOURNALD_CFLAGS) \
+    -DHOST_NAME_MAX=_POSIX_HOST_NAME_MAX \
     -DLIBDIR=\"$(libdir)\" \
     -DVARDIR=\"$(localstatedir)\" \
     -DSSS_STATEDIR=\"$(sss_statedir)\" \
@@ -497,6 +498,7 @@ SSSD_LIBS = \
     $(COLLECTION_LIBS) \
     $(DHASH_LIBS) \
     $(SSS_CRYPT_LIBS) \
     $(OPENLDAP_LIBS) \
+    $(LTLIBINTL) \
     $(TDB_LIBS)
 
 PYTHON_BINDINGS_LIBS = \
@@ -546,6 +548,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 \
@@ -2725,9 +2728,10 @@ intgcheck:
@@ -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 \
@@ -2741,9 +2745,9 @@ libnss_sss_la_SOURCES = \
     src/sss_client/nss_mc_passwd.c \
     src/sss_client/nss_mc_group.c \
     src/sss_client/nss_mc_initgr.c \
     src/sss_client/nss_mc.h
-libnss_sss_la_LIBADD = \
+nss_sss_la_LIBADD = \

     -module \
     -version-info 2:0:0 \
     -Wl,--version-script,$(srcdir)/src/sss_client/sss_nss.exports
@@ -2936,6 +2940,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
@@ -3184,6 +3189,7 @@ ldap_child_LDADD = \
     $(TALLOC_LIBS) \
     $(POPT_LIBS) \
     $(OPENLDAP_LIBS) \
     $(DHASH_LIBS) \
+    $(LTLIBINTL) \
     $(KRB5_LIBS)
 
 if BUILD_SEMANAGE
@@ -3223,6 +3229,7 @@ gpo_child_LDADD = \
     $(POPT_LIBS) \
     $(DHASH_LIBS) \
     $(INI_CONFIG_LIBS) \
+    $(LTLIBINTL) \
     $(SMBCLIENT_LIBS)
 
 proxy_child_SOURCES = \
@@ -3254,6 +3261,7 @@ p11_child_LDADD = \
     $(POPT_LIBS) \
     $(NSS_LIBS) \
     libsss_crypt.la \
+    $(LTLIBINTL) \
     $(NULL)
 
 memberof_la_SOURCES = \




--- configure.ac.orig	2016-04-13 14:48:41 UTC
+++ configure.ac
@@ -44,7 +44,8 @@
 AC_CHECK_HEADERS(stdint.h dlfcn.h)
 AC_CONFIG_HEADER(config.h)

 AC_CHECK_TYPES([errno_t], [], [], [[#include <errno.h>]])
+AM_CONDITIONAL([HAVE_ERRNO_T], [test "$ac_cv_type_errno_t" = yes])

 m4_include([src/build_macros.m4])
 BUILD_WITH_SHARED_BUILD_DIR
@@ -266,13 +266,13 @@ AM_CONDITIONAL([HAVE_PROFILE_CATALOGS], 
 AM_CONDITIONAL([HAVE_MANPAGES], [test "x$HAVE_MANPAGES" != "x"])
 AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"])
 
-AC_CHECK_PROG(HAVE_PYTHON2, python2, yes, no)
+AC_CHECK_PROGS(HAVE_PYTHON2, %%PYTHON2_CMD%% python2, yes, no)
 AS_IF([test x$HAVE_PYTHON2 = xyes],
-      [AC_PATH_PROG(PYTHON2, python2)])
+      [AC_PATH_PROGS(PYTHON2, %%PYTHON2_CMD%% python2)])
     [AC_GNU_SOURCE])
 
-AC_CHECK_PROG(HAVE_PYTHON3, python3, yes, no)
+AC_CHECK_PROGS(HAVE_PYTHON3, %%PYTHON3_CMD%% python3, yes, no)
 AS_IF([test x$HAVE_PYTHON3 = xyes],
-      [AC_PATH_PROG(PYTHON3, python3)])
+      [AC_PATH_PROGS(PYTHON3, %%PYTHON3_CMD%% python3)])
 
 if test x$HAVE_PYTHON2_BINDINGS = x1; then
     AS_IF([test x$HAVE_PYTHON2 != xyes],
-
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax])
 AM_PROG_CC_C_O
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])

Line 0 Link Here

(-)files/patch-src-util-cert-nss-cert.c (+10 lines)
	1	--- src/util/cert/nss/cert.c.orig 2016-04-13 14:48:41 UTC
	2	+++ src/util/cert/nss/cert.c
	3	@@ -31,6 +31,7 @@
	4	#include "util/crypto/sss_crypto.h"
	5	#include "util/crypto/nss/nss_util.h"
	6	#include "util/cert.h"
	7	+#include "util/sss_endian.h"
	8
	9	#define NS_CERT_HEADER "-----BEGIN CERTIFICATE-----"
	10	#define NS_CERT_TRAILER "-----END CERTIFICATE-----"




--- src/util/util.c.orig	2016-04-13 14:48:41 UTC
+++ src/util/util.c
@@ -946,7 +946,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;
     }
 
@@ -967,15 +967,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;
 }

Lines 1-6 Link Here

(-)files/patch-src__providers__ldap__ldap_auth.c (-27 / +14 lines)
1	diff --git src/providers/ldap/ldap_auth.c src/providers/ldap/ldap_auth.c	1	--- src/providers/ldap/ldap_auth.c.orig 2016-04-13 14:48:41 UTC
2	index 2aacce0..e019cf7 100644
3	--- src/providers/ldap/ldap_auth.c
4	+++ src/providers/ldap/ldap_auth.c	2	+++ src/providers/ldap/ldap_auth.c
5	@@ -37,7 +37,6 @@	3	@@ -37,7 +37,6 @@
6	#include <sys/time.h>	4	#include <sys/time.h>
Lines 10-19 Link Here
10	#include <security/pam_modules.h>	8	#include <security/pam_modules.h>
11		9
12	#include "util/util.h"	10	#include "util/util.h"
13	@@ -56,6 +55,22 @@ enum pwexpire {	11	@@ -51,6 +50,22 @@
14	PWEXPIRE_SHADOW
15	};
16		12
		13	#define LDAP_PWEXPIRE_WARNING_TIME 0
		14
17	+struct spwd	15	+struct spwd
18	+{	16	+{
19	+ char sp_namp; / Login name. */	17	+ char sp_namp; / Login name. */
Lines 33-63 Link Here
33	static errno_t add_expired_warning(struct pam_data *pd, long exp_time)	31	static errno_t add_expired_warning(struct pam_data *pd, long exp_time)
34	{	32	{
35	int ret;	33	int ret;
36	@@ -109,6 +124,7 @@ static errno_t check_pwexpire_kerberos(const char *expire_date, time_t now,	34	@@ -96,9 +111,9 @@ static errno_t check_pwexpire_kerberos(c
37	return EINVAL;
38	}	35	}
39		36
40	+ tzset();
41	expire_time = mktime(&tm);
42	if (expire_time == -1) {
43	DEBUG(SSSDBG_CRIT_FAILURE,
44	@@ -116,12 +132,10 @@ static errno_t check_pwexpire_kerberos(const char *expire_date, time_t now,
45	return EINVAL;
46	}
47
48	- tzset();
49	- expire_time -= timezone;
50	DEBUG(SSSDBG_TRACE_ALL,	37	DEBUG(SSSDBG_TRACE_ALL,
51	- "Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] "	38	- "Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] "
52	- "daylight [%d] now [%ld] expire_time [%ld].\n", tzname[0],	39	- "daylight [%d] now [%ld] expire_time [%ld].\n", tzname[0],
53	- tzname[1], timezone, daylight, now, expire_time);	40	- tzname[1], timezone, daylight, now, expire_time);
54	+ "Time info: tzname[0] [%s] tzname[1] [%s] "	41	+ "Time info: tzname[0] [%s] tzname[1] [%s] "
55	+ "now [%ld] expire_time [%ld].\n", tzname[0],	42	+ "now [%ld] expire_time [%ld].\n", tzname[0],
56	+ tzname[1], now, expire_time);	43	+ tzname[1], now, expire_time);
57		44
58	if (difftime(now, expire_time) > 0.0) {	45	if (difftime(now, expire_time) > 0.0) {
59	DEBUG(SSSDBG_CONF_SETTINGS, "Kerberos password expired.\n");	46	DEBUG(SSSDBG_CONF_SETTINGS, "Kerberos password expired.\n");
60	@@ -924,7 +938,7 @@ void sdap_pam_chpass_handler(struct be_req *breq)	47	@@ -945,7 +960,7 @@ void sdap_pam_chpass_handler(struct be_r
61	DEBUG(SSSDBG_OP_FAILURE,	48	DEBUG(SSSDBG_OP_FAILURE,
62	"starting password change request for user [%s].\n", pd->user);	49	"starting password change request for user [%s].\n", pd->user);
63		50
Lines 66-72 Link Here
66		53
67	if (pd->cmd != SSS_PAM_CHAUTHTOK && pd->cmd != SSS_PAM_CHAUTHTOK_PRELIM) {	54	if (pd->cmd != SSS_PAM_CHAUTHTOK && pd->cmd != SSS_PAM_CHAUTHTOK_PRELIM) {
68	DEBUG(SSSDBG_OP_FAILURE,	55	DEBUG(SSSDBG_OP_FAILURE,
69	@@ -1069,7 +1083,7 @@ static void sdap_auth4chpass_done(struct tevent_req *req)	56	@@ -1094,7 +1109,7 @@ static void sdap_auth4chpass_done(struct
70	dp_err = DP_ERR_OFFLINE;	57	dp_err = DP_ERR_OFFLINE;
71	break;	58	break;
72	default:	59	default:
Lines 75-81 Link Here
75	}	62	}
76		63
77	done:	64	done:
78	@@ -1131,7 +1145,7 @@ static void sdap_pam_chpass_done(struct tevent_req *req)	65	@@ -1156,7 +1171,7 @@ static void sdap_pam_chpass_done(struct
79	state->sh, state->dn,	66	state->sh, state->dn,
80	lastchanged_name);	67	lastchanged_name);
81	if (subreq == NULL) {	68	if (subreq == NULL) {
Lines 84-90 Link Here
84	goto done;	71	goto done;
85	}	72	}
86		73
87	@@ -1152,7 +1166,7 @@ static void sdap_lastchange_done(struct tevent_req *req)	74	@@ -1177,7 +1192,7 @@ static void sdap_lastchange_done(struct
88		75
89	ret = sdap_modify_shadow_lastchange_recv(req);	76	ret = sdap_modify_shadow_lastchange_recv(req);
90	if (ret != EOK) {	77	if (ret != EOK) {
Lines 93-99 Link Here
93	goto done;	80	goto done;
94	}	81	}
95		82
96	@@ -1193,7 +1207,7 @@ void sdap_pam_auth_handler(struct be_req *breq)	83	@@ -1218,7 +1233,7 @@ void sdap_pam_auth_handler(struct be_req
97	goto done;	84	goto done;
98	}	85	}
99		86
Lines 102-109 Link Here
102		89
103	switch (pd->cmd) {	90	switch (pd->cmd) {
104	case SSS_PAM_AUTHENTICATE:	91	case SSS_PAM_AUTHENTICATE:
105	@@ -1291,7 +1305,7 @@ static void sdap_pam_auth_done(struct tevent_req *req)	92	@@ -1307,7 +1322,7 @@ static void sdap_pam_auth_done(struct te
106	state->pd->pam_status = PAM_NEW_AUTHTOK_REQD;	93	state->pd->pam_status = PAM_PERM_DENIED;
107	break;	94	break;
108	default:	95	default:
109	- state->pd->pam_status = PAM_SYSTEM_ERR;	96	- state->pd->pam_status = PAM_SYSTEM_ERR;




--- src/providers/ldap/sdap_access.c.orig	2016-04-13 14:48:41 UTC
index 880735e..d349dcf 100644
--- src/providers/ldap/sdap_access.c
+++ src/providers/ldap/sdap_access.c
@@ -557,9 +557,9 @@ bool nds_check_expired(const char *exp_t
         return true;
     }
 
+    tzset();
     expire_time = mktime(&tm);
     if (expire_time == -1) {
         DEBUG(SSSDBG_CRIT_FAILURE,
@@ -506,13 +507,11 @@ static bool nds_check_expired(const char *exp_time_str)
         return true;
     }
 
-    tzset();
-    expire_time -= timezone;
     now = time(NULL);
     DEBUG(SSSDBG_TRACE_ALL,
-          "Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] "

-           "daylight [%d] now [%ld] expire_time [%ld].\n", tzname[0],
-           tzname[1], timezone, daylight, now, expire_time);
+          "Time info: tzname[0] [%s] tzname[1] [%s] "
+           "now [%ld] expire_time [%ld].\n", tzname[0],
+           tzname[1], now, expire_time);
 
     if (difftime(now, expire_time) > 0.0) {
         DEBUG(SSSDBG_CONF_SETTINGS, "NDS account expired.\n");




--- src/sss_client/common.c.orig	2016-04-13 14:48:41 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,9 +726,9 @@ 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
     }
 
@@ -741,9 +740,9 @@ 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
         }
 
@@ -752,17 +751,17 @@ enum nss_status sss_nss_make_request(enu
     }
     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
     }
 }
@@ -791,12 +790,12 @@ 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;

     }
 
     ret = sss_cli_make_request_nochecks(cmd, rd, repbuf, replen, errnop);
@@ -804,7 +803,7 @@ int sss_pac_make_request(enum sss_cli_co
         /* try reopen socket */
         ret = sss_cli_check_socket(errnop, SSS_PAC_SOCKET_NAME);
         if (ret != SSS_STATUS_SUCCESS) {
-            return NSS_STATUS_UNAVAIL;
+            return NS_UNAVAIL;
         }
 
         /* and make request one more time */
@@ -812,12 +811,12 @@ int sss_pac_make_request(enum sss_cli_co
     }
     switch (ret) {
     case SSS_STATUS_TRYAGAIN:
-        return NSS_STATUS_TRYAGAIN;




--- src/util/server.c.orig	2016-04-13 14:48:41 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	2016-04-13 14:48:41 UTC
index 7a66846..5e63275 100644
--- src/util/util.h
+++ src/util/util.h
@@ -586,5 +586,6 @@ int sss_unique_file(TALLOC_CTX *owner,
  * so that it's guaranteed the file is removed.
  */
 int sss_unique_filename(TALLOC_CTX *owner, char *path_tmpl);
-void CatchChild(void);
-void CatchChildLeaveStatus(void);
 
 /* from memory.c */
 typedef int (void_destructor_fn_t)(void *);
@@ -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	2016-04-13 14:48:41 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
@@ -23,7 +23,10 @@ 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.14*)
+        Kerberos\ 5\ release\ 1.14* | \
+        Kerberos\ 5\ release\ 1.15* | \
+        Kerberos\ 5\ release\ 1.16* | \

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 (-28 / +72 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 12-21 Link Here
12	lib/libipa_hbac.so.0.0.1	15	lib/libipa_hbac.so.0.0.1
13	lib/libsss_idmap.so	16	lib/libsss_idmap.so
14	lib/libsss_idmap.so.0	17	lib/libsss_idmap.so.0
15	lib/libsss_idmap.so.0.4.0	18	lib/libsss_idmap.so.0.5.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-40 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%%%%PYTHONPREFIX_SITELIBDIR%%/pyhbac.so
26	%%PYTHON_SITELIBDIR%%/SSSDConfig/__init__.py	32	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/pysss_murmur.so
27	%%PYTHON_SITELIBDIR%%/SSSDConfig/__init__.pyc	33	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/pysss_nss_idmap.so
28	%%PYTHON_SITELIBDIR%%/SSSDConfig/ipachangeconf.py	34	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/pysss.so
29	%%PYTHON_SITELIBDIR%%/SSSDConfig/ipachangeconf.pyc	35	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/SSSDConfig-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info
30	%%PYTHON_SITELIBDIR%%/SSSDConfig/sssd_upgrade_config.py	36	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/SSSDConfig/__init__.py
31	%%PYTHON_SITELIBDIR%%/SSSDConfig/sssd_upgrade_config.pyc	37	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/SSSDConfig/ipachangeconf.py
32	%%PYTHON_SITELIBDIR%%/pyhbac.so	38	%%PYTHON%%%%PYTHONPREFIX_SITELIBDIR%%/SSSDConfig/sssd_upgrade_config.py
33	%%PYTHON_SITELIBDIR%%/pysss.so	39	%%PYTHON2%%%%PYTHONPREFIX_SITELIBDIR%%/SSSDConfig/__init__.pyc
34	%%PYTHON_SITELIBDIR%%/pysss_murmur.so	40	%%PYTHON2%%%%PYTHONPREFIX_SITELIBDIR%%/SSSDConfig/ipachangeconf.pyc
35	%%PYTHON_SITELIBDIR%%/pysss_nss_idmap.so	41	%%PYTHON2%%%%PYTHONPREFIX_SITELIBDIR%%/SSSDConfig/sssd_upgrade_config.pyc
		42	%%PYTHON3%%%%PYTHONPREFIX_SITELIBDIR%%/SSSDConfig/__pycache__/__init__.cpython-36.pyc
		43	%%PYTHON3%%%%PYTHONPREFIX_SITELIBDIR%%/SSSDConfig/__pycache__/ipachangeconf.cpython-36.pyc
		44	%%PYTHON3%%%%PYTHONPREFIX_SITELIBDIR%%/SSSDConfig/__pycache__/sssd_upgrade_config.cpython-36.pyc
36	lib/shared-modules/ldb/memberof.so	45	lib/shared-modules/ldb/memberof.so
37	%%SMB%%lib/sssd/libsss_ad.so	46	%%SMB%%lib/sssd/libsss_ad.so
		47	lib/sssd/libsss_cert.so
38	lib/sssd/libsss_child.so	48	lib/sssd/libsss_child.so
39	lib/sssd/libsss_crypt.so	49	lib/sssd/libsss_crypt.so
40	lib/sssd/libsss_debug.so	50	lib/sssd/libsss_debug.so
Lines 46-56 Link Here
46	lib/sssd/libsss_proxy.so	56	lib/sssd/libsss_proxy.so
47	lib/sssd/libsss_simple.so	57	lib/sssd/libsss_simple.so
48	lib/sssd/libsss_util.so	58	lib/sssd/libsss_util.so
		59	lib/sssd/libsss_semanage.so
		60	lib/sssd/modules/libwbclient.so
		61	lib/sssd/modules/libwbclient.so.0
		62	lib/sssd/modules/libwbclient.so.0.12.0
		63	lib/sssd/modules/sssd_krb5_localauth_plugin.so
49	libdata/pkgconfig/ipa_hbac.pc	64	libdata/pkgconfig/ipa_hbac.pc
50	libdata/pkgconfig/sss_idmap.pc	65	libdata/pkgconfig/sss_idmap.pc
51	libdata/pkgconfig/sss_nss_idmap.pc	66	libdata/pkgconfig/sss_nss_idmap.pc
		67	libdata/pkgconfig/sss_simpleifp.pc
		68	libdata/pkgconfig/wbclient_sssd.pc
		69	%%SMB%%libexec/sssd/gpo_child
52	libexec/sssd/krb5_child	70	libexec/sssd/krb5_child
53	libexec/sssd/ldap_child	71	libexec/sssd/ldap_child
		72	libexec/sssd/p11_child
54	libexec/sssd/proxy_child	73	libexec/sssd/proxy_child
55	libexec/sssd/sss_signal	74	libexec/sssd/sss_signal
56	libexec/sssd/sssd_be	75	libexec/sssd/sssd_be
Lines 60-72 Link Here
60	libexec/sssd/sssd_pam	79	libexec/sssd/sssd_pam
61	libexec/sssd/sssd_ssh	80	libexec/sssd/sssd_ssh
62	libexec/sssd/sssd_sudo	81	libexec/sssd/sssd_sudo
63	man/es/man1/sss_ssh_authorizedkeys.1.gz	82	man/de/man1/sss_ssh_authorizedkeys.1.gz
		83	man/de/man1/sss_ssh_knownhostsproxy.1.gz
		84	man/de/man5/sssd-ifp.5.gz
		85	man/de/man5/sssd-krb5.5.gz
		86	man/de/man5/sssd-ldap.5.gz
		87	man/de/man5/sssd-simple.5.gz
		88	man/de/man5/sssd-sudo.5.gz
		89	man/de/man5/sssd.conf.5.gz
		90	man/de/man8/pam_sss.8.gz
		91	man/de/man8/sss_cache.8.gz
		92	man/de/man8/sss_debuglevel.8.gz
		93	man/de/man8/sss_groupadd.8.gz
		94	man/de/man8/sss_groupdel.8.gz
		95	man/de/man8/sss_groupmod.8.gz
		96	man/de/man8/sss_groupshow.8.gz
		97	man/de/man8/sss_obfuscate.8.gz
		98	man/de/man8/sss_seed.8.gz
		99	man/de/man8/sss_useradd.8.gz
		100	man/de/man8/sss_userdel.8.gz
		101	man/de/man8/sss_usermod.8.gz
		102	man/de/man8/sssd_krb5_locator_plugin.8.gz
		103	man/de/man8/sssd.8.gz
64	man/es/man1/sss_ssh_knownhostsproxy.1.gz	104	man/es/man1/sss_ssh_knownhostsproxy.1.gz
65	man/es/man5/sssd-ldap.5.gz	105	man/es/man5/sssd-ldap.5.gz
66	man/es/man5/sssd-simple.5.gz	106	man/es/man5/sssd-simple.5.gz
67	man/es/man5/sssd-sudo.5.gz	107	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	108	man/es/man8/sss_cache.8.gz
71	man/es/man8/sss_debuglevel.8.gz	109	man/es/man8/sss_debuglevel.8.gz
72	man/es/man8/sss_groupadd.8.gz	110	man/es/man8/sss_groupadd.8.gz
Lines 82-88 Link Here
82	man/es/man8/sssd_krb5_locator_plugin.8.gz	120	man/es/man8/sssd_krb5_locator_plugin.8.gz
83	man/fr/man1/sss_ssh_authorizedkeys.1.gz	121	man/fr/man1/sss_ssh_authorizedkeys.1.gz
84	man/fr/man1/sss_ssh_knownhostsproxy.1.gz	122	man/fr/man1/sss_ssh_knownhostsproxy.1.gz
85	man/fr/man5/sssd-ad.5.gz
86	man/fr/man5/sssd-krb5.5.gz	123	man/fr/man5/sssd-krb5.5.gz
87	man/fr/man5/sssd-ldap.5.gz	124	man/fr/man5/sssd-ldap.5.gz
88	man/fr/man5/sssd-simple.5.gz	125	man/fr/man5/sssd-simple.5.gz
Lines 105-114 Link Here
105	man/ja/man1/sss_ssh_authorizedkeys.1.gz	142	man/ja/man1/sss_ssh_authorizedkeys.1.gz
106	man/ja/man1/sss_ssh_knownhostsproxy.1.gz	143	man/ja/man1/sss_ssh_knownhostsproxy.1.gz
107	man/ja/man5/sssd-krb5.5.gz	144	man/ja/man5/sssd-krb5.5.gz
108	man/ja/man5/sssd-ldap.5.gz
109	man/ja/man5/sssd-simple.5.gz	145	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	146	man/ja/man8/sss_cache.8.gz
113	man/ja/man8/sss_debuglevel.8.gz	147	man/ja/man8/sss_debuglevel.8.gz
114	man/ja/man8/sss_groupadd.8.gz	148	man/ja/man8/sss_groupadd.8.gz
Lines 123-131 Link Here
123	man/ja/man8/sssd_krb5_locator_plugin.8.gz	157	man/ja/man8/sssd_krb5_locator_plugin.8.gz
124	man/man1/sss_ssh_authorizedkeys.1.gz	158	man/man1/sss_ssh_authorizedkeys.1.gz
125	man/man1/sss_ssh_knownhostsproxy.1.gz	159	man/man1/sss_ssh_knownhostsproxy.1.gz
126	man/man5/sssd-ad.5.gz	160	%%SMB%%man/man5/sssd-ad.5.gz
127	man/man5/sssd-ifp.5.gz	161	man/man5/sssd-ifp.5.gz
128	man/man5/sssd-ipa.5.gz	162	%%SMB%%man/man5/sssd-ipa.5.gz
129	man/man5/sssd-krb5.5.gz	163	man/man5/sssd-krb5.5.gz
130	man/man5/sssd-ldap.5.gz	164	man/man5/sssd-ldap.5.gz
131	man/man5/sssd-simple.5.gz	165	man/man5/sssd-simple.5.gz
Lines 139-144 Link Here
139	man/man8/sss_groupmod.8.gz	173	man/man8/sss_groupmod.8.gz
140	man/man8/sss_groupshow.8.gz	174	man/man8/sss_groupshow.8.gz
141	man/man8/sss_obfuscate.8.gz	175	man/man8/sss_obfuscate.8.gz
		176	man/man8/sss_override.8.gz
142	man/man8/sss_seed.8.gz	177	man/man8/sss_seed.8.gz
143	man/man8/sss_useradd.8.gz	178	man/man8/sss_useradd.8.gz
144	man/man8/sss_userdel.8.gz	179	man/man8/sss_userdel.8.gz
Lines 150-157 Link Here
150	man/pt/man8/sss_groupmod.8.gz	185	man/pt/man8/sss_groupmod.8.gz
151	man/uk/man1/sss_ssh_authorizedkeys.1.gz	186	man/uk/man1/sss_ssh_authorizedkeys.1.gz
152	man/uk/man1/sss_ssh_knownhostsproxy.1.gz	187	man/uk/man1/sss_ssh_knownhostsproxy.1.gz
		188	man/uk/man5/sss_rpcidmapd.5.gz
153	man/uk/man5/sssd-ad.5.gz	189	man/uk/man5/sssd-ad.5.gz
154	man/uk/man5/sssd-ifp.5.gz	190	man/uk/man5/sssd-ifp.5.gz
		191	man/uk/man5/sssd-ipa.5.gz
155	man/uk/man5/sssd-krb5.5.gz	192	man/uk/man5/sssd-krb5.5.gz
156	man/uk/man5/sssd-ldap.5.gz	193	man/uk/man5/sssd-ldap.5.gz
157	man/uk/man5/sssd-simple.5.gz	194	man/uk/man5/sssd-simple.5.gz
Lines 169-176 Link Here
169	man/uk/man8/sss_useradd.8.gz	206	man/uk/man8/sss_useradd.8.gz
170	man/uk/man8/sss_userdel.8.gz	207	man/uk/man8/sss_userdel.8.gz
171	man/uk/man8/sss_usermod.8.gz	208	man/uk/man8/sss_usermod.8.gz
		209	man/uk/man8/sssd_krb5_locator_plugin.8.gz
172	man/uk/man8/sssd.8.gz	210	man/uk/man8/sssd.8.gz
173	man/uk/man8/sssd_krb5_locator_plugin.8.gz
174	sbin/sss_cache	211	sbin/sss_cache
175	sbin/sss_debuglevel	212	sbin/sss_debuglevel
176	sbin/sss_groupadd	213	sbin/sss_groupadd
Lines 177-183 Link Here
177	sbin/sss_groupdel	214	sbin/sss_groupdel
178	sbin/sss_groupmod	215	sbin/sss_groupmod
179	sbin/sss_groupshow	216	sbin/sss_groupshow
180	sbin/sss_obfuscate	217	%%PYTHON%%sbin/sss_obfuscate
		218	sbin/sss_override
181	sbin/sss_seed	219	sbin/sss_seed
182	sbin/sss_useradd	220	sbin/sss_useradd
183	sbin/sss_userdel	221	sbin/sss_userdel
Lines 190-196 Link Here
190	%%PORTDOCS%%@dir %%DOCSDIR%%/idmap_doc	228	%%PORTDOCS%%@dir %%DOCSDIR%%/idmap_doc
191	%%PORTDOCS%%@dir %%DOCSDIR%%/libsss_sudo_doc	229	%%PORTDOCS%%@dir %%DOCSDIR%%/libsss_sudo_doc
192	%%PORTDOCS%%@dir %%DOCSDIR%%/nss_idmap_doc	230	%%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	231	%%PORTDOCS%%@dir %%DOCSDIR%%/sss_simpleifp_doc
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	232	@dir /var/db/sss
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	233	@dir /var/db/sss/db
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	234	@dir /var/db/sss/gpo_cache
		235	@dir /var/db/sss/keytabs
		236	@dir /var/db/sss/mc
		237	@dir /var/log/sssd
		238	@dir /var/run/sss
		239	@dir /var/run/sss/krb5.include.d
		240	@dir /var/run/sss/private

Return to bug 238465

Lines 2-9 Link Here

(-)Makefile (-20 / +46 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sssd	4	PORTNAME= sssd
5	PORTVERSION= 1.11.7	5	PORTVERSION= 1.13.4
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/talloc1 \
		17	libtevent.so:devel/tevent1 \
		18	libtdb.so:databases/tdb1 \
		19	libldb.so:databases/ldb13 \
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	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-56 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	# add __STDC_WANT_LIB_EXT1__ - see https://stackoverflow.com/questions/24206989/error-use-of-undeclared-identifier-errno-t
		57	#CPPFLAGS+= -D__STDC_WANT_LIB_EXT1__
54	#DEBUG_FLAGS= -g	58	#DEBUG_FLAGS= -g
55	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"	59	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"
56	SUB_FILES= pkg-message	60	SUB_FILES= pkg-message
Lines 57-64 Link Here
57		61
58	USE_LDCONFIG= yes	62	USE_LDCONFIG= yes
59	USE_OPENLDAP= yes	63	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	64	INSTALL_TARGET= install-strip
63	CPE_VENDOR= fedoraproject	65	CPE_VENDOR= fedoraproject
64		66
Lines 68-79 Link Here
68	USE_RC_SUBR= ${PORTNAME}	70	USE_RC_SUBR= ${PORTNAME}
69	PORTDATA= *	71	PORTDATA= *
70		72
71	OPTIONS_DEFINE= DOCS SMB	73	OPTIONS_DEFINE= DOCS SMB
		74	OPTIONS_DEFAULT= PYTHON3
		75	OPTIONS_RADIO= PYTHON
		76	OPTIONS_RADIO_PYTHON= PYTHON2 PYTHON3
72	OPTIONS_SUB= yes	77	OPTIONS_SUB= yes
73		78
		79	PYTHON2_CONFIGURE_WITH= python2-bindings
		80	PYTHON2_USES= python:2.7
		81	PYTHON2_VARS= PYTHON2_CMD=${PYTHON_CMD:T} PYTHON3_CMD=
		82	PYTHON3_CONFIGURE_WITH= python3-bindings
		83	PYTHON3_USES= python:3.5+
		84	PYTHON3_VARS= PYTHON2_CMD= PYTHON3_CMD=${PYTHON_CMD:T}
		85
		86	PLIST_SUB+= PORTVERSION=${PORTVERSION} \
		87	PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR} \
		88	PYTHON_VER=${PYTHON_VER}
		89
74	SMB_DESC= Install IPA and AD providers (requires Samba4)	90	SMB_DESC= Install IPA and AD providers (requires Samba4)
75	SMB_USES= samba:lib # libndr-krb5pac libndr-nbt libndr libsamba-util	91	SMB_USES= samba:lib # libndr-krb5pac libndr-nbt libndr libsamba-util
76	SMB_CONFIGURE_WITH= samba	92	SMB_CONFIGURE_WITH= samba
		93	# PAC (Privilege Attribute Certificate) responder currently needs samba
		94	SMB_CONFIGURE_ENABLE= pac-responder
77		95
78	post-patch:	96	post-patch:
79	@${REINPLACE_CMD} -e 's\|SIGCLD\|SIGCHLD\|g' ${WRKSRC}/src/util/signal.c	97	@${REINPLACE_CMD} -e 's\|SIGCLD\|SIGCHLD\|g' ${WRKSRC}/src/util/signal.c
Lines 93-98 Link Here
93	@${REINPLACE_CMD} -e 's\|/etc/sssd/\|${ETCDIR}/\|g' \	111	@${REINPLACE_CMD} -e 's\|/etc/sssd/\|${ETCDIR}/\|g' \
94	-e 's\|/etc/openldap/\|${LOCALBASE}/etc/openldap/\|g' \	112	-e 's\|/etc/openldap/\|${LOCALBASE}/etc/openldap/\|g' \
95	${WRKSRC}/src/man/*xml	113	${WRKSRC}/src/man/*xml
		114	@${REINPLACE_CMD} 's\|%%PYTHON2_CMD%%\|${PYTHON2_CMD}\|g; \
		115	s\|%%PYTHON3_CMD%%\|${PYTHON3_CMD}\|g' \
		116	${WRKSRC}/configure.ac
96	@${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}/src/sss_client/bsdnss.c	117	@${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}/src/sss_client/bsdnss.c
97	@${CP} ${FILESDIR}/sss_bsd_errno.h ${WRKSRC}/src/util/sss_bsd_errno.h	118	@${CP} ${FILESDIR}/sss_bsd_errno.h ${WRKSRC}/src/util/sss_bsd_errno.h
98		119
Lines 100-112 Link Here
100	${INSTALL_DATA} ${WRKSRC}/src/examples/sssd-example.conf \	121	${INSTALL_DATA} ${WRKSRC}/src/examples/sssd-example.conf \
101	${STAGEDIR}${ETCDIR}/sssd.conf.sample	122	${STAGEDIR}${ETCDIR}/sssd.conf.sample
102	${LN} -sf nss_sss.so ${STAGEDIR}${PREFIX}/lib/nss_sss.so.1	123	${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	124	# clean unused man dirs
108	.for i in nl/man1 nl/man5 pt/man1 pt/man5	125	.for i in nl/man1 nl/man5 pt/man1 pt/man5
109	@${RMDIR} ${STAGEDIR}${PREFIX}/man/${i}	126	@${RMDIR} ${STAGEDIR}${PREFIX}/man/${i}
110	.endfor	127	.endfor
111		128
		129	.include <bsd.port.options.mk>
		130
		131	.if empty(PORT_OPTIONS:MPYTHON2) && empty(PORT_OPTIONS:MPYTHON3)
		132	PLIST_SUB+= PYTHON="@comment "
		133	USES+= python:3.5+,build
		134	.else
		135	PLIST_SUB+= PYTHON=
		136	.endif
		137
112	.include <bsd.port.mk>	138	.include <bsd.port.mk>

Lines 1-32 Link Here

(-)files/patch-Makefile.am (-15 / +56 lines)
1	diff --git Makefile.am Makefile.am	1	--- Makefile.am.orig 2019-04-13 14:48:41 UTC
2	index fd74d85..4a7e6ae 100644
3	--- Makefile.am
4	+++ Makefile.am	2	+++ Makefile.am
5	@@ -311,6 +311,7 @@ AM_CPPFLAGS = \	3	@@ -54,7 +54,7 @@ sssddatadir = $(datadir)/sssd
6	$(LIBNL_CFLAGS) \	4	sssdapiplugindir = $(sssddatadir)/sssd.api.d
		5	dbuspolicydir = $(sysconfdir)/dbus-1/system.d
		6	dbusservicedir = $(datadir)/dbus-1/system-services
		7	-sss_statedir = $(localstatedir)/lib/sss
		8	+sss_statedir = $(localstatedir)/db/sss
		9	localedir = @localedir@
		10	nsslibdir = @nsslibdir@
		11	pamlibdir = @pammoddir@
		12	@@ -96,6 +96,9 @@
		13	-fno-strict-aliasing \
		14	-std=gnu99
		15	endif
		16	+if HAVE_ERRNO_T
		17	+ AM_CFLAGS += -D__STDC_WANT_LIB_EXT1__
		18	+endif
		19
		20	pkgconfig_DATA =
		21
		22	@@ -427,6 +427,7 @@ AM_CPPFLAGS = \
7	$(OPENLDAP_CFLAGS) \	23	$(OPENLDAP_CFLAGS) \
8	$(GLIB2_CFLAGS) \	24	$(GLIB2_CFLAGS) \
		25	$(JOURNALD_CFLAGS) \
9	+ -DHOST_NAME_MAX=_POSIX_HOST_NAME_MAX \	26	+ -DHOST_NAME_MAX=_POSIX_HOST_NAME_MAX \
10	-DLIBDIR=\"$(libdir)\" \	27	-DLIBDIR=\"$(libdir)\" \
11	-DVARDIR=\"$(localstatedir)\" \	28	-DVARDIR=\"$(localstatedir)\" \
12	-DSHLIBEXT=\"$(SHLIBEXT)\" \	29	-DSSS_STATEDIR=\"$(sss_statedir)\" \
13	@@ -378,6 +379,7 @@ SSSD_LIBS = \	30	@@ -497,6 +498,7 @@ SSSD_LIBS = \
		31	$(COLLECTION_LIBS) \
14	$(DHASH_LIBS) \	32	$(DHASH_LIBS) \
15	$(SSS_CRYPT_LIBS) \
16	$(OPENLDAP_LIBS) \	33	$(OPENLDAP_LIBS) \
17	+ $(LTLIBINTL) \	34	+ $(LTLIBINTL) \
18	$(TDB_LIBS)	35	$(TDB_LIBS)
19		36
20	PYTHON_BINDINGS_LIBS = \	37	PYTHON_BINDINGS_LIBS = \
21	@@ -433,6 +435,7 @@ dist_noinst_HEADERS = \	38	@@ -546,6 +548,7 @@ dist_noinst_HEADERS = \
22	src/util/sss_ssh.h \	39	src/util/sss_ssh.h \
23	src/util/sss_ini.h \	40	src/util/sss_ini.h \
24	src/util/sss_format.h \	41	src/util/sss_format.h \
25	+ src/util/sss_bsd_errno.h \	42	+ src/util/sss_bsd_errno.h \
		43	src/util/sss_config.h \
26	src/util/refcount.h \	44	src/util/refcount.h \
27	src/util/find_uid.h \	45	src/util/find_uid.h \
28	src/util/user_info_msg.h \	46	@@ -2725,9 +2728,10 @@ intgcheck:
29	@@ -1700,9 +1703,10 @@ endif
30	# Client Libraries #	47	# Client Libraries #
31	####################	48	####################
32		49
Lines 39-47 Link Here
39	src/sss_client/nss_passwd.c \	56	src/sss_client/nss_passwd.c \
40	src/sss_client/nss_group.c \	57	src/sss_client/nss_group.c \
41	src/sss_client/nss_netgroup.c \	58	src/sss_client/nss_netgroup.c \
42	@@ -1715,9 +1719,9 @@ libnss_sss_la_SOURCES = \	59	@@ -2741,9 +2745,9 @@ libnss_sss_la_SOURCES = \
43	src/sss_client/nss_mc_passwd.c \
44	src/sss_client/nss_mc_group.c \	60	src/sss_client/nss_mc_group.c \
		61	src/sss_client/nss_mc_initgr.c \
45	src/sss_client/nss_mc.h	62	src/sss_client/nss_mc.h
46	-libnss_sss_la_LIBADD = \	63	-libnss_sss_la_LIBADD = \
47	+nss_sss_la_LIBADD = \	64	+nss_sss_la_LIBADD = \
Lines 51-61 Link Here
51	-module \	68	-module \
52	-version-info 2:0:0 \	69	-version-info 2:0:0 \
53	-Wl,--version-script,$(srcdir)/src/sss_client/sss_nss.exports	70	-Wl,--version-script,$(srcdir)/src/sss_client/sss_nss.exports
54	@@ -2086,6 +2090,7 @@ ldap_child_LDADD = \	71	@@ -2936,6 +2940,7 @@ libsss_krb5_common_la_CFLAGS = \
		72	libsss_krb5_common_la_LIBADD = \
		73	$(KEYUTILS_LIBS) \
		74	$(DHASH_LIBS) \
		75	+ $(LTLIBINTL) \
		76	$(KRB5_LIBS)
		77	libsss_krb5_common_la_LDFLAGS = \
		78	-avoid-version
		79	@@ -3184,6 +3189,7 @@ ldap_child_LDADD = \
		80	$(TALLOC_LIBS) \
55	$(POPT_LIBS) \	81	$(POPT_LIBS) \
56	$(OPENLDAP_LIBS) \
57	$(DHASH_LIBS) \	82	$(DHASH_LIBS) \
58	+ $(LTLIBINTL) \	83	+ $(LTLIBINTL) \
59	$(KRB5_LIBS)	84	$(KRB5_LIBS)
60		85
		86	if BUILD_SEMANAGE
		87	@@ -3223,6 +3229,7 @@ gpo_child_LDADD = \
		88	$(POPT_LIBS) \
		89	$(DHASH_LIBS) \
		90	$(INI_CONFIG_LIBS) \
		91	+ $(LTLIBINTL) \
		92	$(SMBCLIENT_LIBS)
		93
61	proxy_child_SOURCES = \	94	proxy_child_SOURCES = \
		95	@@ -3254,6 +3261,7 @@ p11_child_LDADD = \
		96	$(POPT_LIBS) \
		97	$(NSS_LIBS) \
		98	libsss_crypt.la \
		99	+ $(LTLIBINTL) \
		100	$(NULL)
		101
		102	memberof_la_SOURCES = \

Lines 1-21 Link Here

(-)files/patch-configure.ac (-17 / +25 lines)
1	--- configure.ac.orig 2013-11-06 18:35:03 UTC	1	--- configure.ac.orig 2016-04-13 14:48:41 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -5,15 +5,15 @@ AC_INIT([sssd],	3	@@ -44,7 +44,8 @@
4	VERSION_NUMBER,	4	AC_CHECK_HEADERS(stdint.h dlfcn.h)
5	[sssd-devel@lists.fedorahosted.org])	5	AC_CONFIG_HEADER(config.h)
		6
		7	AC_CHECK_TYPES([errno_t], [], [], [[#include <errno.h>]])
		8	+AM_CONDITIONAL([HAVE_ERRNO_T], [test "$ac_cv_type_errno_t" = yes])
		9
		10	m4_include([src/build_macros.m4])
		11	BUILD_WITH_SHARED_BUILD_DIR
		12	@@ -266,13 +266,13 @@ AM_CONDITIONAL([HAVE_PROFILE_CATALOGS],
		13	AM_CONDITIONAL([HAVE_MANPAGES], [test "x$HAVE_MANPAGES" != "x"])
		14	AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"])
6		15
7	+AC_CONFIG_SRCDIR([BUILD.txt])	16	-AC_CHECK_PROG(HAVE_PYTHON2, python2, yes, no)
8	+AC_CONFIG_AUX_DIR([build])	17	+AC_CHECK_PROGS(HAVE_PYTHON2, %%PYTHON2_CMD%% python2, yes, no)
9	+	18	AS_IF([test x$HAVE_PYTHON2 = xyes],
10	m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],	19	- [AC_PATH_PROG(PYTHON2, python2)])
11	[AC_USE_SYSTEM_EXTENSIONS],	20	+ [AC_PATH_PROGS(PYTHON2, %%PYTHON2_CMD%% python2)])
12	[AC_GNU_SOURCE])
13		21
14	CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"	22	-AC_CHECK_PROG(HAVE_PYTHON3, python3, yes, no)
		23	+AC_CHECK_PROGS(HAVE_PYTHON3, %%PYTHON3_CMD%% python3, yes, no)
		24	AS_IF([test x$HAVE_PYTHON3 = xyes],
		25	- [AC_PATH_PROG(PYTHON3, python3)])
		26	+ [AC_PATH_PROGS(PYTHON3, %%PYTHON3_CMD%% python3)])
15		27
16	-AC_CONFIG_SRCDIR([BUILD.txt])	28	if test x$HAVE_PYTHON2_BINDINGS = x1; then
17	-AC_CONFIG_AUX_DIR([build])	29	AS_IF([test x$HAVE_PYTHON2 != xyes],
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 2016-04-13 14:48:41 UTC
	2	+++ src/util/util.c
	3	@@ -946,7 +946,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	@@ -967,15 +967,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-21 Link Here

(-)files/patch-src__providers__ldap__sdap_access.c (-18 / +4 lines)
1	diff --git src/providers/ldap/sdap_access.c src/providers/ldap/sdap_access.c	1	--- src/providers/ldap/sdap_access.c.orig 2016-04-13 14:48:41 UTC
2	index 880735e..d349dcf 100644
3	--- src/providers/ldap/sdap_access.c
4	+++ src/providers/ldap/sdap_access.c	2	+++ src/providers/ldap/sdap_access.c
5	@@ -499,6 +499,7 @@ static bool nds_check_expired(const char *exp_time_str)	3	@@ -557,9 +557,9 @@ bool nds_check_expired(const char *exp_t
6	return true;
7	}
8		4
9	+ tzset();
10	expire_time = mktime(&tm);
11	if (expire_time == -1) {
12	DEBUG(SSSDBG_CRIT_FAILURE,
13	@@ -506,13 +507,11 @@ static bool nds_check_expired(const char *exp_time_str)
14	return true;
15	}
16
17	- tzset();
18	- expire_time -= timezone;
19	now = time(NULL);	5	now = time(NULL);
20	DEBUG(SSSDBG_TRACE_ALL,	6	DEBUG(SSSDBG_TRACE_ALL,
21	- "Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] "	7	- "Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] "
Lines 22-29 Link Here
22	- "daylight [%d] now [%ld] expire_time [%ld].\n", tzname[0],	8	- "daylight [%d] now [%ld] expire_time [%ld].\n", tzname[0],
23	- tzname[1], timezone, daylight, now, expire_time);	9	- tzname[1], timezone, daylight, now, expire_time);
24	+ "Time info: tzname[0] [%s] tzname[1] [%s] "	10	+ "Time info: tzname[0] [%s] tzname[1] [%s] "
25	+ "now [%ld] expire_time [%ld].\n", tzname[0],	11	+ "now [%ld] expire_time [%ld].\n", tzname[0],
26	+ tzname[1], now, expire_time);	12	+ tzname[1], now, expire_time);
27		13
28	if (difftime(now, expire_time) > 0.0) {	14	if (difftime(now, expire_time) > 0.0) {
29	DEBUG(SSSDBG_CONF_SETTINGS, "NDS account expired.\n");	15	DEBUG(SSSDBG_CONF_SETTINGS, "NDS account expired.\n");

Lines 1-6 Link Here

(-)files/patch-src__sss_client__common.c (-7 / +71 lines)
1	diff --git src/sss_client/common.c src/sss_client/common.c	1	--- src/sss_client/common.c.orig 2016-04-13 14:48:41 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,9 +726,9 @@ 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	@@ -741,9 +740,9 @@ enum nss_status sss_nss_make_request(enu
		65	#ifdef NONSTANDARD_SSS_NSS_BEHAVIOUR
		66	*errnop = 0;
		67	errno = 0;
		68	- return NSS_STATUS_NOTFOUND;
		69	+ return NS_NOTFOUND;
		70	#else
		71	- return NSS_STATUS_UNAVAIL;
		72	+ return NS_UNAVAIL;
		73	#endif
		74	}
		75
		76	@@ -752,17 +751,17 @@ enum nss_status sss_nss_make_request(enu
		77	}
		78	switch (ret) {
		79	case SSS_STATUS_TRYAGAIN:
		80	- return NSS_STATUS_TRYAGAIN;
		81	+ return NS_TRYAGAIN;
		82	case SSS_STATUS_SUCCESS:
		83	- return NSS_STATUS_SUCCESS;
		84	+ return NS_SUCCESS;
		85	case SSS_STATUS_UNAVAIL:
		86	default:
		87	#ifdef NONSTANDARD_SSS_NSS_BEHAVIOUR
		88	*errnop = 0;
		89	errno = 0;
		90	- return NSS_STATUS_NOTFOUND;
		91	+ return NS_NOTFOUND;
		92	#else
		93	- return NSS_STATUS_UNAVAIL;
		94	+ return NS_UNAVAIL;
		95	#endif
		96	}
		97	}
		98	@@ -791,12 +790,12 @@ int sss_pac_make_request(enum sss_cli_co
		99	/* avoid looping in the nss daemon */
		100	envval = getenv("_SSS_LOOPS");
		101	if (envval && strcmp(envval, "NO") == 0) {
		102	- return NSS_STATUS_NOTFOUND;
		103	+ return NS_NOTFOUND;
		104	}
		105
		106	ret = sss_cli_check_socket(errnop, SSS_PAC_SOCKET_NAME);
54	if (ret != SSS_STATUS_SUCCESS) {	107	if (ret != SSS_STATUS_SUCCESS) {
55	- return NSS_STATUS_UNAVAIL;	108	- return NSS_STATUS_UNAVAIL;
56	+ return NS_UNAVAIL;	109	+ return NS_UNAVAIL;
Lines 57-62 Link Here
57	}	110	}
58		111
59	ret = sss_cli_make_request_nochecks(cmd, rd, repbuf, replen, errnop);	112	ret = sss_cli_make_request_nochecks(cmd, rd, repbuf, replen, errnop);
		113	@@ -804,7 +803,7 @@ int sss_pac_make_request(enum sss_cli_co
		114	/* try reopen socket */
		115	ret = sss_cli_check_socket(errnop, SSS_PAC_SOCKET_NAME);
		116	if (ret != SSS_STATUS_SUCCESS) {
		117	- return NSS_STATUS_UNAVAIL;
		118	+ return NS_UNAVAIL;
		119	}
		120
		121	/* and make request one more time */
		122	@@ -812,12 +811,12 @@ int sss_pac_make_request(enum sss_cli_co
		123	}
60	switch (ret) {	124	switch (ret) {
61	case SSS_STATUS_TRYAGAIN:	125	case SSS_STATUS_TRYAGAIN:
62	- return NSS_STATUS_TRYAGAIN;	126	- return NSS_STATUS_TRYAGAIN;

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 2016-04-13 14:48:41 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 (-16 / +5 lines)
1	diff --git src/util/util.h src/util/util.h	1	--- src/util/util.h.orig 2016-04-13 14:48:41 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	@@ -586,5 +586,6 @@ int sss_unique_file(TALLOC_CTX *owner,
6	#include <signal.h>	4	* so that it's guaranteed the file is removed.
7	void BlockSignals(bool block, int signum);	5	*/
8	void (CatchSignal(int signum,void (handler)(int )))(int);	6	int sss_unique_filename(TALLOC_CTX owner, char path_tmpl);
9	-void CatchChild(void);
10	-void CatchChildLeaveStatus(void);
11
12	/* from memory.c */
13	typedef int (void_destructor_fn_t)(void *);
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 (-7 / +6 lines)
1	--- src/external/pac_responder.m4.orig 2014-09-17 13:01:37 UTC	1	--- src/external/pac_responder.m4.orig 2016-04-13 14:48:41 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-20 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	@@ -23,7 +23,10 @@ then
13	Kerberos\ 5\ release\ 1.10* \| \
14	Kerberos\ 5\ release\ 1.11* \| \	13	Kerberos\ 5\ release\ 1.11* \| \
15	- Kerberos\ 5\ release\ 1.12*)	14	Kerberos\ 5\ release\ 1.12* \| \
16	+ Kerberos\ 5\ release\ 1.12* \| \	15	Kerberos\ 5\ release\ 1.13* \| \
17	+ Kerberos\ 5\ release\ 1.13* \| \	16	- Kerberos\ 5\ release\ 1.14*)
18	+ Kerberos\ 5\ release\ 1.14* \| \	17	+ Kerberos\ 5\ release\ 1.14* \| \
19	+ Kerberos\ 5\ release\ 1.15* \| \	18	+ Kerberos\ 5\ release\ 1.15* \| \
20	+ Kerberos\ 5\ release\ 1.16* \| \	19	+ Kerberos\ 5\ release\ 1.16* \| \