search

Yubico / yubico-pam

Yubico Pluggable Authentication Module (PAM)
https://developers.yubico.com/yubico-pam
BSD 2-Clause "Simplified" License
689 stars 114 forks source link

RFC4515 support added to %u in ldap search filter (#223) #225

Closed 7ippy closed 3 years ago

7ippy commented 3 years ago

This update implements RFC4515 for the username, which replaces % u in the LDAP search filter. A detailed description can be found in issue #223.

7ippy commented 3 years ago

Hey @klali, I am done. Is there anything else to do?

klali commented 3 years ago

I'd like you to squash the commits and force push the branch so we don't get the back-and-forth on master.

7ippy commented 3 years ago

Hey @klali, OK. Can u give me a hint how I can do that? As I mentioned before, I'm new to Github and have never used git before. I have always worked with subversion since my training.

klali commented 3 years ago

from your branch do git rebase --interactive master

replace "pick" with "squash" to meld it into the commit before it for the commits that you want to get rid of as separate entities. You can decide if you want to have it as 1 commit or 2 (1 with code and 1 with tests), if you want it as 2 you'll have to do some re-ordering as well.

When you're done and it's rebased you can fix the commit message with git commit --amend and then git push --force.

7ippy commented 3 years ago

Hey @klali, thank you for your help! Can u verify that my changes are squashed into one commit?

7ippy commented 3 years ago

Hey @klali, thank you! I had a lot of fun working with you. Stay healthy!