Fix v0.10.x regressions in standalone chansrv #3243
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
The size of the listen_port for sesman cannot exceed XRDP_SOCKETS_MAXPATH. We should use this value rather than an arbitrary value of 256.
The sesman tools have some private functions to make syncronous calls to sesman over SCP. This commit moves these calls to a new module scp_sync in libipm so that they can be utilised by other parts of xrdp (i.e. chansrv)
THe SCP interface is modified so that a program can connect to sesman and ask for the sockdir to be created for the currently authenticated user
Chansrv now checks for the user sockdir being present. If it isn't, it connects to chansrv and requests it be created. This also needs the sesman port to be added to the chansrv config struct.
The code to determine the socket address of chansrv when using a manually started xrdp-chansrv may need some help determining the UID of the session. This commit allows a UID to be optionally specified in the DISPLAY() function, if the code is unable to determine the UID automatically from the connection parameters. If a manual chansrvport is entered, xrdp now logs what it is connecting to, to assist in debugging.
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.
Fixes #3240
With these changes, chansrv is able to connect to sesman and request that the sockdir is created for the user. It will do this if the user xrdp sockets dir is missing when it starts.
Edit 2024-09-23: A UID can now (optionally) be specified for the
DISPLAY()function used by thechansrvportconnection parameter. This is needed if neitherusernameorpamusernameis specified. Docs also updated for this.