Attachment #212446 for bug #244778

Lines 3-9 Link Here

(-)security/sssd/Makefile (-5 / +7 lines)
3		3
4	PORTNAME= sssd	4	PORTNAME= sssd
5	PORTVERSION= 1.11.7	5	PORTVERSION= 1.11.7
6	PORTREVISION= 19	6	PORTREVISION= 20
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/	8	MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/
9		9
Lines 37-42 Link Here
37	krb5>=1.10:security/krb5 \	37	krb5>=1.10:security/krb5 \
38	nsupdate:dns/bind-tools	38	nsupdate:dns/bind-tools
39		39
		40	USES= autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \
		41	python:2.7 shebangfix gssapi:mit
		42
		43	USE_LDCONFIG= yes
		44	USE_OPENLDAP= yes
		45
40	GNU_CONFIGURE= yes	46	GNU_CONFIGURE= yes
41	CONFIGURE_ARGS= --with-selinux=no --with-semanage=no \	47	CONFIGURE_ARGS= --with-selinux=no --with-semanage=no \
42	--with-ldb-lib-dir=${LOCALBASE}/lib/shared-modules/ldb \	48	--with-ldb-lib-dir=${LOCALBASE}/lib/shared-modules/ldb \
Lines 55-64 Link Here
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"	61	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	62	SUB_FILES= pkg-message
57		63
58	USE_LDCONFIG= yes
59	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




--- Makefile.am.orig	2020-03-16 18:30:24 UTC
index fd74d85..4a7e6ae 100644
--- Makefile.am
+++ Makefile.am
@@ -311,6 +311,7 @@ AM_CPPFLAGS = \
     $(LIBNL_CFLAGS) \

     $(KRB5_LIBS)
 
 proxy_child_SOURCES = \
@@ -2333,7 +2338,7 @@ else
 	mkdir -p $(DESTDIR)$(initdir)
 endif
 
-install-data-hook:
+notinstall-data-hook:
 	rm $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2 \
        $(DESTDIR)/$(nsslibdir)/libnss_sss.so
 	mv $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2.0.0 $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2




--- configure.ac.orig	2014-09-17 13:01:37 UTC
+++ configure.ac
@@ -5,14 +5,14 @@ AC_INIT([sssd],
         VERSION_NUMBER,
         [sssd-devel@lists.fedorahosted.org])
 

     [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])

Lines 1-6 Link Here

(-)security/sssd/files/patch-src__confdb__confdb.c (-3 / +1 lines)
1	diff --git src/confdb/confdb.c src/confdb/confdb.c	1	--- src/confdb/confdb.c.orig 2014-09-17 13:01:37 UTC
2	index 19d8884..67720f7 100644
3	--- src/confdb/confdb.c
4	+++ src/confdb/confdb.c	2	+++ src/confdb/confdb.c
5	@@ -28,6 +28,11 @@	3	@@ -28,6 +28,11 @@
6	#include "util/strtonum.h"	4	#include "util/strtonum.h"

Lines 1-6 Link Here

