On (03/06/14 08:51), Jakub Hrozek wrote: >On Tue, Jun 03, 2014 at 08:40:11AM +0200, Lukas Slebodnik wrote: >> On (02/06/14 18:36), Jakub Hrozek wrote: >> >Hi, >> > >> >another cherry-pick mail, this time with the IFP responder. Only the >> >first patch had to be amended in the conf_macros.m4 and confdb.h files. >> > >> > >> You forgot to cherry-pick patch >> >> commit 03fb48fdaa7ed95ecb38ecc43a6d221ff2cfd950 >> Author: Jakub Hrozek <jhro...@redhat.com> >> Date: Sun Jan 5 16:35:43 2014 +0100 >> >> IFP: Fix a typo in the Makefile >> > >It was not needed even in master after all, we ended up implemeting >introspection differently. But we might be in sync with master anyway. > Yes, it is better to be in sync with master.
>> >> >From 1f5aef524fe51e572b882c744cb8b483b4aed38b Mon Sep 17 00:00:00 2001 >> >From: Jakub Hrozek <jhro...@redhat.com> >> >Date: Wed, 2 Oct 2013 14:59:35 +0200 >> >Subject: [PATCH 1/3] IFP: Re-add the InfoPipe server >> > >> >Related: >> >https://fedorahosted.org/sssd/ticket/2072 >> > >> >This commit only adds the responder and the needed plumbing. No DBus >> >related code is in yet. >> > >> >(cherry picked from commit cb4d5b588e704114b7090678752d33512baa718e) >> > >> >Conflicts: >> > src/conf_macros.m4 >> > src/confdb/confdb.h >> >--- >> //snip >> >> >--- a/src/responder/common/responder.h >> >+++ b/src/responder/common/responder.h >> >@@ -33,6 +33,7 @@ >> > #include "dhash.h" >> > #include "sbus/sssd_dbus.h" >> > #include "sss_client/sss_cli.h" >> >+#include "util/util.h" >> > >> This change is not in master >> It would be better to cherry-pick patches >> >> >> commit 9de5878d247b77b8f520a57727cd55f42e179caa >> Author: Jakub Hrozek <jhro...@redhat.com> >> Date: Tue Oct 22 11:38:53 2013 +0200 >> >> UTIL: Move sss_parse_name_for_domains declaration to util.h >> >> >> commit a573d112013e44373f03b98f653fede0feee9fdc >> Author: Jakub Hrozek <jhro...@redhat.com> >> Date: Wed Oct 2 14:58:30 2013 +0200 >> >> Remove duplicate declaration > >OK, see the new patchset. Thanks, ACK LS _______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
