[Freeipa-devel] [PATCH] 0001 Provide Kerberos over HTTP (MS-KKDCP)

[Adam Young]

On 06/12/2015 03:40 PM, Nathaniel McCallum wrote:
> It doesn't apply again.
>
> On Tue, 2015-06-09 at 15:55 +0200, Christian Heimes wrote:
>> On 2015-05-27 15:16, Christian Heimes wrote:
>>> Hello,
>>>
>>> here is my first patch for FreeIPA. The patch integrates python
>>> -kdcproxy
>>> for MS-KKDCP support (aka Kerberos over HTTPS).
>>>
>>> https://www.freeipa.org/page/V4/KDC_Proxy
>>>
>>> Ticket: https://fedorahosted.org/freeipa/ticket/4801
>> freeipa-cheimes-0001-2-Provide-Kerberos-over-HTTP-MS-KKDCP.patch
>> doesn't
>> apply anymore. The new patch is based on the current master.
>>
>> Christian
>>
>> -- 
>> Manage your subscription for the Freeipa-devel mailing list:
>> https://www.redhat.com/mailman/listinfo/freeipa-devel
>> Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
So...I've been spoiled a bit by Gerrit.   Here is what I just did to get 
them to apply:


cd freeipa
git clean -xdf .
#use the -3 to do 3 way merge
git am -3 
~/Documents/freeipa/patches/cheimes/freeipa-cheimes-0001-3-Provide-Kerberos-over-HTTP-MS-KKDCP.patch
@git status show conflicts in

     both modified:   install/share/Makefile.am
     both modified:   ipaplatform/base/paths.py

Which were due to this change and another making changes to the same 
section of the file, but they were  "accept both"  type conflicts

Updated patch is attached.  Christian, please confirm it is OK.






-------------- next part --------------
A non-text attachment was scrubbed...
Name: freeipa-cheimes-0001-4-Provide-Kerberos-over-HTTP-MS-KKDCP.patch
Type: text/x-patch
Size: 48289 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20150612/acc230e0/attachment.bin>