Update pamdir_suse to accommodate with TW pam.d move #2413
Merged
Conversation
This file contains 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
On newer builds of openSUSE tumbleweed the path of pam.d has moved from /usr/etc/pam.d to /usr/lib/pam.d, which prevents install script to correctly guess pam rules. Updating path in mkpamrules solves the problem. The script should still work on older SUSE systems since there's still /etc/pam.d/common-account on those, which should allow for correct rule guess.
matt335672
reviewed
Nov 7, 2022
| @@ -8,7 +8,7 @@ outfile="$3" | |||
|
|
|||
| service="xrdp-sesman" | |||
| pamdir="/etc/pam.d" | |||
| pamdir_suse="/usr/etc/pam.d" | |||
| pamdir_suse="/usr/lib/pam.d" | |||
There was a problem hiding this comment.
Since this is a shell script, how about:-
pamdir_suse="/usr/lib/pam.d"
if [ ! -d "$pamdir_suse" ]; then
# Pre-Tumbleweed setting
pamdir_suse="/usr/etc/pam.d"
fiThere was a problem hiding this comment.
Done, thanks for the suggestion!
|
I think it's worth cherry-picking to v0.9 so I applied v0.9.21 milestone. |
|
@MosakujiHokuto - thanks for your contribution! |
metalefty
pushed a commit
to metalefty/xrdp
that referenced
this pull request
Dec 9, 2022
On newer builds of openSUSE tumbleweed the path of pam.d has moved from /usr/etc/pam.d to /usr/lib/pam.d, which prevents install script to correctly guess pam rules. Updating path in mkpamrules solves the problem. (cherry picked from commit 4ff968b)
derekschrock
pushed a commit
to derekschrock/xrdp
that referenced
this pull request
Dec 15, 2022
On newer builds of openSUSE tumbleweed the path of pam.d has moved from /usr/etc/pam.d to /usr/lib/pam.d, which prevents install script to correctly guess pam rules. Updating path in mkpamrules solves the problem.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
On newer builds of openSUSE tumbleweed the path of pam.d has moved from /usr/etc/pam.d to /usr/lib/pam.d, which prevents install script to correctly guess pam rules. Updating path in mkpamrules solves the problem.
The script should still work on older SUSE systems since there's still /etc/pam.d/common-account on those, which should allow for correct rule guess.