From 0fde1ce3109f2259ded7e8bff8d2b1c984252bc0 Mon Sep 17 00:00:00 2001
From: mwolson_admin
Date: Thu, 9 Apr 2009 23:20:18 -0400
Subject: [PATCH] Import Debian package 0.61.0-1+lenny1
---
ChangeLog | 74 ++
Makefile.am | 94 +-
Makefile.in | 189 ++-
README.authmysql.html | 7 -
README_authlib.html.in | 96 +-
aclocal.m4 | 602 ++++++----
authcustom.c | 11 +-
authdaemon.c | 9 +-
authdaemond.c | 11 +-
authldap.c | 12 +-
authldaplib.c | 4 +-
authmysql.c | 18 +-
authmysqllib.c | 562 +++++----
authpgsql.c | 17 +-
authpgsqllib.c | 522 ++++----
authpgsqlrc | 11 +-
authsasl.c | 90 +-
authsaslclient.c | 4 +-
authsaslclient.h | 13 +-
authsaslclientcram.c | 28 +-
authsaslclientcrammd5.c | 19 +-
authsaslclientcramsha1.c | 24 +-
authsaslclientexternal.c | 24 +
authuserdbpwd.c | 13 +-
authvchkpw.c | 242 ----
authvchkpwlib.c | 33 -
bdbobj/Makefile.am | 5 +-
bdbobj/Makefile.in | 32 +-
bdbobj/aclocal.m4 | 602 ++++++----
bdbobj/configure | 1223 ++++++++++---------
checkpassword.c | 13 +-
configure | 1726 +++++++++++----------------
configure.in | 176 +--
courier-authlib.lpspec | 2 +-
courier-authlib.spec | 13 +-
courier-authlib.spec.in | 11 +-
courier_auth_config.h | 18 -
courier_auth_config.h.in | 18 -
courierauthsasl.h | 18 +-
cramlib.c | 10 +-
cryptpassword.c | 21 +-
dbobj.config.in | 6 +
debian/changelog | 35 +
debian/compat | 1 +
debian/courier-authdaemon.init | 8 +
debian/courier-authlib-userdb.files | 6 +-
debian/rules | 10 +-
gdbmobj/Makefile.am | 7 +-
gdbmobj/Makefile.in | 34 +-
gdbmobj/aclocal.m4 | 602 ++++++----
gdbmobj/configure | 1223 ++++++++++---------
libhmac/Makefile.in | 25 +-
libhmac/aclocal.m4 | 602 ++++++----
libhmac/configure | 1223 ++++++++++---------
liblock/Makefile.in | 25 +-
liblock/aclocal.m4 | 602 ++++++----
liblock/config.h.in | 3 +
liblock/configure | 1226 ++++++++++---------
liblock/configure.in | 6 +-
liblock/lockdaemon.c | 43 +-
liblog/Makefile.in | 46 +-
liblog/aclocal.m4 | 602 ++++++----
liblog/configure | 1223 ++++++++++---------
libltdl/Makefile.am | 2 +-
libltdl/Makefile.in | 37 +-
libltdl/acinclude.m4 | 575 +++++----
libltdl/aclocal.m4 | 38 +-
libltdl/configure | 1230 ++++++++++---------
libltdl/install-sh | 480 +++++---
libltdl/ltdl.c | 43 +-
libltdl/ltdl.h | 7 +-
libltdl/ltmain.sh | 137 ++-
libltdl/missing | 23 +-
ltmain.sh | 137 ++-
makedat/Makefile.am | 6 +-
makedat/Makefile.in | 57 +-
makedat/aclocal.m4 | 602 ++++++----
makedat/configure | 1305 ++++++++++----------
makedat/configure.in | 34 +-
md5/Makefile.in | 25 +-
md5/aclocal.m4 | 602 ++++++----
md5/configure | 1223 ++++++++++---------
numlib/Makefile.in | 49 +-
numlib/aclocal.m4 | 602 ++++++----
numlib/configure | 1223 ++++++++++---------
preauthvchkpw.c | 159 ---
random128/Makefile.in | 49 +-
random128/aclocal.m4 | 602 ++++++----
random128/configure | 1223 ++++++++++---------
rfc822/ChangeLog | 6 +
rfc822/Makefile.in | 25 +-
rfc822/aclocal.m4 | 602 ++++++----
rfc822/configure | 1223 ++++++++++---------
rfc822/rfc822_getaddr.c | 40 +-
sha1/Makefile.in | 25 +-
sha1/aclocal.m4 | 602 ++++++----
sha1/configure | 1223 ++++++++++---------
userdb/Makefile.am | 6 +-
userdb/Makefile.in | 37 +-
userdb/aclocal.m4 | 602 ++++++----
userdb/configure | 1211 ++++++++++---------
userdb/configure.in | 4 +-
userdb/vchkpw2userdb.in | 80 --
103 files changed, 16565 insertions(+), 13766 deletions(-)
create mode 100644 authsaslclientexternal.c
delete mode 100644 authvchkpw.c
delete mode 100644 authvchkpwlib.c
create mode 100644 dbobj.config.in
create mode 100644 debian/compat
delete mode 100644 preauthvchkpw.c
delete mode 100755 userdb/vchkpw2userdb.in
diff --git a/ChangeLog b/ChangeLog
index b07b533..065fc3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,77 @@
+0.61.0
+
+2008-07-13 Mr. Sam
+
+ * courier-authlib.spec: Dummy provides: for symlinks, to allow upgrade
+ with older packages that require .so.0.
+
+2008-07-09 Mr. Sam
+
+ * Makefile.am: Switch to versionless shared libraries.
+ Install all shared libraries just as .so. make install manually
+ removes *.so.0.0 files that were left over from previous versions,
+ and installs a temporary *.so.0 symlink to *.so, for temporary
+ binary ABI compatibility with 0.60. The symlinks will be removed in
+ 0.62.
+
+2008-07-08 Mr. Sam
+
+ * Cleanup: always compile md5, sha* and hmac stuff, and remove all
+ conditionally-compiled cruft. Move SASL list to an internal header.
+ Add client-side support for AUTH EXTERNAL.
+
+2008-06-29 Mr. Sam
+
+ * authsasl.c (auth_sasl_ex): auth_sasl_ex() supercedes auth_sasl(),
+ invokes auth_sasl() for non-EXTERNAL SASL methods, implements EXTERNAL
+ by going through the motions, then setting up a dummy authentication
+ request.
+
+ * authdaemon.c (auth_generic): Check for the dummy EXTERNAL
+ authentication request, and handle it by invoking auth_getuserinfo(),
+ rather than sending it down the pipe. This avoid having to implement
+ a stub in every authentication module.
+
+0.60.6
+
+2008-06-08 Alessandro Vesely
+
+ * authmysqllib.c: Use mysql_set_character_set() instead of SET NAMES
+
+0.60.5
+
+2008-05-16 Mr. Sam
+
+ * authmysqllib.c: Fix domain-less queries.
+
+0.60.4
+
+2008-05-08 Mr. Sam
+
+ * Makefile: Drop the unmaintained authvchkpw module.
+
+2008-05-04 Mr. Sam
+
+ * authmysqllib.c: Cleanup. Use mysql_real_escape_string instead of
+ crude filtering.
+
+0.60.3
+
+2007-11-11 Mr. Sam
+
+ * Makefile.am: Use _LIBADD properly.
+
+2007-10-15 "Johnny C. Lam"
+
+ * configure.in: More portability fixes.
+
+0.60.2
+
+2007-10-10 "Johnny C. Lam"
+
+ * liblock/lockdaemon.c: Portability fix for checking the highest
+ available file descriptor.
+
0.60.1
2007-10-06 Anton Dobkin
diff --git a/Makefile.am b/Makefile.am
index d4a7d38..4faed97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,18 @@
-# $Id: Makefile.am,v 1.123 2007/10/07 02:50:45 mrsam Exp $
+# $Id: Makefile.am,v 1.134 2008/07/12 19:40:55 mrsam Exp $
#
-# Copyright 1998 - 2007 Double Precision, Inc. See COPYING for
+# Copyright 1998 - 2008 Double Precision, Inc. See COPYING for
# distribution information.
AUTOMAKE_OPTIONS=dist-bzip2
-SUBDIRS=@LIBLTDL_SUBDIR@ @DBSUBDIR@ md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
-DIST_SUBDIRS=libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
+SUBDIRS=libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
INCLUDES = $(LTDLINCL)
modules=@LIBAUTHUSERDB@ \
@LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \
@LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ \
- @LIBAUTHCUSTOM@ @LIBAUTHVCHKPW@ @LIBAUTHPIPE@
+ @LIBAUTHCUSTOM@ @LIBAUTHPIPE@
pkglibexecdir=$(libexecdir)/courier-authlib
pkglibexec_SCRIPTS=authsystem.passwd
@@ -27,14 +26,13 @@ bin_PROGRAMS=courierauthconfig
EXTRA_LTLIBRARIES=libauthuserdb.la \
libauthpam.la libauthpwd.la libauthshadow.la \
- libauthvchkpw.la \
libauthpgsql.la \
libauthldap.la \
libauthmysql.la \
libauthcustom.la \
libauthpipe.la
-CLEANFILES=authldaprc.h authmysqlrc.h authdaemonrc.h vpopmail_config.h \
+CLEANFILES=authldaprc.h authmysqlrc.h authdaemonrc.h \
authpgsqlrc.h authpiperc.h authdaemon \
authlib.3 authlib.html packageversion.h \
authchangepwdir.h sbindir.h pkglibdir.h pkgincludedir.h \
@@ -44,7 +42,7 @@ CLEANFILES=authldaprc.h authmysqlrc.h authdaemonrc.h vpopmail_config.h \
DISTCLEANFILES=dbobj.config README_authlib.html
commonlibdep=libcourierauthcommon.la
-commonldflags=-module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init'
+commonldflags=-module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init' -avoid-version
commonlibadd=libcourierauthcommon.la
libcourierauthcommon_t=@CRYPTLIBS@
@@ -56,19 +54,19 @@ libcourierauthcommon_la_SOURCES= \
authsyschangepwd.c authsyscommon.c \
cramlib.c cramlib.h \
checkpassword.c cryptpassword.c \
- $(checkpasswordmd5c) $(checkpasswordsha1c)
+ checkpasswordmd5.c checkpasswordsha1.c
libcourierauthcommon_la_DEPENDENCIES=libcourierauth.la
libcourierauthcommon_la_LIBADD=libcourierauth.la
-libcourierauthcommon_la_LDFLAGS=$(libcourierauthcommon_t:%=-Wl,%)
+libcourierauthcommon_la_LDFLAGS=$(libcourierauthcommon_t:%=-Wl,%) -avoid-version
libcourierauth_la_SOURCES=authdaemon.c authdaemonlib.c preauthdaemon.c \
authmoduser2.c authmoduser3.c debug.c \
courierauthdebug.h \
authoption.c
-libcourierauth_la_LIBADD=@HMACLIB@ @MD5LIB@ @SHA1LIB@ numlib/libnumlib.la \
+libcourierauth_la_LIBADD=libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la numlib/libnumlib.la \
random128/librandom128.la rfc822/libencode.la
-libcourierauth_la_LDFLAGS=@NETLIBS@
+libcourierauth_la_LDFLAGS=@NETLIBS@ -avoid-version
# The userdb module
@@ -85,8 +83,8 @@ libauthpam_t=-lpam @SHADOWLIBS@ @AUTHPAMCRYPT@ @LIBDL@
libauthpam_la_SOURCES=authpam.c preauthpam.c authwait.h
libauthpam_la_DEPENDENCIES=$(commonlibdep)
-libauthpam_la_LIBADD=$(commonlibadd)
-libauthpam_la_LDFLAGS=$(commonldflags) $(libauthpam_t)
+libauthpam_la_LIBADD=$(commonlibadd) $(libauthpam_t)
+libauthpam_la_LDFLAGS=$(commonldflags)
# The authpwd module
@@ -101,22 +99,8 @@ libauthshadow_t=@SHADOWLIBS@
libauthshadow_la_SOURCES=authshadow.c preauthshadow.c
libauthshadow_la_DEPENDENCIES=$(commonlibdep)
-libauthshadow_la_LIBADD=$(commonlibadd)
-libauthshadow_la_LDFLAGS=$(commonldflags) $(libauthshadow_t)
-
-# The authvchkpw module
-
-libauthvchkpw_t=@VPOPMAILLIBS@ @LIBM@
-libauthvchkpw_la_SOURCES=authvchkpw.c authvchkpwlib.c preauthvchkpw.c
-libauthvchkpw_la_DEPENDENCIES=$(commonlibdep)
-libauthvchkpw_la_LIBADD=$(commonlibadd)
-libauthvchkpw_la_LDFLAGS=$(commonldflags) $(libauthvchkpw_t)
-
-authvchkpw.lo: authvchkpw.c vpopmail_config.h
-preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h
-
-vpopmail_config.h:
- echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h
+libauthshadow_la_LIBADD=$(commonlibadd) $(libauthshadow_t)
+libauthshadow_la_LDFLAGS=$(commonldflags)
# The authpgsql module
@@ -124,12 +108,11 @@ libauthpgsql_t=@PGSQL_LIBS@ @LIBM@ @NETLIBS@
libauthpgsql_la_SOURCES=authpgsql.c preauthpgsql.c authpgsqllib.c authpgsql.h
libauthpgsql_la_DEPENDENCIES=$(commonlibdep)
-libauthpgsql_la_LIBADD=$(commonlibadd)
-libauthpgsql_la_LDFLAGS=$(commonldflags) $(libauthpgsql_t)
+libauthpgsql_la_LIBADD=$(commonlibadd) $(libauthpgsql_t)
+libauthpgsql_la_LDFLAGS=$(commonldflags)
authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
-
if HAVE_AUTHPGSQL
install-authpgsqlrc:
@@ -160,8 +143,8 @@ authpgsqlrc.h:
libauthldap_t=@LDAPLIBS@ @NETLIBS@
libauthldap_la_SOURCES=authldap.c preauthldap.c authldaplib.c authldap.h
libauthldap_la_DEPENDENCIES=$(commonlibdep)
-libauthldap_la_LIBADD=$(commonlibadd)
-libauthldap_la_LDFLAGS=$(commonldflags) $(libauthldap_t)
+libauthldap_la_LIBADD=$(commonlibadd) $(libauthldap_t)
+libauthldap_la_LDFLAGS=$(commonldflags)
authldaplib.lo: authldaplib.c authldaprc.h
@@ -194,8 +177,8 @@ libauthmysql_t=@MYSQL_LIBS@ @LIBM@ @NETLIBS@
libauthmysql_la_SOURCES=authmysql.c preauthmysql.c authmysqllib.c authmysql.h
libauthmysql_la_DEPENDENCIES=$(commonlibdep)
-libauthmysql_la_LIBADD=$(commonlibadd)
-libauthmysql_la_LDFLAGS=$(commonldflags) $(libauthmysql_t)
+libauthmysql_la_LIBADD=$(commonlibadd) $(libauthmysql_t)
+libauthmysql_la_LDFLAGS=$(commonldflags)
authmysqllib.lo: authmysqllib.c authmysqlrc.h
@@ -248,19 +231,6 @@ noinst_PROGRAMS= \
authdaemontest authmksock \
authdaemondprog
-
-if HAVE_MD5
-checkpasswordmd5c=checkpasswordmd5.c
-else
-checkpasswordmd5c=
-endif
-
-if HAVE_SHA1
-checkpasswordsha1c=checkpasswordsha1.c
-else
-checkpasswordsha1c=
-endif
-
install-authdaemonrc:
$(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || :
sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' authdaemonrc.tmp
@@ -284,7 +254,6 @@ HTMLFILES=README.html NEWS.html INSTALL.html \
EXTRA_DIST=$(HTMLFILES) sysconftool COPYING COPYING.GPL\
authldap.schema \
- checkpasswordmd5.c checkpasswordsha1.c \
authldaprc authmysqlrc authpgsqlrc README.ldap \
README.authmysql.myownquery \
README.authdebug.html.in \
@@ -317,15 +286,16 @@ libcourierauthsasl_la_SOURCES=\
authsaslcram.c authsasllogin.c authsaslplain.c \
authsaslfrombase64.c authsasltobase64.c
libcourierauthsasl_la_LIBADD=libcourierauth.la
-libcourierauthsasl_la_LDFLAGS=-export-symbols-regex '^auth_sasl$$'
+libcourierauthsasl_la_LDFLAGS=-export-symbols-regex '^auth_sasl|auth_sasl_ex$$' -avoid-version
libcourierauthsaslclient_la_SOURCES=courierauthsaslclient.h \
authsaslclient.c authsaslclient.h authsaslclientcram.c \
authsaslclientcrammd5.c authsaslclientcramsha1.c \
authsaslclientlogin.c authsaslclientplain.c \
+ authsaslclientexternal.c \
authsaslfrombase64.c authsasltobase64.c
libcourierauthsaslclient_la_LIBADD=libcourierauth.la
-libcourierauthsaslclient_la_LDFLAGS=-export-symbols-regex '^auth_sasl_client$$'
+libcourierauthsaslclient_la_LDFLAGS=-export-symbols-regex '^auth_sasl_client$$' -avoid-version
include_HEADERS=courier_auth_config.h courierauth.h courierauthsasl.h \
courierauthsaslclient.h courierauthdebug.h
@@ -375,7 +345,7 @@ man1=authpasswd.1 authtest.1
man_MANS=$(man1) $(man3)
BUILT1=authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \
- authdaemonrc.h vpopmail_config.h packageversion.h \
+ authdaemonrc.h packageversion.h \
authchangepwdir.h sbindir.h \
pkglibdir.h pkgincludedir.h mailusergroup.h \
README_authlib.html
@@ -423,8 +393,6 @@ install-exec-hook:
test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
$(DESTDIR)$(pkglibexecdir)/makedatprog ; \
- $(INSTALL_SCRIPT) userdb/vchkpw2userdb \
- $(DESTDIR)$(sbindir)/vchkpw2userdb ; \
$(INSTALL_SCRIPT) userdb/pw2userdb \
$(DESTDIR)$(sbindir)/pw2userdb ; \
$(INSTALL_SCRIPT) userdb/makeuserdb \
@@ -435,17 +403,19 @@ install-exec-hook:
$(DESTDIR)$(sbindir)/userdbpw ; \
$(INSTALL_SCRIPT) userdb-test-cram-md5.pl \
$(DESTDIR)$(sbindir)/userdb-test-cram-md5
+ for f in $(pkglib_LTLIBRARIES); do . $$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0 $(DESTDIR)$(pkglibdir)/$$dlname.0.0; ln -s $$dlname $(DESTDIR)$(pkglibdir)/$$dlname.0; done
+
uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
test "@AUTHUSERDB@" = "" && exit 0 ;\
rm -f $(DESTDIR)$(pkglibexecdir)/makedatprog \
- $(DESTDIR)$(sbindir)/vchkpw2userdb \
$(DESTDIR)$(sbindir)/pw2userdb \
$(DESTDIR)$(sbindir)/makeuserdb \
$(DESTDIR)$(sbindir)/userdb \
$(DESTDIR)$(sbindir)/userdbpw \
$(DESTDIR)$(sbindir)/userdb-test-cram-md5
+ for f in $(pkglib_LTLIBRARIES); do . $$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0; done
authlib.html: authlib.html.in
CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
@@ -615,19 +585,17 @@ bump.rpm.release: @PACKAGE@.spec @PACKAGE@.lpspec
mv @PACKAGE@.lpspec.new @PACKAGE@.lpspec
upload-beta:
+ test -z "$(SFPASSWD)" && exit 1; exit 0
rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1
socksify ssh grace.speakeasy.net echo @PACKAGE@-@VERSION@.tar.bz2 `ls -l @PACKAGE@-@VERSION@.tar.bz2 | awk ' { print $$5 } '` \>courier-mta.org/@PACKAGE@.beta
- ssh headache 'cd torrents.courier-mta.org/pub/@PACKAGE@-dev && rm -rf @PACKAGE@-@VERSION@ && mkdir @PACKAGE@-@VERSION@ && echo seeder_args=--max_upload_rate 50 >@PACKAGE@-@VERSION@.info && ls -t | sed 1,6d | xargs rm -rf '
- scp @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig headache:torrents.courier-mta.org/pub/@PACKAGE@-dev/@PACKAGE@-@VERSION@
+ rsync -aP --progress @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig frs.sourceforge.net:uploads/
+ ../sftools/release.pl mrsam $(SFPASSWD) courier authlib-devel `echo @VERSION@|sed 's/.*\(........\)/\1/'` "" "" @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig
upload-dist:
rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1
socksify cvs tag -F -r @PACKAGE@-latest \
`echo @PACKAGE@-@VERSION@ | tr '.' '-'`
- socksify perl -e 'use Net::FTP; $$ftp=Net::FTP->new("upload.sourceforge.net.", Debug => 1, Passive => 1 ) || die; $$ftp->login("anonymous", "anonymous") || die; $$ftp->cwd("/incoming") && $$ftp->binary() && $$ftp->hash(1) && $$ftp->put("@PACKAGE@-@VERSION@.tar.bz2") && $$ftp->put("@PACKAGE@-@VERSION@.tar.bz2.sig") && exit 0; die;'
- ssh headache 'cd torrents.courier-mta.org/pub/@PACKAGE@ && rm -rf @PACKAGE@-@VERSION@ && mkdir @PACKAGE@-@VERSION@ && echo seeder_args=--max_upload_rate 50 >@PACKAGE@-@VERSION@.info && ls -t | sed 1,6d | xargs rm -rf '
- scp @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig headache:torrents.courier-mta.org/pub/@PACKAGE@/@PACKAGE@-@VERSION@
-
+ rsync -aP --progress @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig frs.sourceforge.net:uploads/
release-dist:
test -z "$(SFPASSWD)" && exit 1; exit 0
diff --git a/Makefile.in b/Makefile.in
index 75fdb95..73026e5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,9 +14,9 @@
@SET_MAKE@
-# $Id: Makefile.am,v 1.123 2007/10/07 02:50:45 mrsam Exp $
+# $Id: Makefile.am,v 1.134 2008/07/12 19:40:55 mrsam Exp $
#
-# Copyright 1998 - 2007 Double Precision, Inc. See COPYING for
+# Copyright 1998 - 2008 Double Precision, Inc. See COPYING for
# distribution information.
@@ -55,10 +55,10 @@ DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
$(srcdir)/courier-authlib.lpspec.in \
$(srcdir)/courier-authlib.spec.in \
$(srcdir)/courier-authlib.sysvinit.in \
- $(srcdir)/courier_auth_config.h.in $(srcdir)/dbobj.h.in \
- $(srcdir)/userdb-test-cram-md5.pl.in $(top_srcdir)/configure \
- AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \
- depcomp install-sh ltmain.sh missing
+ $(srcdir)/courier_auth_config.h.in $(srcdir)/dbobj.config.in \
+ $(srcdir)/dbobj.h.in $(srcdir)/userdb-test-cram-md5.pl.in \
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+ config.guess config.sub depcomp install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -68,9 +68,9 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = courier_auth_config.h
CONFIG_CLEAN_FILES = authdaemond authdaemonrc authsystem.passwd \
- README.authdebug.html dbobj.h authmigrate courier-authlib.spec \
- courier-authlib.lpspec courier-authlib.sysvinit \
- userdb-test-cram-md5.pl
+ README.authdebug.html dbobj.config dbobj.h authmigrate \
+ courier-authlib.spec courier-authlib.lpspec \
+ courier-authlib.sysvinit userdb-test-cram-md5.pl
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -88,6 +88,7 @@ libauthcustom_la_OBJECTS = $(am_libauthcustom_la_OBJECTS)
libauthcustom_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libauthcustom_la_LDFLAGS) $(LDFLAGS) -o $@
+am__DEPENDENCIES_1 =
am_libauthldap_la_OBJECTS = authldap.lo preauthldap.lo authldaplib.lo
libauthldap_la_OBJECTS = $(am_libauthldap_la_OBJECTS)
libauthldap_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -125,21 +126,16 @@ libauthshadow_la_OBJECTS = $(am_libauthshadow_la_OBJECTS)
libauthshadow_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libauthshadow_la_LDFLAGS) $(LDFLAGS) -o $@
-am__DEPENDENCIES_1 = userdb/libuserdb.la
+am__DEPENDENCIES_2 = userdb/libuserdb.la
am_libauthuserdb_la_OBJECTS = authuserdb.lo preauthuserdb.lo \
preauthuserdbcommon.lo authuserdbpwd.lo
libauthuserdb_la_OBJECTS = $(am_libauthuserdb_la_OBJECTS)
libauthuserdb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libauthuserdb_la_LDFLAGS) $(LDFLAGS) -o $@
-am_libauthvchkpw_la_OBJECTS = authvchkpw.lo authvchkpwlib.lo \
- preauthvchkpw.lo
-libauthvchkpw_la_OBJECTS = $(am_libauthvchkpw_la_OBJECTS)
-libauthvchkpw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libauthvchkpw_la_LDFLAGS) $(LDFLAGS) -o $@
-libcourierauth_la_DEPENDENCIES = numlib/libnumlib.la \
- random128/librandom128.la rfc822/libencode.la
+libcourierauth_la_DEPENDENCIES = libhmac/libhmac.la md5/libmd5.la \
+ sha1/libsha1.la numlib/libnumlib.la random128/librandom128.la \
+ rfc822/libencode.la
am_libcourierauth_la_OBJECTS = authdaemon.lo authdaemonlib.lo \
preauthdaemon.lo authmoduser2.lo authmoduser3.lo debug.lo \
authoption.lo
@@ -147,17 +143,10 @@ libcourierauth_la_OBJECTS = $(am_libcourierauth_la_OBJECTS)
libcourierauth_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libcourierauth_la_LDFLAGS) $(LDFLAGS) -o $@
-am__libcourierauthcommon_la_SOURCES_DIST = auth.h courierauth.h \
- authpwdenumerate.c authsaslfrombase64.c authsasltobase64.c \
- authstaticlist.h authsyschangepwd.c authsyscommon.c cramlib.c \
- cramlib.h checkpassword.c cryptpassword.c checkpasswordmd5.c \
- checkpasswordsha1.c
-@HAVE_MD5_TRUE@am__objects_1 = checkpasswordmd5.lo
-@HAVE_SHA1_TRUE@am__objects_2 = checkpasswordsha1.lo
am_libcourierauthcommon_la_OBJECTS = authpwdenumerate.lo \
authsaslfrombase64.lo authsasltobase64.lo authsyschangepwd.lo \
authsyscommon.lo cramlib.lo checkpassword.lo cryptpassword.lo \
- $(am__objects_1) $(am__objects_2)
+ checkpasswordmd5.lo checkpasswordsha1.lo
libcourierauthcommon_la_OBJECTS = \
$(am_libcourierauthcommon_la_OBJECTS)
libcourierauthcommon_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -175,8 +164,8 @@ libcourierauthsaslclient_la_DEPENDENCIES = libcourierauth.la
am_libcourierauthsaslclient_la_OBJECTS = authsaslclient.lo \
authsaslclientcram.lo authsaslclientcrammd5.lo \
authsaslclientcramsha1.lo authsaslclientlogin.lo \
- authsaslclientplain.lo authsaslfrombase64.lo \
- authsasltobase64.lo
+ authsaslclientplain.lo authsaslclientexternal.lo \
+ authsaslfrombase64.lo authsasltobase64.lo
libcourierauthsaslclient_la_OBJECTS = \
$(am_libcourierauthsaslclient_la_OBJECTS)
libcourierauthsaslclient_la_LINK = $(LIBTOOL) --tag=CC \
@@ -188,7 +177,6 @@ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
am_authdaemondprog_OBJECTS = authdaemond.$(OBJEXT)
authdaemondprog_OBJECTS = $(am_authdaemondprog_OBJECTS)
-am__DEPENDENCIES_2 =
authdaemondprog_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(authdaemondprog_LDFLAGS) $(LDFLAGS) -o $@
@@ -233,8 +221,7 @@ SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la_SOURCES) \
$(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \
$(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \
$(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \
- $(libauthuserdb_la_SOURCES) $(libauthvchkpw_la_SOURCES) \
- $(libcourierauth_la_SOURCES) \
+ $(libauthuserdb_la_SOURCES) $(libcourierauth_la_SOURCES) \
$(libcourierauthcommon_la_SOURCES) \
$(libcourierauthsasl_la_SOURCES) \
$(libcourierauthsaslclient_la_SOURCES) \
@@ -246,9 +233,8 @@ DIST_SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la_SOURCES) \
$(libauthmysql_la_SOURCES) $(libauthpam_la_SOURCES) \
$(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \
$(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \
- $(libauthuserdb_la_SOURCES) $(libauthvchkpw_la_SOURCES) \
- $(libcourierauth_la_SOURCES) \
- $(am__libcourierauthcommon_la_SOURCES_DIST) \
+ $(libauthuserdb_la_SOURCES) $(libcourierauth_la_SOURCES) \
+ $(libcourierauthcommon_la_SOURCES) \
$(libcourierauthsasl_la_SOURCES) \
$(libcourierauthsaslclient_la_SOURCES) \
$(authdaemondprog_SOURCES) $(authdaemontest_SOURCES) \
@@ -273,6 +259,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -304,7 +291,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
-DBSUBDIR = @DBSUBDIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO = @ECHO@
@@ -317,7 +303,6 @@ EXPECT = @EXPECT@
F77 = @F77@
FFLAGS = @FFLAGS@
GREP = @GREP@
-HMACLIB = @HMACLIB@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -334,12 +319,10 @@ LIBAUTHPIPE = @LIBAUTHPIPE@
LIBAUTHPWD = @LIBAUTHPWD@
LIBAUTHSHADOW = @LIBAUTHSHADOW@
LIBAUTHUSERDB = @LIBAUTHUSERDB@
-LIBAUTHVCHKPW = @LIBAUTHVCHKPW@
LIBDB = @LIBDB@
LIBDL = @LIBDL@
LIBGDBM = @LIBGDBM@
LIBLTDL = @LIBLTDL@
-LIBLTDL_SUBDIR = @LIBLTDL_SUBDIR@
LIBM = @LIBM@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -348,7 +331,6 @@ LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MD5LIB = @MD5LIB@
MKDIR_P = @MKDIR_P@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
@@ -369,7 +351,6 @@ RANLIB = @RANLIB@
REPOSITORY = @REPOSITORY@
SED = @SED@
SET_MAKE = @SET_MAKE@
-SHA1LIB = @SHA1LIB@
SHADOWLIBS = @SHADOWLIBS@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -378,7 +359,6 @@ SYSCONFTOOL_PERL = @SYSCONFTOOL_PERL@
USE_DB = @USE_DB@
USE_GDBM = @USE_GDBM@
VERSION = @VERSION@
-VPOPMAILLIBS = @VPOPMAILLIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -441,15 +421,13 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
userdb = @userdb@
-vpopmail_home = @vpopmail_home@
AUTOMAKE_OPTIONS = dist-bzip2
-SUBDIRS = @LIBLTDL_SUBDIR@ @DBSUBDIR@ md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
-DIST_SUBDIRS = libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
+SUBDIRS = libltdl gdbmobj bdbobj md5 sha1 libhmac numlib makedat userdb rfc822 random128 liblock liblog
INCLUDES = $(LTDLINCL)
modules = @LIBAUTHUSERDB@ \
@LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \
@LIBAUTHPGSQL@ @LIBAUTHLDAP@ @LIBAUTHMYSQL@ \
- @LIBAUTHCUSTOM@ @LIBAUTHVCHKPW@ @LIBAUTHPIPE@
+ @LIBAUTHCUSTOM@ @LIBAUTHPIPE@
pkglibexecdir = $(libexecdir)/courier-authlib
pkglibexec_SCRIPTS = authsystem.passwd
@@ -460,14 +438,13 @@ pkglib_LTLIBRARIES = libcourierauth.la \
sbin_SCRIPTS = authdaemond
EXTRA_LTLIBRARIES = libauthuserdb.la \
libauthpam.la libauthpwd.la libauthshadow.la \
- libauthvchkpw.la \
libauthpgsql.la \
libauthldap.la \
libauthmysql.la \
libauthcustom.la \
libauthpipe.la
-CLEANFILES = authldaprc.h authmysqlrc.h authdaemonrc.h vpopmail_config.h \
+CLEANFILES = authldaprc.h authmysqlrc.h authdaemonrc.h \
authpgsqlrc.h authpiperc.h authdaemon \
authlib.3 authlib.html packageversion.h \
authchangepwdir.h sbindir.h pkglibdir.h pkgincludedir.h \
@@ -476,7 +453,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h authdaemonrc.h vpopmail_config.h \
DISTCLEANFILES = dbobj.config README_authlib.html
commonlibdep = libcourierauthcommon.la
-commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init'
+commonldflags = -module -rpath $(pkglibdir) -export-symbols-regex 'courier_auth.*_init' -avoid-version
commonlibadd = libcourierauthcommon.la
libcourierauthcommon_t = @CRYPTLIBS@
libcourierauthcommon_la_SOURCES = \
@@ -487,20 +464,20 @@ libcourierauthcommon_la_SOURCES = \
authsyschangepwd.c authsyscommon.c \
cramlib.c cramlib.h \
checkpassword.c cryptpassword.c \
- $(checkpasswordmd5c) $(checkpasswordsha1c)
+ checkpasswordmd5.c checkpasswordsha1.c
libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
libcourierauthcommon_la_LIBADD = libcourierauth.la
-libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%)
+libcourierauthcommon_la_LDFLAGS = $(libcourierauthcommon_t:%=-Wl,%) -avoid-version
libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
authmoduser2.c authmoduser3.c debug.c \
courierauthdebug.h \
authoption.c
-libcourierauth_la_LIBADD = @HMACLIB@ @MD5LIB@ @SHA1LIB@ numlib/libnumlib.la \
+libcourierauth_la_LIBADD = libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la numlib/libnumlib.la \
random128/librandom128.la rfc822/libencode.la
-libcourierauth_la_LDFLAGS = @NETLIBS@
+libcourierauth_la_LDFLAGS = @NETLIBS@ -avoid-version
# The userdb module
libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@
@@ -515,8 +492,8 @@ libauthuserdb_la_LDFLAGS = $(commonldflags)
libauthpam_t = -lpam @SHADOWLIBS@ @AUTHPAMCRYPT@ @LIBDL@
libauthpam_la_SOURCES = authpam.c preauthpam.c authwait.h
libauthpam_la_DEPENDENCIES = $(commonlibdep)
-libauthpam_la_LIBADD = $(commonlibadd)
-libauthpam_la_LDFLAGS = $(commonldflags) $(libauthpam_t)
+libauthpam_la_LIBADD = $(commonlibadd) $(libauthpam_t)
+libauthpam_la_LDFLAGS = $(commonldflags)
# The authpwd module
libauthpwd_la_SOURCES = authpwd.c preauthpwd.c
@@ -528,36 +505,29 @@ libauthpwd_la_LDFLAGS = $(commonldflags)
libauthshadow_t = @SHADOWLIBS@
libauthshadow_la_SOURCES = authshadow.c preauthshadow.c
libauthshadow_la_DEPENDENCIES = $(commonlibdep)
-libauthshadow_la_LIBADD = $(commonlibadd)
-libauthshadow_la_LDFLAGS = $(commonldflags) $(libauthshadow_t)
-
-# The authvchkpw module
-libauthvchkpw_t = @VPOPMAILLIBS@ @LIBM@
-libauthvchkpw_la_SOURCES = authvchkpw.c authvchkpwlib.c preauthvchkpw.c
-libauthvchkpw_la_DEPENDENCIES = $(commonlibdep)
-libauthvchkpw_la_LIBADD = $(commonlibadd)
-libauthvchkpw_la_LDFLAGS = $(commonldflags) $(libauthvchkpw_t)
+libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t)
+libauthshadow_la_LDFLAGS = $(commonldflags)
# The authpgsql module
libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@
libauthpgsql_la_SOURCES = authpgsql.c preauthpgsql.c authpgsqllib.c authpgsql.h
libauthpgsql_la_DEPENDENCIES = $(commonlibdep)
-libauthpgsql_la_LIBADD = $(commonlibadd)
-libauthpgsql_la_LDFLAGS = $(commonldflags) $(libauthpgsql_t)
+libauthpgsql_la_LIBADD = $(commonlibadd) $(libauthpgsql_t)
+libauthpgsql_la_LDFLAGS = $(commonldflags)
# The authldap module
libauthldap_t = @LDAPLIBS@ @NETLIBS@
libauthldap_la_SOURCES = authldap.c preauthldap.c authldaplib.c authldap.h
libauthldap_la_DEPENDENCIES = $(commonlibdep)
-libauthldap_la_LIBADD = $(commonlibadd)
-libauthldap_la_LDFLAGS = $(commonldflags) $(libauthldap_t)
+libauthldap_la_LIBADD = $(commonlibadd) $(libauthldap_t)
+libauthldap_la_LDFLAGS = $(commonldflags)
# The authmysql module
libauthmysql_t = @MYSQL_LIBS@ @LIBM@ @NETLIBS@
libauthmysql_la_SOURCES = authmysql.c preauthmysql.c authmysqllib.c authmysql.h
libauthmysql_la_DEPENDENCIES = $(commonlibdep)
-libauthmysql_la_LIBADD = $(commonlibadd)
-libauthmysql_la_LDFLAGS = $(commonldflags) $(libauthmysql_t)
+libauthmysql_la_LIBADD = $(commonlibadd) $(libauthmysql_t)
+libauthmysql_la_LDFLAGS = $(commonldflags)
# The authcustom module
libauthcustom_la_SOURCES = authcustom.c preauthcustom.c authcustom.h
@@ -570,16 +540,11 @@ libauthpipe_la_SOURCES = authpipe.c authpipelib.h authpipelib.c
libauthpipe_la_DEPENDENCIES = $(commonlibdep)
libauthpipe_la_LIBADD = $(commonlibadd)
libauthpipe_la_LDFLAGS = $(commonldflags)
-@HAVE_MD5_FALSE@checkpasswordmd5c =
-@HAVE_MD5_TRUE@checkpasswordmd5c = checkpasswordmd5.c
-@HAVE_SHA1_FALSE@checkpasswordsha1c =
-@HAVE_SHA1_TRUE@checkpasswordsha1c = checkpasswordsha1.c
HTMLFILES = README.html NEWS.html INSTALL.html \
README.authmysql.html README.authpostgres.html
EXTRA_DIST = $(HTMLFILES) sysconftool COPYING COPYING.GPL\
authldap.schema \
- checkpasswordmd5.c checkpasswordsha1.c \
authldaprc authmysqlrc authpgsqlrc README.ldap \
README.authmysql.myownquery \
README.authdebug.html.in \
@@ -604,15 +569,16 @@ libcourierauthsasl_la_SOURCES = \
authsaslfrombase64.c authsasltobase64.c
libcourierauthsasl_la_LIBADD = libcourierauth.la
-libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl$$'
+libcourierauthsasl_la_LDFLAGS = -export-symbols-regex '^auth_sasl|auth_sasl_ex$$' -avoid-version
libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \
authsaslclient.c authsaslclient.h authsaslclientcram.c \
authsaslclientcrammd5.c authsaslclientcramsha1.c \
authsaslclientlogin.c authsaslclientplain.c \
+ authsaslclientexternal.c \
authsaslfrombase64.c authsasltobase64.c
libcourierauthsaslclient_la_LIBADD = libcourierauth.la
-libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$'
+libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version
include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
courierauthsaslclient.h courierauthdebug.h
@@ -658,7 +624,7 @@ man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \
man1 = authpasswd.1 authtest.1
man_MANS = $(man1) $(man3)
BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \
- authdaemonrc.h vpopmail_config.h packageversion.h \
+ authdaemonrc.h packageversion.h \
authchangepwdir.h sbindir.h \
pkglibdir.h pkgincludedir.h mailusergroup.h \
README_authlib.html
@@ -731,6 +697,8 @@ authsystem.passwd: $(top_builddir)/config.status $(srcdir)/authsystem.passwd.in
cd $(top_builddir) && $(SHELL) ./config.status $@
README.authdebug.html: $(top_builddir)/config.status $(srcdir)/README.authdebug.html.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+dbobj.config: $(top_builddir)/config.status $(srcdir)/dbobj.config.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
dbobj.h: $(top_builddir)/config.status $(srcdir)/dbobj.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
authmigrate: $(top_builddir)/config.status $(srcdir)/authmigrate.in
@@ -749,8 +717,8 @@ install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
else :; fi; \
done
@@ -758,8 +726,8 @@ uninstall-pkglibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
done
clean-pkglibLTLIBRARIES:
@@ -788,8 +756,6 @@ libauthshadow.la: $(libauthshadow_la_OBJECTS) $(libauthshadow_la_DEPENDENCIES)
$(libauthshadow_la_LINK) $(libauthshadow_la_OBJECTS) $(libauthshadow_la_LIBADD) $(LIBS)
libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES)
$(libauthuserdb_la_LINK) $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_LIBADD) $(LIBS)
-libauthvchkpw.la: $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_DEPENDENCIES)
- $(libauthvchkpw_la_LINK) $(libauthvchkpw_la_OBJECTS) $(libauthvchkpw_la_LIBADD) $(LIBS)
libcourierauth.la: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES)
$(libcourierauth_la_LINK) -rpath $(pkglibdir) $(libcourierauth_la_OBJECTS) $(libcourierauth_la_LIBADD) $(LIBS)
libcourierauthcommon.la: $(libcourierauthcommon_la_OBJECTS) $(libcourierauthcommon_la_DEPENDENCIES)
@@ -807,8 +773,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -842,8 +808,8 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -955,6 +921,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslclientcram.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslclientcrammd5.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslclientcramsha1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslclientexternal.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslclientlogin.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslclientplain.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authsaslcram.Plo@am__quote@
@@ -968,8 +935,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authtest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdb.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdbpwd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpw.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authvchkpwlib.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpassword.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordmd5.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordsha1.Plo@am__quote@
@@ -986,7 +951,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthshadow.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdb.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdbcommon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthvchkpw.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -1200,8 +1164,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -1226,8 +1190,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) courier_auth_config.h.in $(TAGS_DEPEN
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1237,13 +1201,12 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) courier_auth_config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) courier_auth_config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -1316,6 +1279,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -1343,6 +1310,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -1523,7 +1492,7 @@ uninstall-man: uninstall-man1 uninstall-man3
clean-generic clean-libtool clean-noinstPROGRAMS \
clean-pkglibLTLIBRARIES clean-sbinPROGRAMS ctags \
ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
@@ -1545,12 +1514,6 @@ uninstall-man: uninstall-man1 uninstall-man3
uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
-authvchkpw.lo: authvchkpw.c vpopmail_config.h
-preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h
-
-vpopmail_config.h:
- echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h
-
authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
@HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
@@ -1686,8 +1649,6 @@ install-exec-hook:
test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
$(DESTDIR)$(pkglibexecdir)/makedatprog ; \
- $(INSTALL_SCRIPT) userdb/vchkpw2userdb \
- $(DESTDIR)$(sbindir)/vchkpw2userdb ; \
$(INSTALL_SCRIPT) userdb/pw2userdb \
$(DESTDIR)$(sbindir)/pw2userdb ; \
$(INSTALL_SCRIPT) userdb/makeuserdb \
@@ -1698,17 +1659,18 @@ install-exec-hook:
$(DESTDIR)$(sbindir)/userdbpw ; \
$(INSTALL_SCRIPT) userdb-test-cram-md5.pl \
$(DESTDIR)$(sbindir)/userdb-test-cram-md5
+ for f in $(pkglib_LTLIBRARIES); do . $$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0 $(DESTDIR)$(pkglibdir)/$$dlname.0.0; ln -s $$dlname $(DESTDIR)$(pkglibdir)/$$dlname.0; done
uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
test "@AUTHUSERDB@" = "" && exit 0 ;\
rm -f $(DESTDIR)$(pkglibexecdir)/makedatprog \
- $(DESTDIR)$(sbindir)/vchkpw2userdb \
$(DESTDIR)$(sbindir)/pw2userdb \
$(DESTDIR)$(sbindir)/makeuserdb \
$(DESTDIR)$(sbindir)/userdb \
$(DESTDIR)$(sbindir)/userdbpw \
$(DESTDIR)$(sbindir)/userdb-test-cram-md5
+ for f in $(pkglib_LTLIBRARIES); do . $$f; rm -f $(DESTDIR)$(pkglibdir)/$$dlname.0; done
authlib.html: authlib.html.in
CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status
@@ -1873,18 +1835,17 @@ bump.rpm.release: @PACKAGE@.spec @PACKAGE@.lpspec
mv @PACKAGE@.lpspec.new @PACKAGE@.lpspec
upload-beta:
+ test -z "$(SFPASSWD)" && exit 1; exit 0
rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1
socksify ssh grace.speakeasy.net echo @PACKAGE@-@VERSION@.tar.bz2 `ls -l @PACKAGE@-@VERSION@.tar.bz2 | awk ' { print $$5 } '` \>courier-mta.org/@PACKAGE@.beta
- ssh headache 'cd torrents.courier-mta.org/pub/@PACKAGE@-dev && rm -rf @PACKAGE@-@VERSION@ && mkdir @PACKAGE@-@VERSION@ && echo seeder_args=--max_upload_rate 50 >@PACKAGE@-@VERSION@.info && ls -t | sed 1,6d | xargs rm -rf '
- scp @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig headache:torrents.courier-mta.org/pub/@PACKAGE@-dev/@PACKAGE@-@VERSION@
+ rsync -aP --progress @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig frs.sourceforge.net:uploads/
+ ../sftools/release.pl mrsam $(SFPASSWD) courier authlib-devel `echo @VERSION@|sed 's/.*\(........\)/\1/'` "" "" @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig
upload-dist:
rm -f @PACKAGE@-@VERSION@.tar.bz2.sig; gpg --detach-sign --default-key mrsam@courier-mta.com @PACKAGE@-@VERSION@.tar.bz2; test -f @PACKAGE@-@VERSION@.tar.bz2.sig || exit 1
socksify cvs tag -F -r @PACKAGE@-latest \
`echo @PACKAGE@-@VERSION@ | tr '.' '-'`
- socksify perl -e 'use Net::FTP; $$ftp=Net::FTP->new("upload.sourceforge.net.", Debug => 1, Passive => 1 ) || die; $$ftp->login("anonymous", "anonymous") || die; $$ftp->cwd("/incoming") && $$ftp->binary() && $$ftp->hash(1) && $$ftp->put("@PACKAGE@-@VERSION@.tar.bz2") && $$ftp->put("@PACKAGE@-@VERSION@.tar.bz2.sig") && exit 0; die;'
- ssh headache 'cd torrents.courier-mta.org/pub/@PACKAGE@ && rm -rf @PACKAGE@-@VERSION@ && mkdir @PACKAGE@-@VERSION@ && echo seeder_args=--max_upload_rate 50 >@PACKAGE@-@VERSION@.info && ls -t | sed 1,6d | xargs rm -rf '
- scp @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig headache:torrents.courier-mta.org/pub/@PACKAGE@/@PACKAGE@-@VERSION@
+ rsync -aP --progress @PACKAGE@-@VERSION@.tar.bz2 @PACKAGE@-@VERSION@.tar.bz2.sig frs.sourceforge.net:uploads/
release-dist:
test -z "$(SFPASSWD)" && exit 1; exit 0
diff --git a/README.authmysql.html b/README.authmysql.html
index 62b7792..beb1113 100644
--- a/README.authmysql.html
+++ b/README.authmysql.html
@@ -27,13 +27,6 @@ database.
authmysqlrc
will be installed too. You must edit this file to
set up your MySQL authentication.
-NOTE: this authentication module should NOT be used if you are
-using the vpopmail virtual mailing list manager. You should select the
-authvchkpw
authentication module instead (which should happen
-automatically). It may be necessary to use the
---without-authmysql
flag to the configure
script,
-because configure
by default will include authmysql
-if it finds MySQL client libraries. .
Edit authmysqlrc
, and initialize the following variables:
diff --git a/README_authlib.html.in b/README_authlib.html.in
index 9661970..26c8db3 100644
--- a/README_authlib.html.in
+++ b/README_authlib.html.in
@@ -1,10 +1,10 @@
-Courier Authentication Library Courier Authentication Library
+-->
Courier Authentication Library
This library is used for two purposes:
1. Read the name of a mail account.
Determine the local account's home directory, and system userid and
@@ -209,7 +209,7 @@ request is a single line terminated by newline.
The authuserdb
authentication module
This module
uses a GDBM or a DB-based
-userdb (8) database.
+userdb (8) database.
This module also incorporates userdb-based challenge-response authentication
implementation that was done by a separate authcram
module
in previous versions of the Courier authentication library.
@@ -219,7 +219,7 @@ The file contains a list of account names, and their pertinent information.
@sysconfdir@/authlib/userdb
may alternatively be a
directory containing plain text files, which are effectively concatenated
together to form the actual list of accounts.
-The makeuserdb script compiles the account information
+The makeuserdb script compiles the account information
into a GDBM or DB database file, which can be quickly looked up.
@sysconfdir@/authlib/userdb
is loosely equivalent in
function to /etc/passwd
and
@@ -243,7 +243,7 @@ scan /etc/passwd
in order to look up an account.
Instead, a fast database lookup can retrieve the same information from the
database file.
Review the included manual pages, starting with
-userdb (8) , for more information.
+userdb (8) , for more information.
userdb
is a way to implement many virtual mailboxes - many
mailboxes that do not have to have a separate system userid allocated for
each one, and there is no system login associated with each mailbox.
@@ -251,15 +251,15 @@ each one, and there is no system login associated with each mailbox.
maildirs. It should be scalable to thousands of mailboxes. It can also be
used to replace linear searches of /etc/passwd
with a database
lookup, see
-pw2userdb (8) .
+pw2userdb (8) .
Note - you still MUST use some valid system userid and groupid that is
shared by all virtual mailboxes. Instead of allocating a single userid and
groupid per each mailbox, the same userid and groupid is used for all of
them.
This is a rough overview of using userdb. For additional information, read
-userdb (8)
+userdb (8)
and
-makeuserdb (8) . All the scripts will
+makeuserdb (8) . All the scripts will
be installed in @sbindir@
, so look for them there.
The best way to describe how userdb
works is to try to create
one virtual mail account. As mentioned before, virtual mailboxes still need
@@ -272,7 +272,7 @@ virtual mailboxes.
Create an empty @userdb@
# chmod 700 @userdb@
@userdb@
must have 700 permissions,
since it will contain passwords.
-Now, run the script pw2userdb , as root.
+Now, run the script pw2userdb , as root.
This script converts the
contents of /etc/passwd
to the @userdb@
format
@@ -287,17 +287,17 @@ use a fast
of /etc/passwd
in order to look up system accounts. However, you probably don't want to
use this feature right now, so what you want to do is take the output
-of pw2userdb , and find the entry for the vmail account
+of pw2userdb , and find the entry for the vmail account
that you
created earlier. Look for a line that starts with 'vmail' followed by tab,
followed by familiar fields from /etc/passwd
. Save the
output of
-pw2userdb in a temporary file, edit it, and remove
+pw2userdb in a temporary file, edit it, and remove
everything
except the line containing vmail, and the very next line, which is a special
entry that maps vmail's userid back to the vmail record.
Here's what you might find in the output of
-pw2userdb :
-You may need to specify a full path to your maildirmake
+You may need to specify a full path to your maildirmake
program. The end result is that you created
$HOME/john-example
in vmail's account, which
can be thought of as a âvirtual home directory â for
@@ -336,7 +336,7 @@ One more detail: we need to set the IMAP password for this
mailbox:
On most modern Linux and BSD distributions, you can specify the -md5
-option to userdbpw , in order to use MD5 password hashes,
+option to userdbpw , in order to use MD5 password hashes,
instead of crypt. The traditional password function allows passwords only
up to 8 characters long; everything in excess is ignored.
The newer MD5 passwords, now supported by most modern systems, allow
@@ -361,7 +361,7 @@ Courier reads @userdb@.dat
and
@userdb@shadow.dat
only. The plain text source,
@userdb@
is not read by Courier itself. Changes take
effect
-only when makeuserdb runs.
Large virtual domain farm
+only when makeuserdb runs.
Large virtual domain farm
The previous approach used a single flat file, @userdb@
.
This
will work for up to a couple of hundred accounts.
@@ -394,7 +394,7 @@ $ userdb "example-com/john@example.com" set \
home=/home/vmail/domains/example-com/john \
uid=UUU gid=GGG
This creates the file @userdb@/example-com
(the first
-parameter to the userdb command), and appends a record named
+parameter to the userdb command), and appends a record named
"john@example.com". You will store all userdb
entries for
@example.com
in the file
@userdb@/example-com
. All
@@ -414,9 +414,7 @@ such as
authpgsql
.
Since userdb
is maintained as plain text files that
are easily parsed by a script, migrating data from userdb will not be
-difficult.
The authvchkpw
authentication module
-This module uses
-the vpopmail/vchkpw
library for authentication.
The authmysql
authentication module
+difficult.
The authmysql
authentication module
This module reads
the list of mail accounts and passwords from a table in a
MySQL database.
@@ -452,13 +450,13 @@ only available with
modules. Individual account options are not supported with
system-based authentication modules (password/shadow files, or PAM).
See the
-auth_generic (3)
+auth_generic (3)
for a description of option names used by various Courier packages.
Other applications can make up names for their own settings, and
use them in the same way.
Account options are specified via the authentication modules in the
following manner:
userdb
-Use the userdb command to set a field called
+Use the userdb command to set a field called
"options
". Example:
-The authtest command may be used to verify that the
+ is the last field that the custom SQL query should return.
+The authtest command may be used to verify that the
authentication library is working:
Running
-authtest
+authtest
with one argument should display the selected account's
home directory, userid, groupid,
and other related data.
The second argument to
-authtest ,
+authtest ,
if supplied, specifies the account's password.
The two argument form of
-authtest
+authtest
validates the password, and displays an indication whether the given
password is valid, or not.
The three argument form of the
-authtest
+authtest
command attemps to change the account's password.
The second argument is the old password, the third argument is the
new password.
-See README.authdebug.html
for more information.
Changing account passwordsFor the virtual domain modules (authldap
,
+See README.authdebug.html
for more information.
Changing account passwordsFor the virtual domain modules (authldap
,
authmysql
, authpgsql
and friends) changing the
login is a no-brainer. The tricky situation is when SqWebMail uses system
passwords to log in (the authpwd
, authshadow
, or
@@ -537,14 +535,14 @@ ways to keep login passwords. Many systems use the traditional
use a binary database; other systems use NIS. And on some systems the
password file lookup library is a wrapper that goes against an external LDAP
directory, or a database. For maximum compatibility, SqWebMail changes login
-passwords by running the passwd command. This is the traditinal
-*nix command that changes login passwords. passwd is an
+passwords by running the passwd command. This is the traditinal
+*nix command that changes login passwords. passwd is an
interactive command. It's normally run from a terminal.
SqWebMail uses an
-expect script - as mentioned in
+expect script - as mentioned in
the introduction - to answer interactive
-prompts from passwd . The expect script expects to
-get a plain, garden-variety, passwd command, which acts
+prompts from passwd . The expect script expects to
+get a plain, garden-variety, passwd command, which acts
something like this:
+(assuming default options to the configure script).
The following structure describes an authentication module:
Example 1. struct authstaticinfo
struct authstaticinfo {
const char *auth_name;
@@ -665,7 +663,7 @@ to the callback function as a second argument.
The first argument is a pointer to the
authinfo structure, which is described in detail
in the
-auth_generic (3)
+auth_generic (3)
manual page.
The authentication module is responsible for allocating this structure.
After the callback function returns this structure can be deallocated.
@@ -712,10 +710,10 @@ the callback function one last time, with a NULL pointer for the login ID,
then returns. If an error is encountered while enumerating the login IDs,
auth_enumerate
terminates without invoking
the callback function with a NULL login ID.
- @authdaemonrc@
- authdaemond configuration file
- @authldaprc@
- authldap configuration file
- @authmysqlrc@
- authmysql configuration file
- @authpgsqlrc@
- authpgsql configuration file
-courier (8) ,
+ @authdaemonrc@
- authdaemond configuration file
+ @authldaprc@
- authldap configuration file
+ @authmysqlrc@
- authmysql configuration file
+ @authpgsqlrc@
- authpgsql configuration file
+userdb (8)