On 10/21/2014 04:40 PM, Jakub Hrozek wrote:
On Tue, Oct 21, 2014 at 01:59:31PM +0200, Pavel Reichl wrote:
Just last nitpicks before I dive into testing:
I hope I managed to fix them all, see the attached patches..


_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
The first patch no longer applies:

diff --cc src/tests/cwrap/Makefile.am
index d1f0e9e,d9eb5a8..0000000
--- a/src/tests/cwrap/Makefile.am
+++ b/src/tests/cwrap/Makefile.am
@@@ -42,10 -42,12 +42,19 @@@ check_PROGRAMS
  if HAVE_CMOCKA
  if HAVE_NSS_WRAPPER
  if HAVE_UID_WRAPPER
++<<<<<<< HEAD
 +check_PROGRAMS += \
 +    become_user-tests \
 +    server-tests \
 +    $(NULL)
++=======
+ check_PROGRAMS = \
+       become_user-tests \
+       server-tests \
+       usertools-tests \
+       responder_common-tests \
+       $(NULL)
++>>>>>>> UTIL: Add a function to convert id_t from a number or a name

I think it is because of the patch (5192d5db927d718e2bb1b6551753a836b2a3291a) that Lukas submited today.

Could you rebase please?