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

Adds scram-sha1 SASL mechanism for mnesia and odbc #130

Closed
wants to merge 5 commits into from
Closed

Conversation

michalwski
Copy link
Contributor

No description provided.

badlop and others added 5 commits October 8, 2013 15:53
Works with internal (mnesia) storage.

Conflicts:
	apps/ejabberd/src/cyrsasl_anonymous.erl
	apps/ejabberd/src/cyrsasl_digest.erl
	apps/ejabberd/src/cyrsasl_plain.erl
	apps/ejabberd/src/ejabberd_c2s.erl
	src/ejabberd.app
	src/ejabberd_auth_ldap.erl
	src/ejabberd_auth_pam.erl

Fix and improve support for SCRAM auth method (EJAB-1196)

Conflicts:
	apps/ejabberd/src/ejabberd_auth.erl
	apps/ejabberd/src/ejabberd_auth_internal.erl
	rel/files/ejabberd.cfg
	src/ejabberd_auth_ldap.erl
	src/ejabberd_auth_pam.erl
	src/ejabberd_piefxis.erl
@michalwski
Copy link
Contributor Author

#171 is more up to date

@michalwski michalwski closed this Apr 17, 2014
@michalwski michalwski deleted the scram branch April 17, 2014 09:22
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