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.

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

logind: use SD_BUS_ERROR_ACCESS_DENIED #32951

Merged
merged 1 commit into from
May 21, 2024

Conversation

keszybz
Copy link
Member

@keszybz keszybz commented May 21, 2024

As requested in post-merge review
#32869 (review):

NotInControl error is really about session controllers, but this here really
is different.

@github-actions github-actions bot added login please-review PR is ready for (re-)review by a maintainer labels May 21, 2024
Copy link

Important

An -rc1 tag has been created and a release is being prepared, so please note that PRs introducing new features and APIs will be held back until the new version has been released.

@@ -1191,7 +1191,7 @@ static int method_release_session(sd_bus_message *message, void *userdata, sd_bu
return r;

if (session != sender_session)
return sd_bus_error_set(error, BUS_ERROR_NOT_IN_CONTROL, "You are not in control of this session");
return sd_bus_error_set(error, SD_BUS_ERROR_ACCESS_DENIED, "You are not in control of this session");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please also change the text, i.e. maybe say "Refused to release session, since it is not yours" or so?

i.e. i think the wording "in control of this session" should be used only for doing session controller related operations, which this doesn't do

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or maybe "Refused to release session, since it doesn't match the one of the client"?

@poettering poettering added good-to-merge/with-minor-suggestions and removed please-review PR is ready for (re-)review by a maintainer labels May 21, 2024
@keszybz
Copy link
Member Author

keszybz commented May 21, 2024 via email

@yuwata
Copy link
Member

yuwata commented May 21, 2024

Updated.

It seems not...

As requested in post-merge review
systemd#32869 (review):
> NotInControl error is really about session controllers, but this here really
> is different.
@keszybz
Copy link
Member Author

keszybz commented May 21, 2024 via email

@poettering poettering added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed good-to-merge/with-minor-suggestions labels May 21, 2024
@keszybz
Copy link
Member Author

keszybz commented May 21, 2024

The test failures are all over, but don't seem related.

@keszybz keszybz added ci-failure-appears-unrelated and removed good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed labels May 21, 2024
@keszybz keszybz merged commit 9280b08 into systemd:main May 21, 2024
40 of 49 checks passed
@keszybz keszybz deleted the logind-error-message branch May 21, 2024 16:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

3 participants