From 44a9ceac0b2ac02feae5f103852c68df61a8db27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= Date: Sun, 29 Jan 2017 14:35:22 +0100 Subject: [PATCH] More changes that are required from p1_pam -> epam --- Makefile.in | 2 +- mix.exs | 2 +- rebar.config | 4 ++-- src/ejabberd_auth_pam.erl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5ff3efe0b..28c04227f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -148,7 +148,7 @@ $(foreach file,$(DEPS_FILES_FILTERED) $(MAIN_FILES),$(eval $(call COPY_template, $(sort $(call TO_DEST,$(MAIN_DIRS) $(DEPS_DIRS))): $(INSTALL) -d $@ -$(call TO_DEST,deps/p1_pam/priv/bin/epam): $(LIBDIR)/%: deps/p1_pam/priv/bin/epam $(call TO_DEST,deps/p1_pam/priv/bin/) +$(call TO_DEST,deps/epam/priv/bin/epam): $(LIBDIR)/%: deps/epam/priv/bin/epam $(call TO_DEST,deps/epam/priv/bin/) $(INSTALL) -m 750 $(O_USER) $< $@ $(call TO_DEST,priv/sql/lite.sql): sql/lite.sql $(call TO_DEST,priv/sql) diff --git a/mix.exs b/mix.exs index 3cdcc6841..3cddbfb01 100644 --- a/mix.exs +++ b/mix.exs @@ -68,7 +68,7 @@ defmodule Ejabberd.Mixfile do {config(:redis), {:eredis, "~> 1.0"}}, {config(:zlib), {:ezlib, "~> 1.0"}}, {config(:iconv), {:iconv, "~> 1.0"}}, - {config(:pam), {:p1_pam, "~> 1.0"}}, + {config(:pam), {:epam, "~> 1.0"}}, {config(:tools), {:luerl, github: "rvirding/luerl", tag: "v0.2"}}, {config(:tools), {:meck, "~> 0.8.4"}}, {config(:tools), {:moka, github: "processone/moka", tag: "1.0.5c"}}], do: diff --git a/rebar.config b/rebar.config index 95c2c7aa8..f24b922d5 100644 --- a/rebar.config +++ b/rebar.config @@ -71,7 +71,7 @@ p1_utils, p1_mysql, p1_pgsql, - p1_pam, + epam, ezlib, iconv]}}. @@ -145,7 +145,7 @@ {"fast_yaml", []}, {"esip", []}, {"fast_xml", [{if_var_true, full_xml, "--enable-full-xml"}]}, - {if_var_true, pam, {"p1_pam", []}}, + {if_var_true, pam, {"epam", []}}, {if_var_true, zlib, {"ezlib", []}}, {if_var_true, iconv, {"iconv", []}}]}. diff --git a/src/ejabberd_auth_pam.erl b/src/ejabberd_auth_pam.erl index 603c8cd89..9e5e63ac1 100644 --- a/src/ejabberd_auth_pam.erl +++ b/src/ejabberd_auth_pam.erl @@ -41,7 +41,7 @@ opt_type/1]). start(_Host) -> - ejabberd:start_app(p1_pam). + ejabberd:start_app(epam). set_password(_User, _Server, _Password) -> {error, not_allowed}.