circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-20 17:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Use name as marker for failure not type (which must be set to be in the error).

Browse Source
This commit is contained in:
nicm
2026-06-09 12:58:40 +00:00
parent b374868750
commit 34dd42dc7f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd-server-access.c
View File

@@ -63,7 +63,7 @@ cmd_server_access_exec(struct cmd *self, struct cmdq_item *item)
struct args *args = cmd_get_args(self); struct args *args = cmd_get_args(self);
struct client *c = cmdq_get_target_client(item); struct client *c = cmdq_get_target_client(item);
char *arg; char *arg;
const char *name, *type = NULL; const char *name = NULL, *type;
struct passwd *pw; struct passwd *pw;
struct group *gr; struct group *gr;
id_t id; id_t id;
@@ -80,20 +80,20 @@ cmd_server_access_exec(struct cmd *self, struct cmdq_item *item)
arg = format_single(item, args_string(args, 0), c, NULL, NULL, NULL); arg = format_single(item, args_string(args, 0), c, NULL, NULL, NULL);
if (args_has(args, 'g')) { if (args_has(args, 'g')) {
if ((gr = getgrnam(arg)) != NULL) {
type = "group"; type = "group";
if ((gr = getgrnam(arg)) != NULL) {
id = gr->gr_gid; id = gr->gr_gid;
name = gr->gr_name; name = gr->gr_name;
flags |= SERVER_ACL_IS_GROUP; flags |= SERVER_ACL_IS_GROUP;
} }
} else { } else {
if ((pw = getpwnam(arg)) != NULL) {
type = "user"; type = "user";
if ((pw = getpwnam(arg)) != NULL) {
id = pw->pw_uid; id = pw->pw_uid;
name = pw->pw_name; name = pw->pw_name;
} }
} }
if (type == NULL) { if (name == NULL) {
cmdq_error(item, "unknown %s: %s", type, arg); cmdq_error(item, "unknown %s: %s", type, arg);
free(arg); free(arg);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);