Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include new ssh elevate credential login data in OSP request (backport #1539) #1543

Merged
merged 6 commits into from
Jun 2, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 2, 2021

This is an automatic backport of pull request #1539 done by Mergify.
Cherry-pick of 58b6cac has failed:

On branch mergify/bp/gvmd-21.04/pr-1539
Your branch is ahead of 'origin/gvmd-21.04' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 58b6cac6f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

in manage.c: Appended the ssh elevate login data to the login
  data of the target osp ssh credential in function
  target_osp_ssh_credential().

(cherry picked from commit b42a93e)
in manage.c: Removed the erroneous type check for the
  ssh credential in function target_osp_ssh_credential()
  before appending ssh elevate credential login data to
  the ssh credential login data.

(cherry picked from commit bf92148)
(cherry picked from commit 58b6cac)

# Conflicts:
#	CHANGELOG.md
in manage.c: Added the two missing free(osp_credential) calls in
  function target_osp_ssh_credential(..).

(cherry picked from commit 9700639)
in manage.c: Changed the call of free(osp_credential) to
  osp_credential_free(osp_credential) in function
  target_osp_ssh_credential(..).

(cherry picked from commit c9e5d28)
@mergify mergify bot requested a review from a team as a code owner June 2, 2021 09:30
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Jun 2, 2021
@jhelmold jhelmold added conflicts-resolved This backport pull request had merge conflicts that have been resolved and removed conflicts This backport pull request has merge conflicts that need to be resolved labels Jun 2, 2021
@timopollmeier timopollmeier merged commit 5feada5 into gvmd-21.04 Jun 2, 2021
@timopollmeier timopollmeier deleted the mergify/bp/gvmd-21.04/pr-1539 branch June 2, 2021 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts-resolved This backport pull request had merge conflicts that have been resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants