[PATCH] Some for credentials_krb5.c
abartlet at samba.org
Tue Nov 27 03:33:37 UTC 2018
On Thu, 2018-11-22 at 11:01 +0100, Volker Lendecke wrote:
> Hi, Andrew!
> Attached find some patches for credentials_krb5.c. In particular
> [PATCH 3/8] credentials: Fix set_ccache with empty creds cache
> is the one that triggered this. I did not understand the real meaning
> of commit bb2f7e3aee7e9b8 and decided to propose something that makes
> it clearer to me.
> It survived gitlab:
> What do you think?
Thanks Volker. I indeed totally missed this while being heads-down in
the security release, oops!
However I'm stuck, I can't get the patch to apply to master. I get:
$ git reset --hard origin/master
$ git am /tmp/vl-patch.txt
Applying: credentials: Only do shallow copies of valid ccaches
Applying: credentials: Fix an error path memleak
Applying: credentials: Fix set_ccache with empty creds cache
Applying: credentials: Remove an unnecessary talloc_steal()
Applying: krb5_wrap: Add a talloc_ctx to smb_krb5_principal_get_realm()
error: patch failed: source3/libads/krb5_setpw.c:217
error: source3/libads/krb5_setpw.c: patch does not apply
Patch failed at 0005 krb5_wrap: Add a talloc_ctx to
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Can you push to a named branch on gitlab, and then make a merge request
from your branch, so I can fetch a patch that unambiguously matches
what you tested in GitLab CI?
(It also helps me find patches to review faster, I use the list of
outstanding merge requests as a TODO).
Authentication Developer, Samba Team https://samba.org
Samba Development and Support, Catalyst IT
More information about the samba-technical