updated ldap plugin - Githubissues

FOGProject / fogproject

An open source computer cloning & management system

https://fogproject.org

GNU General Public License v3.0

1.1k stars 221 forks source link

updated ldap plugin #635

Closed geotsot closed 1 week ago

geotsot commented 1 week ago

added bind ldap on search without group matching
concatenate groups to match the provided Group Member Attribute instead of hardcoded name=
small correction on dropdown menu for Subtree and below

geotsot commented 1 week ago

@mastacontrola sorry for the spam commits... tried to resolve the conflicts but didn't succeed.

darksidemilk commented 1 week ago

I would suggest you stash/save your changes to the ldap stuff and then do a fresh fork and try again. I would make sure to fork all branches and run this too

git fetch --all
git config core.hooksPath .githooks

Which will implement the githook in .githooks that auto increments the version based on the number of commits since the last master version was released.

darksidemilk commented 1 week ago

You could also try to just sync your current fork. Something along those lines should resolve the conflict.