Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ssh: do not use default_domain_suffix #7635

Closed
wants to merge 2 commits into from
Closed

ssh: do not use default_domain_suffix #7635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9260a3f
ssh: do not use default_domain_suffix
sumit-bose Oct 4, 2024
e7a9eb0
responders: deprecate default_domain_suffix option
sumit-bose Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/man/sssd.conf.5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,10 @@
<varlistentry>
<term>default_domain_suffix (string)</term>
<listitem>
<para>
Please note that this option is deprecated and
domain_resolution_order should be used.
</para>
<para>
This string will be used as a default domain
name for all names without a domain name
Expand Down
3 changes: 1 addition & 2 deletions src/responder/ssh/ssh_cmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ static errno_t ssh_cmd_get_user_pubkeys(struct cli_ctx *cli_ctx)

cmd_ctx->cli_ctx = cli_ctx;

ret = ssh_protocol_parse_user(cli_ctx, cli_ctx->rctx->default_domain,
&cmd_ctx->name, &cmd_ctx->domain);
ret = ssh_protocol_parse_user(cli_ctx, &cmd_ctx->name, &cmd_ctx->domain);
if (ret != EOK) {
DEBUG(SSSDBG_CRIT_FAILURE, "Invalid request message!\n");
goto done;
Expand Down
1 change: 0 additions & 1 deletion src/responder/ssh/ssh_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ struct sss_cmd_table *get_ssh_cmds(void);

errno_t
ssh_protocol_parse_user(struct cli_ctx *cli_ctx,
const char *default_domain,
const char **_name,
const char **_domain);

Expand Down
9 changes: 2 additions & 7 deletions src/responder/ssh/ssh_protocol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ static void got_ssh_keys(struct tevent_req *req)

static errno_t
ssh_protocol_parse_request(struct cli_ctx *cli_ctx,
const char *default_domain,
const char **_name,
const char **_alias,
const char **_domain)
Expand Down Expand Up @@ -209,8 +208,6 @@ ssh_protocol_parse_request(struct cli_ctx *cli_ctx,
return EINVAL;
}
c += domain_len;
} else {
domain = default_domain;
}

DEBUG(SSSDBG_TRACE_FUNC,
Expand All @@ -234,12 +231,10 @@ ssh_protocol_parse_request(struct cli_ctx *cli_ctx,

errno_t
ssh_protocol_parse_user(struct cli_ctx *cli_ctx,
const char *default_domain,
const char **_name,
const char **_domain)
{
return ssh_protocol_parse_request(cli_ctx, default_domain,
_name, NULL, _domain);
return ssh_protocol_parse_request(cli_ctx, _name, NULL, _domain);
}

errno_t
Expand All @@ -248,5 +243,5 @@ ssh_protocol_parse_host(struct cli_ctx *cli_ctx,
const char **_alias,
const char **_domain)
{
return ssh_protocol_parse_request(cli_ctx, NULL, _name, _alias, _domain);
return ssh_protocol_parse_request(cli_ctx, _name, _alias, _domain);
}
Loading