Changeset View
Changeset View
Standalone View
Standalone View
head/security/courier-authlib/files/patch-authvchkpw
Show First 20 Lines • Show All 581 Lines • ▼ Show 20 Lines | |||||
+ | + | ||||
+ $rc=system ("$bindir/pw2userdb --passwd='$vpopmailhome/domains/$domain/vpasswd' --vpopuid --noshadow --nouid $domainopt $redir"); | + $rc=system ("$bindir/pw2userdb --passwd='$vpopmailhome/domains/$domain/vpasswd' --vpopuid --noshadow --nouid $domainopt $redir"); | ||||
+ | + | ||||
+ exit $rc / 256 if $rc != 0; | + exit $rc / 256 if $rc != 0; | ||||
+ } | + } | ||||
+ close(DIR); | + close(DIR); | ||||
+} | +} | ||||
+ | + | ||||
--- userdb/Makefile.in.orig 2013-09-13 12:42:56.000000000 +0200 | --- userdb/Makefile.in.orig 2015-06-06 14:37:22 UTC | ||||
+++ userdb/Makefile.in 2013-10-16 12:27:57.000000000 +0200 | +++ userdb/Makefile.in | ||||
@@ -91,6 +91,7 @@ | @@ -107,7 +107,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat | ||||
$(top_srcdir)/configure $(am__configure_deps) \ | |||||
$(srcdir)/config.h.in $(srcdir)/userdb.pl.in \ | |||||
$(srcdir)/makeuserdb.in $(srcdir)/pw2userdb.in \ | |||||
+ $(srcdir)/vchkpw2userdb.in \ | |||||
$(top_srcdir)/../depcomp ../AUTHORS ../COPYING ../ChangeLog \ | |||||
../INSTALL ../NEWS ../README ../config.guess ../config.sub \ | |||||
../depcomp ../install-sh ../missing ../ltmain.sh \ | |||||
@@ -105,7 +106,7 @@ | |||||
configure.lineno config.status.lineno | configure.lineno config.status.lineno | ||||
mkinstalldirs = $(install_sh) -d | mkinstalldirs = $(install_sh) -d | ||||
CONFIG_HEADER = config.h | CONFIG_HEADER = config.h | ||||
-CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb | -CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb | ||||
+CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb vchkpw2userdb | +CONFIG_CLEAN_FILES = userdb.pl makeuserdb pw2userdb vchkpw2userdb | ||||
CONFIG_CLEAN_VPATH_FILES = | CONFIG_CLEAN_VPATH_FILES = | ||||
LTLIBRARIES = $(noinst_LTLIBRARIES) | LTLIBRARIES = $(noinst_LTLIBRARIES) | ||||
libuserdb_la_LIBADD = | libuserdb_la_LIBADD = | ||||
@@ -365,7 +366,7 @@ | @@ -222,6 +222,7 @@ CSCOPE = cscope | ||||
AM_RECURSIVE_TARGETS = cscope | |||||
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ | |||||
$(srcdir)/makeuserdb.in $(srcdir)/pw2userdb.in \ | |||||
+ $(srcdir)/vchkpw2userdb.in \ | |||||
$(srcdir)/userdb.pl.in $(top_srcdir)/../compile \ | |||||
$(top_srcdir)/../config.guess $(top_srcdir)/../config.sub \ | |||||
$(top_srcdir)/../depcomp $(top_srcdir)/../install-sh \ | |||||
@@ -376,7 +377,7 @@ BUILT_SOURCES = makeuserdb.html.in makeu | |||||
userdb.html.in userdb.8.in \ | userdb.html.in userdb.8.in \ | ||||
userdbpw.html.in userdbpw.8.in | userdbpw.html.in userdbpw.8.in | ||||
-noinst_SCRIPTS = makeuserdb pw2userdb dummy | -noinst_SCRIPTS = makeuserdb pw2userdb dummy | ||||
+noinst_SCRIPTS = makeuserdb pw2userdb vchkpw2userdb dummy | +noinst_SCRIPTS = makeuserdb pw2userdb vchkpw2userdb dummy | ||||
noinst_DATA = makeuserdb.html userdb.html userdbpw.html | noinst_DATA = makeuserdb.html userdb.html userdbpw.html | ||||
userdbpw_SOURCES = userdbpw.c | userdbpw_SOURCES = userdbpw.c | ||||
userdbpw_LDADD = libuserdb.la @HMACLIB@ @MD5LIB@ @SHA1LIB@ @CRYPTLIBS@ | userdbpw_LDADD = libuserdb.la @HMACLIB@ @MD5LIB@ @SHA1LIB@ @CRYPTLIBS@ | ||||
@@ -434,6 +435,8 @@ | @@ -444,6 +445,8 @@ makeuserdb: $(top_builddir)/config.statu | ||||
cd $(top_builddir) && $(SHELL) ./config.status $@ | cd $(top_builddir) && $(SHELL) ./config.status $@ | ||||
pw2userdb: $(top_builddir)/config.status $(srcdir)/pw2userdb.in | pw2userdb: $(top_builddir)/config.status $(srcdir)/pw2userdb.in | ||||
cd $(top_builddir) && $(SHELL) ./config.status $@ | cd $(top_builddir) && $(SHELL) ./config.status $@ | ||||
+vchkpw2userdb: $(top_builddir)/config.status $(srcdir)/vchkpw2userdb.in | +vchkpw2userdb: $(top_builddir)/config.status $(srcdir)/vchkpw2userdb.in | ||||
+ cd $(top_builddir) && $(SHELL) ./config.status $@ | + cd $(top_builddir) && $(SHELL) ./config.status $@ | ||||
clean-noinstLTLIBRARIES: | clean-noinstLTLIBRARIES: | ||||
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) | -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) |