Updated

+2004-12-05  Sergey Poznyakoff  
+
+	* Makefile.am: Added sql/
+	* configure.ac: Rewritten sql-related part. Allow to specify
+	several SQL libraries simultaneously.
+
+	* sql: New directory
+	* sql/Makefile.am: New file
+	* sql/.cvsignore: New file
+	* sql/sql.c: New file
+	* sql/mysql.c: New file
+	* sql/postgres.c: New file
+	
+	* auth/mysql.c: Removed
+	* auth/pgsql.c: Removed
+	* auth/sql.c: Rewritten using general SQL interface.
+	* auth/Makefile.am: Removed mysql.c and pgsql.c
+	* include/mailutils/sql.h: New file
+	* include/mailutils/Makefile.am: Added sql.h
+
+	* include/mailutils/errno.h: Added new error codes.
+	* mailbox/muerrno.c: Likewise.
+	
+	* mail.local/mail.local.h (quota_query): New variable
+	* mail.local/mailquota.c: Retrieve quotas from SQL database
+	* mail.local/main.c: New option --quota-query
+
+	* scripts/sqlmod.sh: New file
+	* scripts/Makefile.am: Added sqlmod.sh
+
+	* doc/texinfo/programs.texi: Documented mailbox quotas
+
+	* NEWS: Updated
+	* README: Updated
+	* po/POTFILES.in: Updated
+
 2004-12-02  Sergey Poznyakoff
 2004-12-02  Sergey Poznyakoff
 
 
 	* doc/texinfo/programs.texi: Documented movemail.
 	* doc/texinfo/programs.texi: Documented movemail.

@@ -13,7 +13,7 @@ Version 0.5.1:
 The option disables any authentication commands until the client party
 The option disables any authentication commands until the client party
 establishes TLS connection with the server.
 establishes TLS connection with the server.
 
 
-** Pop3d server accepts new option `--disable-expired'.
+** Pop3d server accepts new option `--delete-expired'.
 
 
 This option is to be used together with `--expire'. It enables
 This option is to be used together with `--expire'. It enables
 automatic deletion of expired messages before closing the
 automatic deletion of expired messages before closing the
@@ -21,7 +21,13 @@ mailbox. Previous versions of pop3d relied on a cron job that
 was supposed to purge users' mailboxes, but such usage is extremely
 was supposed to purge users' mailboxes, but such usage is extremely
 ineffective for mail servers with considerable number of users.
 ineffective for mail servers with considerable number of users.
 
 
-* Mainly bug fixes
+** The package can be compiled with support for both MySQL and PostgreSQL
+simultaneously. Which of the interfaces to use is defined at run time
+by --sql-interface option.
+
+** Mail.local is able to retrieve mailbox quotas from SQL database.
+
+* Bug fixes
 
 
 
 
 Version 0.5:
 Version 0.5:

@@ -56,19 +56,42 @@ specific configuration options:
 
 
 	Do not build thread-safe libraries.
 	Do not build thread-safe libraries.
 
 
+    --with-sql=MODLIST
+
+        Enable support for authentication using given SQL modules. MODLIST
+        is a colon-separated list of SQL modules to use. Available modules
+        are 'mysql' and 'postgres'. E.g.:
+
+		--with-sql=mysql:postgres
+
+
+        Note that depending
+	on how your SQL systems are installed, this may require adding
+	appropriate directories to the library and include paths, e.g.
+
+
+	./configure LIBS='-L/usr/local/mysql/lib -L/usr/local/pgsql/lib' \
+                    CPPLAGS='-I/usr/local/mysql/include \
+                             -I/usr/local/pgsql/include' 
+    		    --with-sql=mysql:postgres
+
+
     --with-mysql
     --with-mysql
 
 
-	Enable support for authentication via MySQL. Note that depending
-	on how your MySQL system is installed, this may require adding
-	appropriate directories to the library and include paths, e.g.:
+        Equivalent to --with-sql=mysql
+
+        Note that depending on how your MySQL system is installed, this
+        may require adding appropriate directories to the library and
+        include paths, e.g.:
 
 
 	./configure LIBS='-L/usr/local/mysql/lib' \
 	./configure LIBS='-L/usr/local/mysql/lib' \
                     CPPLAGS='-I/usr/local/mysql/include' --with-mysql
                     CPPLAGS='-I/usr/local/mysql/include' --with-mysql
 
 
     --with-postgres
     --with-postgres
 
 
-	Enable support for authentication via PostgreSQL. You may 
-        have to explicitly specify LIBS and CPPFLAGS (see above).
+        Equivalent to --with-sql=postgres 
+
+	You may have to explicitly specify LIBS and CPPFLAGS (see above).
 
 
     --enable-mh-utils
     --enable-mh-utils
 
 

@@ -3,9 +3,10 @@
 # Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 # Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 #
 #
 
 
-auth/mysql.c
+sql/mysql.c
+sql/postgres.c
+
 auth/pam.c
 auth/pam.c
-auth/pgsql.c
 auth/sql.c
 auth/sql.c
 auth/tls.c
 auth/tls.c
 auth/virtual.c
 auth/virtual.c