Simplify sshpam_query since we no longer have to handle accumulating messages into prompts now that non-prompts are handled with SSH2's info#629
Closed
daztucker wants to merge 2 commits intoopenssh:masterfrom
Closed
Conversation
SSH keyboard-interactive authentication method supports instructions but sshd didn't show them until an user prompt was requested. This is quite inconvenient for various PAM modules that need to notify an user without requiring for their explicit input. So, properly implement RFC4256 making instructions to be shown to users when they are requested from PAM. Closes: https://bugzilla.mindrot.org/show_bug.cgi?id=2876
With the previous commit, both prompts and info/error error messages are returned to keyboard-interactive immedately and none are accumulated, so there will never be any un-drained prompts.
djmdjm
reviewed
Feb 15, 2026
| *num = 0; | ||
| free(*info); | ||
| *info = msg; /* Steal the message */ | ||
| msg = NULL; |
Contributor
There was a problem hiding this comment.
I think this line is unnecessary, as we return immediately afterwards.
Otherwise ok
Contributor
Author
There was a problem hiding this comment.
I agree, and I did have that removed at one point however the next step I want to do is to remove the while() loop and make sshpam_query a single entry, single exit function which frees whatever needs freeing on exit, and I'd just have to put this back.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.