Skip to content

Commit

Permalink
use colons instead of commas to separate values within the uid and gi…
Browse files Browse the repository at this point in the history
…d socket options as colons are already used to separate options
  • Loading branch information
totaam committed Apr 27, 2021
1 parent 7f647ec commit e401e65
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions fs/share/man/man1/xpra.1
Expand Up @@ -813,14 +813,14 @@ checks the unix domain socket peer credentials using \fISO_PEERCRED\fP.
This authentication module is only available on some Posix compliant
operating systems. This module will verify that the operating system
provides the uid and gid of the process that initiated the connection.
Access can be restricted by supplying in CSV format the list of valid
Access can be restricted by supplying a colon separated list of valid
\fIuid\fPs and \fIgid\fPs that are allowed to connect.
Those id values may be specified using numerical values or using
the usernames / group names.
This module is different from the others in that it will not require
the client to supply a username or password, as those are ignored.
Environment variables and pseudo-environment variables may also be used
as values, ie: \fB--auth=peercred:uid=\\$UID\fP.
as values, eg: \fB--auth=peercred:uid=\\$UID:fred,gid=xpra\fP.

.IP \fBpam\fP
validates the username and password using the PAM system
Expand Down
4 changes: 2 additions & 2 deletions xpra/server/auth/peercred_auth.py
Expand Up @@ -31,7 +31,7 @@ def __init__(self, username, **kwargs):
allow_uids = []
if allow_owner:
allow_uids.append(getuid())
for x in uids.split(","):
for x in uids.split(":"):
if not x.strip():
continue
x = osexpand(x.strip())
Expand All @@ -47,7 +47,7 @@ def __init__(self, username, **kwargs):
log("peercred: allow_uids(%s)=%s", uids, allow_uids)
if gids:
allow_gids = []
for x in gids.split(","):
for x in gids.split(":"):
if not x.strip():
continue
x = osexpand(x.strip())
Expand Down

0 comments on commit e401e65

Please sign in to comment.