krb5: return to responder that pkinit is not available #204
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
If pkinit is not available for a user but other authentication methods are SSSD should still fall back to local certificate based authentication if Smartcard credentials are provided. Resolves https://pagure.io/SSSD/sssd/issue/3343
|
LGTM, the code comment helps understand the complex condition, thanks. I just ran CI and Coverity to rubber-stamp the patch before pushing. |
|
I would personally prefer some macro or local variable because added condition is too complicated IMHO. Because there is |
|
I agree that the overall condition is complicated and I thought about extracting some conditions as well. In the end I decided against it because I think it helps to understand the conditions if each authentication type is listed explicitly. |
|
On (28/03/17 14:07), sumit-bose wrote:
I agree that the overall condition is complicated and I thought about extracting some conditions as well. In the end I decided against it because I think it helps to understand the conditions if each authentication type is listed explicitly.
Sure; but current indentaion does not improve it either.
If we ignore 80 collumn limit then follwing is a little bit better
```
diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c
index a4128dda6..94bf1ee6d 100644
--- a/src/providers/krb5/krb5_child.c
+++ b/src/providers/krb5/krb5_child.c
@@ -1539,11 +1539,9 @@ static krb5_error_code get_and_save_tgt(struct krb5_req *kr,
if (kr->pd->cmd == SSS_PAM_AUTHENTICATE
&& kerr == KRB5_PREAUTH_FAILED
&& kr->pkinit_prompting == false
- && (( kr->password_prompting == false
- && kr->otp == false)
- || ((kr->otp == true
- || kr->password_prompting == true)
- && IS_SC_AUTHTOK(kr->pd->authtok))) ) {
+ && (( kr->password_prompting == false && kr->otp == false)
+ || ((kr->otp == true || kr->password_prompting == true)
+ && IS_SC_AUTHTOK(kr->pd->authtok))) ) {
return ERR_NO_AUTH_METHOD_AVAILABLE;
}
return kerr;
```
It jut my personal opinion. Others can have different.
Feel free to push current version.
LS
|
|
I really don't mind one way or another. I find all the proposed versions of the condition complex, that's why I'm glad there is a comment atop them. So from my point of view, I'm fine with the first version |
|
On (29/03/17 01:58), Jakub Hrozek wrote:
I really don't mind one way or another. I find all the proposed versions of the condition complex, that's why I'm glad there is a comment atop them.
So from my point of view, I'm fine with the first version
OK, go ahead and push.
sorry for noise.
LS
|
|
ok, thanks! |
jhrozek
approved these changes
Mar 29, 2017
|
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.
If pkinit is not available for a user but other authentication methods are
SSSD should still fall back to local certificate based authentication if
Smartcard credentials are provided.
Resolves https://pagure.io/SSSD/sssd/issue/3343