(-)security/sssd/files/patch-src__external__inotify.m4 (-3 / +1 lines)
1	diff --git src/external/inotify.m4 src/external/inotify.m4	1	--- src/external/inotify.m4.orig 2014-09-17 13:01:37 UTC
2	index 9572f6d..2a5a8cf 100644
3	--- src/external/inotify.m4
4	+++ src/external/inotify.m4	2	+++ src/external/inotify.m4
5	@@ -20,10 +20,10 @@ int main () {	3	@@ -20,10 +20,10 @@ int main () {
6	AS_IF([test x"$inotify_works" != xyes],	4	AS_IF([test x"$inotify_works" != xyes],

Lines 1-6 Link Here

(-)security/sssd/files/patch-src__external__krb5.m4 (-3 / +1 lines)
1	diff --git src/external/krb5.m4 src/external/krb5.m4	1	--- src/external/krb5.m4.orig 2014-09-17 13:01:37 UTC
2	index 861c8c9..978ec03 100644
3	--- src/external/krb5.m4
4	+++ src/external/krb5.m4	2	+++ src/external/krb5.m4
5	@@ -9,7 +9,7 @@ if test x$KRB5_CFLAGS != x; then	3	@@ -9,7 +9,7 @@ if test x$KRB5_CFLAGS != x; then
6	KRB5_PASSED_CFLAGS=$KRB5_CFLAGS	4	KRB5_PASSED_CFLAGS=$KRB5_CFLAGS

Lines 1-8 Link Here

(-)security/sssd/files/patch-src__providers__krb5__krb5_delayed_online_authentication.c (-5 / +3 lines)
1	diff --git src/providers/krb5/krb5_delayed_online_authentication.c src/providers/krb5/krb5_delayed_online_authentication.c	1	--- src/providers/krb5/krb5_delayed_online_authentication.c.orig 2014-09-17 13:01:37 UTC
2	index 33b839e..da6ccfc 100644
3	--- src/providers/krb5/krb5_delayed_online_authentication.c
4	+++ src/providers/krb5/krb5_delayed_online_authentication.c	2	+++ src/providers/krb5/krb5_delayed_online_authentication.c
5	@@ -320,6 +320,7 @@ errno_t init_delayed_online_authentication(struct krb5_ctx *krb5_ctx,	3	@@ -320,6 +320,7 @@ errno_t init_delayed_online_authentication(struct krb5
6	struct tevent_context *ev)	4	struct tevent_context *ev)
7	{	5	{
8	int ret;	6	int ret;
Lines 10-16 Link Here
10	hash_table_t *tmp_table;	8	hash_table_t *tmp_table;
11		9
12	ret = get_uid_table(krb5_ctx, &tmp_table);	10	ret = get_uid_table(krb5_ctx, &tmp_table);
13	@@ -339,6 +340,7 @@ errno_t init_delayed_online_authentication(struct krb5_ctx *krb5_ctx,	11	@@ -339,6 +340,7 @@ errno_t init_delayed_online_authentication(struct krb5
14	"hash_destroy failed [%s].\n", hash_error_string(ret));	12	"hash_destroy failed [%s].\n", hash_error_string(ret));
15	return EFAULT;	13	return EFAULT;
16	}	14	}




--- src/providers/ldap/ldap_auth.c.orig	2014-09-17 13:01:37 UTC
index 2aacce0..e019cf7 100644
--- src/providers/ldap/ldap_auth.c
+++ src/providers/ldap/ldap_auth.c
@@ -37,7 +37,6 @@
 #include <sys/time.h>

 static errno_t add_expired_warning(struct pam_data *pd, long exp_time)
 {
     int ret;
@@ -109,6 +124,7 @@ static errno_t check_pwexpire_kerberos(const char *exp
         return EINVAL;
     }
 

     expire_time = mktime(&tm);
     if (expire_time == -1) {
         DEBUG(SSSDBG_CRIT_FAILURE,
@@ -116,12 +132,10 @@ static errno_t check_pwexpire_kerberos(const char *exp
         return EINVAL;
     }
 

 
     if (pd->cmd != SSS_PAM_CHAUTHTOK && pd->cmd != SSS_PAM_CHAUTHTOK_PRELIM) {
         DEBUG(SSSDBG_OP_FAILURE,
@@ -1069,7 +1083,7 @@ static void sdap_auth4chpass_done(struct tevent_req *r
         dp_err = DP_ERR_OFFLINE;
         break;
     default:

     }
 
 done:
@@ -1131,7 +1145,7 @@ static void sdap_pam_chpass_done(struct tevent_req *re
                                                     state->sh, state->dn,
                                                     lastchanged_name);
         if (subreq == NULL) {

             goto done;
         }
 
@@ -1152,7 +1166,7 @@ static void sdap_lastchange_done(struct tevent_req *re
 
     ret = sdap_modify_shadow_lastchange_recv(req);
     if (ret != EOK) {

Lines 1-8 Link Here

(-)security/sssd/files/patch-src__providers__ldap__sdap_access.c (-5 / +3 lines)
1	diff --git src/providers/ldap/sdap_access.c src/providers/ldap/sdap_access.c	1	--- src/providers/ldap/sdap_access.c.orig 2014-09-17 13:01:37 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	@@ -499,6 +499,7 @@ static bool nds_check_expired(const char *exp_time_str
6	return true;	4	return true;
7	}	5	}
8		6
Lines 10-16 Link Here
10	expire_time = mktime(&tm);	8	expire_time = mktime(&tm);
11	if (expire_time == -1) {	9	if (expire_time == -1) {
12	DEBUG(SSSDBG_CRIT_FAILURE,	10	DEBUG(SSSDBG_CRIT_FAILURE,
13	@@ -506,13 +507,11 @@ static bool nds_check_expired(const char *exp_time_str)	11	@@ -506,13 +507,11 @@ static bool nds_check_expired(const char *exp_time_str
14	return true;	12	return true;
15	}	13	}
16		14




--- src/sss_client/common.c.orig	2014-09-17 13:01:37 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(enum sss_cli_c
             *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(enum sss_cli_c
             *errnop = error;
             break;
         case 0:

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

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

     }
 }
 
@@ -750,23 +749,23 @@ int sss_pac_make_request(enum sss_cli_command cmd,
     /* 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);
     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:
-        return NSS_STATUS_UNAVAIL;
+        return NS_UNAVAIL;
     }
 }
 

Lines 1-6 Link Here

(-)security/sssd/files/patch-src__sss_client__nss_group.c (-3 / +1 lines)
1	diff --git src/sss_client/nss_group.c src/sss_client/nss_group.c	1	--- src/sss_client/nss_group.c.orig 2014-09-17 13:01:37 UTC
2	index e6ea54b..b27b671 100644
3	--- src/sss_client/nss_group.c
4	+++ src/sss_client/nss_group.c	2	+++ src/sss_client/nss_group.c
5	@@ -343,6 +343,76 @@ out:	3	@@ -343,6 +343,76 @@ out:
6	}	4	}




--- src/sss_client/sss_nss.exports.orig	2014-09-17 13:01:37 UTC
index 1eefea8..8e85a05 100644
--- src/sss_client/sss_nss.exports
+++ src/sss_client/sss_nss.exports
@@ -3,6 +3,7 @@ EXPORTED {
 	# public functions

 		_nss_sss_getpwnam_r;
 		_nss_sss_getpwuid_r;
 		_nss_sss_setpwent;
@@ -14,7 +15,24 @@ EXPORTED {
 		_nss_sss_setgrent;
 		_nss_sss_getgrent_r;
 		_nss_sss_endgrent;
+		_nss_sss_getgroupmembership;
 		_nss_sss_initgroups_dyn;
+
+		__nss_compat_getgrnam_r;
+		__nss_compat_getgrgid_r;
+		__nss_compat_getgrent_r;

+		__nss_compat_gethostbyname;
+		__nss_compat_gethostbyname2;
+		__nss_compat_gethostbyaddr;
 
 		#_nss_sss_getaliasbyname_r;
 		#_nss_sss_setaliasent;
 		#_nss_sss_getaliasent_r;

Lines 1-6 Link Here

(-)security/sssd/files/patch-src__util__crypto__libcrypto__crypto_sha512crypt.c (-3 / +1 lines)
1	diff --git src/util/crypto/libcrypto/crypto_sha512crypt.c src/util/crypto/libcrypto/crypto_sha512crypt.c	1	--- src/util/crypto/libcrypto/crypto_sha512crypt.c.orig 2014-09-17 13:01:37 UTC
2	index 34547d0..6901851 100644
3	--- src/util/crypto/libcrypto/crypto_sha512crypt.c
4	+++ src/util/crypto/libcrypto/crypto_sha512crypt.c	2	+++ src/util/crypto/libcrypto/crypto_sha512crypt.c
5	@@ -28,6 +28,12 @@	3	@@ -28,6 +28,12 @@
6	#include <openssl/evp.h>	4	#include <openssl/evp.h>

Lines 1-6 Link Here

(-)security/sssd/files/patch-src__util__crypto__nss__nss_sha512crypt.c (-3 / +1 lines)
1	diff --git src/util/crypto/nss/nss_sha512crypt.c src/util/crypto/nss/nss_sha512crypt.c	1	--- src/util/crypto/nss/nss_sha512crypt.c.orig 2014-09-17 13:01:37 UTC
2	index 9fedd5e..90192ac 100644
3	--- src/util/crypto/nss/nss_sha512crypt.c
4	+++ src/util/crypto/nss/nss_sha512crypt.c	2	+++ src/util/crypto/nss/nss_sha512crypt.c
5	@@ -29,6 +29,12 @@	3	@@ -29,6 +29,12 @@
6	#include <sechash.h>	4	#include <sechash.h>

Lines 1-8 Link Here

(-)security/sssd/files/patch-src__util__find_uid.c (-5 / +3 lines)
1	diff --git src/util/find_uid.c src/util/find_uid.c	1	--- src/util/find_uid.c.orig 2014-09-17 13:01:37 UTC
2	index 4c8f73a..40f3690 100644
3	--- src/util/find_uid.c
4	+++ src/util/find_uid.c	2	+++ src/util/find_uid.c
5	@@ -67,7 +67,7 @@ static errno_t get_uid_from_pid(const pid_t pid, uid_t *uid)	3	@@ -67,7 +67,7 @@ static errno_t get_uid_from_pid(const pid_t pid, uid_t
6	uint32_t num=0;	4	uint32_t num=0;
7	errno_t error;	5	errno_t error;
8		6
Lines 11-17 Link Here
11	if (ret < 0) {	9	if (ret < 0) {
12	DEBUG(SSSDBG_CRIT_FAILURE, "snprintf failed");	10	DEBUG(SSSDBG_CRIT_FAILURE, "snprintf failed");
13	return EINVAL;	11	return EINVAL;
14	@@ -207,12 +207,12 @@ static errno_t get_active_uid_linux(hash_table_t *table, uid_t search_uid)	12	@@ -207,12 +207,12 @@ static errno_t get_active_uid_linux(hash_table_t *tabl
15	struct dirent *dirent;	13	struct dirent *dirent;
16	int ret, err;	14	int ret, err;
17	pid_t pid = -1;	15	pid_t pid = -1;

Lines 1-6 Link Here

(-)security/sssd/files/patch-src__util__server.c (-3 / +1 lines)
1	diff --git src/util/server.c src/util/server.c	1	--- src/util/server.c.orig 2014-09-17 13:01:37 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	@@ -322,12 +322,14 @@ static void setup_signals(void)
6	BlockSignals(false, SIGTERM);	4	BlockSignals(false, SIGTERM);




--- src/util/signal.c.orig	2014-09-17 13:01:37 UTC
index 053457b..bb8f8be 100644
--- src/util/signal.c
+++ src/util/signal.c
@@ -28,45 +28,6 @@
  * @brief Signal handling

 /**
  Block sigs.
 **/
@@ -125,22 +86,4 @@ void (*CatchSignal(int signum,void (*handler)(int )))(
 	/* FIXME: need to handle sigvec and systems with broken signal() */
 	return signal(signum, handler);
 #endif
-}
-
-/**
- Ignore SIGCLD via whatever means is necessary for this OS.

-void CatchChildLeaveStatus(void)
-{
-	CatchSignal(SIGCLD, sig_cld_leave_status);
 }

Lines 1-8 Link Here

(-)security/sssd/files/patch-src__util__sss_ldap.c (-5 / +3 lines)
1	diff --git src/util/sss_ldap.c src/util/sss_ldap.c	1	--- src/util/sss_ldap.c.orig 2014-09-17 13:01:37 UTC
2	index dd63b4b..0764622 100644
3	--- src/util/sss_ldap.c
4	+++ src/util/sss_ldap.c	2	+++ src/util/sss_ldap.c
5	@@ -206,6 +206,9 @@ static void sdap_async_sys_connect_done(struct tevent_context *ev,	3	@@ -206,6 +206,9 @@ static void sdap_async_sys_connect_done(struct tevent_
6	errno = 0;	4	errno = 0;
7	ret = connect(state->fd, (struct sockaddr *) &state->addr,	5	ret = connect(state->fd, (struct sockaddr *) &state->addr,
8	state->addr_len);	6	state->addr_len);
Lines 12-18 Link Here
12	if (ret != EOK) {	10	if (ret != EOK) {
13	ret = errno;	11	ret = errno;
14	if (ret == EINPROGRESS \|\| ret == EINTR) {	12	if (ret == EINPROGRESS \|\| ret == EINTR) {
15	@@ -346,7 +349,7 @@ struct tevent_req sss_ldap_init_send(TALLOC_CTX mem_ctx,	13	@@ -346,7 +349,7 @@ struct tevent_req sss_ldap_init_send(TALLOC_CTX mem_
16	"Using file descriptor [%d] for LDAP connection.\n", state->sd);	14	"Using file descriptor [%d] for LDAP connection.\n", state->sd);
17		15
18	subreq = sdap_async_sys_connect_send(state, ev, state->sd,	16	subreq = sdap_async_sys_connect_send(state, ev, state->sd,

Lines 1-6 Link Here

(-)security/sssd/files/patch-src__util__util.h (-3 / +1 lines)
1	diff --git src/util/util.h src/util/util.h	1	--- src/util/util.h.orig 2014-09-17 13:01:37 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	@@ -227,8 +227,6 @@ void sig_term(int sig);
6	#include <signal.h>	4	#include <signal.h>




include/ipa_hbac.h
include/sss_idmap.h
include/sss_nss_idmap.h
%%SMB%%lib/krb5/plugins/authdata/sssd_pac_plugin.so
lib/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
lib/libipa_hbac.so
lib/libipa_hbac.so.0

libexec/sssd/sssd_be
libexec/sssd/sssd_ifp
libexec/sssd/sssd_nss
%%SMB%%libexec/sssd/sssd_pac
libexec/sssd/sssd_pam
libexec/sssd/sssd_ssh
libexec/sssd/sssd_sudo

%%PORTDOCS%%@dir %%DOCSDIR%%/idmap_doc
%%PORTDOCS%%@dir %%DOCSDIR%%/libsss_sudo_doc
%%PORTDOCS%%@dir %%DOCSDIR%%/nss_idmap_doc
@postexec 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
@postexec 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
@postexec 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
@postexec 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

Return to bug 244778

Lines 1-6 Link Here

(-)security/sssd/files/patch-Makefile.am (-3 / +10 lines)
1	diff --git Makefile.am Makefile.am	1	--- Makefile.am.orig 2020-03-16 18:30:24 UTC
2	index fd74d85..4a7e6ae 100644
3	--- Makefile.am
4	+++ Makefile.am	2	+++ Makefile.am
5	@@ -311,6 +311,7 @@ AM_CPPFLAGS = \	3	@@ -311,6 +311,7 @@ AM_CPPFLAGS = \
6	$(LIBNL_CFLAGS) \	4	$(LIBNL_CFLAGS) \
Lines 59-61 Link Here
59	$(KRB5_LIBS)	57	$(KRB5_LIBS)
60		58
61	proxy_child_SOURCES = \	59	proxy_child_SOURCES = \
		60	@@ -2333,7 +2338,7 @@ else
		61	mkdir -p $(DESTDIR)$(initdir)
		62	endif
		63
		64	-install-data-hook:
		65	+notinstall-data-hook:
		66	rm $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2 \
		67	$(DESTDIR)/$(nsslibdir)/libnss_sss.so
		68	mv $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2.0.0 $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2

Lines 1-6 Link Here

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

Lines 1-6 Link Here

(-)security/sssd/files/patch-src__providers__ldap__ldap_auth.c (-8 / +6 lines)
1	diff --git src/providers/ldap/ldap_auth.c src/providers/ldap/ldap_auth.c	1	--- src/providers/ldap/ldap_auth.c.orig 2014-09-17 13:01:37 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 33-39 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	@@ -109,6 +124,7 @@ static errno_t check_pwexpire_kerberos(const char *exp
37	return EINVAL;	35	return EINVAL;
38	}	36	}
39		37
Lines 41-47 Link Here
41	expire_time = mktime(&tm);	39	expire_time = mktime(&tm);
42	if (expire_time == -1) {	40	if (expire_time == -1) {
43	DEBUG(SSSDBG_CRIT_FAILURE,	41	DEBUG(SSSDBG_CRIT_FAILURE,
44	@@ -116,12 +132,10 @@ static errno_t check_pwexpire_kerberos(const char *expire_date, time_t now,	42	@@ -116,12 +132,10 @@ static errno_t check_pwexpire_kerberos(const char *exp
45	return EINVAL;	43	return EINVAL;
46	}	44	}
47		45
Lines 66-72 Link Here
66		64
67	if (pd->cmd != SSS_PAM_CHAUTHTOK && pd->cmd != SSS_PAM_CHAUTHTOK_PRELIM) {	65	if (pd->cmd != SSS_PAM_CHAUTHTOK && pd->cmd != SSS_PAM_CHAUTHTOK_PRELIM) {
68	DEBUG(SSSDBG_OP_FAILURE,	66	DEBUG(SSSDBG_OP_FAILURE,
69	@@ -1069,7 +1083,7 @@ static void sdap_auth4chpass_done(struct tevent_req *req)	67	@@ -1069,7 +1083,7 @@ static void sdap_auth4chpass_done(struct tevent_req *r
70	dp_err = DP_ERR_OFFLINE;	68	dp_err = DP_ERR_OFFLINE;
71	break;	69	break;
72	default:	70	default:
Lines 75-81 Link Here
75	}	73	}
76		74
77	done:	75	done:
78	@@ -1131,7 +1145,7 @@ static void sdap_pam_chpass_done(struct tevent_req *req)	76	@@ -1131,7 +1145,7 @@ static void sdap_pam_chpass_done(struct tevent_req *re
79	state->sh, state->dn,	77	state->sh, state->dn,
80	lastchanged_name);	78	lastchanged_name);
81	if (subreq == NULL) {	79	if (subreq == NULL) {
Lines 84-90 Link Here
84	goto done;	82	goto done;
85	}	83	}
86		84
87	@@ -1152,7 +1166,7 @@ static void sdap_lastchange_done(struct tevent_req *req)	85	@@ -1152,7 +1166,7 @@ static void sdap_lastchange_done(struct tevent_req *re
88		86
89	ret = sdap_modify_shadow_lastchange_recv(req);	87	ret = sdap_modify_shadow_lastchange_recv(req);
90	if (ret != EOK) {	88	if (ret != EOK) {

Lines 1-6 Link Here

(-)security/sssd/files/patch-src__sss_client__common.c (-7 / +34 lines)
1	diff --git src/sss_client/common.c src/sss_client/common.c	1	--- src/sss_client/common.c.orig 2014-09-17 13:01:37 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(enum sss_cli_c
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(enum sss_cli_c
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_socket(int *errno
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,23 +718,23 @@ enum nss_status sss_nss_make_request(enum sss_cli_comm
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 71-73 Link Here
71	}	69	}
72	}	70	}
73		71
		72	@@ -750,23 +749,23 @@ int sss_pac_make_request(enum sss_cli_command cmd,
		73	/* avoid looping in the nss daemon */
		74	envval = getenv("_SSS_LOOPS");
		75	if (envval && strcmp(envval, "NO") == 0) {
		76	- return NSS_STATUS_NOTFOUND;
		77	+ return NS_NOTFOUND;
		78	}
		79
		80	ret = sss_cli_check_socket(errnop, SSS_PAC_SOCKET_NAME);
		81	if (ret != SSS_STATUS_SUCCESS) {
		82	- return NSS_STATUS_UNAVAIL;
		83	+ return NS_UNAVAIL;
		84	}
		85
		86	ret = sss_cli_make_request_nochecks(cmd, rd, repbuf, replen, errnop);
		87	switch (ret) {
		88	case SSS_STATUS_TRYAGAIN:
		89	- return NSS_STATUS_TRYAGAIN;
		90	+ return NS_TRYAGAIN;
		91	case SSS_STATUS_SUCCESS:
		92	- return NSS_STATUS_SUCCESS;
		93	+ return NS_SUCCESS;
		94	case SSS_STATUS_UNAVAIL:
		95	default:
		96	- return NSS_STATUS_UNAVAIL;
		97	+ return NS_UNAVAIL;
		98	}
		99	}
		100

Lines 1-6 Link Here

(-)security/sssd/files/patch-src__sss_client__sss_nss.exports (-7 / +4 lines)
1	diff --git src/sss_client/sss_nss.exports src/sss_client/sss_nss.exports	1	--- src/sss_client/sss_nss.exports.orig 2014-09-17 13:01:37 UTC
2	index 1eefea8..8e85a05 100644
3	--- src/sss_client/sss_nss.exports
4	+++ src/sss_client/sss_nss.exports	2	+++ src/sss_client/sss_nss.exports
5	@@ -3,6 +3,7 @@ EXPORTED {	3	@@ -3,6 +3,7 @@ EXPORTED {
6	# public functions	4	# public functions
Lines 10-22 Link Here
10	_nss_sss_getpwnam_r;	8	_nss_sss_getpwnam_r;
11	_nss_sss_getpwuid_r;	9	_nss_sss_getpwuid_r;
12	_nss_sss_setpwent;	10	_nss_sss_setpwent;
13	@@ -14,8 +15,25 @@ EXPORTED {	11	@@ -14,7 +15,24 @@ EXPORTED {
14	_nss_sss_setgrent;	12	_nss_sss_setgrent;
15	_nss_sss_getgrent_r;	13	_nss_sss_getgrent_r;
16	_nss_sss_endgrent;	14	_nss_sss_endgrent;
17	+ _nss_sss_getgroupmembership;	15	+ _nss_sss_getgroupmembership;
18	_nss_sss_initgroups_dyn;	16	_nss_sss_initgroups_dyn;
19		17	+
20	+ __nss_compat_getgrnam_r;	18	+ __nss_compat_getgrnam_r;
21	+ __nss_compat_getgrgid_r;	19	+ __nss_compat_getgrgid_r;
22	+ __nss_compat_getgrent_r;	20	+ __nss_compat_getgrent_r;
Lines 32-38 Link Here
32	+ __nss_compat_gethostbyname;	30	+ __nss_compat_gethostbyname;
33	+ __nss_compat_gethostbyname2;	31	+ __nss_compat_gethostbyname2;
34	+ __nss_compat_gethostbyaddr;	32	+ __nss_compat_gethostbyaddr;
35	+	33
36	#_nss_sss_getaliasbyname_r;	34	#_nss_sss_getaliasbyname_r;
37	#_nss_sss_setaliasent;	35	#_nss_sss_setaliasent;
38	#_nss_sss_getaliasent_r;

Lines 1-6 Link Here

(-)security/sssd/files/patch-src__util__signal.c (-6 / +5 lines)
1	diff --git src/util/signal.c src/util/signal.c	1	--- src/util/signal.c.orig 2014-09-17 13:01:37 UTC
2	index 053457b..bb8f8be 100644
3	--- src/util/signal.c
4	+++ src/util/signal.c	2	+++ src/util/signal.c
5	@@ -28,45 +28,6 @@	3	@@ -28,45 +28,6 @@
6	* @brief Signal handling	4	* @brief Signal handling
Lines 48-57 Link Here
48	/**	46	/**
49	Block sigs.	47	Block sigs.
50	**/	48	**/
51	@@ -126,21 +87,3 @@ void (CatchSignal(int signum,void (handler)(int )))(int)	49	@@ -125,22 +86,4 @@ void (CatchSignal(int signum,void (handler)(int )))(
		50	/* FIXME: need to handle sigvec and systems with broken signal() */
52	return signal(signum, handler);	51	return signal(signum, handler);
53	#endif	52	#endif
54	}	53	-}
55	-	54	-
56	-/**	55	-/**
57	- Ignore SIGCLD via whatever means is necessary for this OS.	56	- Ignore SIGCLD via whatever means is necessary for this OS.
Lines 69-72 Link Here
69	-void CatchChildLeaveStatus(void)	68	-void CatchChildLeaveStatus(void)
70	-{	69	-{
71	- CatchSignal(SIGCLD, sig_cld_leave_status);	70	- CatchSignal(SIGCLD, sig_cld_leave_status);
72	-}	71	}

Lines 5-11 Link Here

(-)security/sssd/pkg-plist (-6 / +4 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	%%SMB%%lib/krb5/plugins/authdata/sssd_pac_plugin.so
9	lib/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so	8	lib/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so
10	lib/libipa_hbac.so	9	lib/libipa_hbac.so
11	lib/libipa_hbac.so.0	10	lib/libipa_hbac.so.0
Lines 56-62 Link Here
56	libexec/sssd/sssd_be	55	libexec/sssd/sssd_be
57	libexec/sssd/sssd_ifp	56	libexec/sssd/sssd_ifp
58	libexec/sssd/sssd_nss	57	libexec/sssd/sssd_nss
59	%%SMB%%libexec/sssd/sssd_pac
60	libexec/sssd/sssd_pam	58	libexec/sssd/sssd_pam
61	libexec/sssd/sssd_ssh	59	libexec/sssd/sssd_ssh
62	libexec/sssd/sssd_sudo	60	libexec/sssd/sssd_sudo
Lines 190-196 Link Here
190	%%PORTDOCS%%@dir %%DOCSDIR%%/idmap_doc	188	%%PORTDOCS%%@dir %%DOCSDIR%%/idmap_doc
191	%%PORTDOCS%%@dir %%DOCSDIR%%/libsss_sudo_doc	189	%%PORTDOCS%%@dir %%DOCSDIR%%/libsss_sudo_doc
192	%%PORTDOCS%%@dir %%DOCSDIR%%/nss_idmap_doc	190	%%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	191	@postexec 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
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	192	@postexec 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
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	193	@postexec 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
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	194	@postexec 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