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

new OTP related options #433

Merged
merged 2 commits into from
Mar 12, 2019
Merged

new OTP related options #433

merged 2 commits into from
Mar 12, 2019

Conversation

mrbaseman
Copy link
Collaborator

@mrbaseman
Copy link
Collaborator Author

We could drop f3b820e again, now that 2fde0a5 offers a more flexible solution, but for testing I have left this commit in my branch
The code changes are at the same places as the ones in #376 so they cause conflicts, so I have cherry-picked the commit from there and merged it manually.
For #427 I feel we should provide a solution and when I had the solution ready and looked at #376 I have noticed that the changes are not only in the same code regions but in fact very similar. So it would be quite unfair to decline the latter one and include a solution for the other one.

@DimitriPapadopoulos
Copy link
Collaborator

DimitriPapadopoulos commented Mar 10, 2019

👍

OK for f3b820e and #376 too. Just add the line break after if for Linux kernel coding style.

@mrbaseman mrbaseman force-pushed the 2fa_code branch 4 times, most recently from c4a4ab4 to 9742a9d Compare March 11, 2019 09:38
@mrbaseman
Copy link
Collaborator Author

sorry for the noise of all those commits. I have squashed the changes into two commits, one for the --otp-prompt and one for --otp-delay and later on squashed a few more updates for the man page into the first one.

@mrbaseman mrbaseman merged commit 26747a5 into adrienverge:master Mar 12, 2019
@mrbaseman mrbaseman mentioned this pull request Mar 12, 2019
@mrbaseman mrbaseman deleted the 2fa_code branch March 12, 2019 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants