Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit ab7fe6be ab7fe6bef2b6dc5f1eb1fa05421e5022595d1c0a by Sergey Poznyakoff
Options

Merge branch 'master' of ssh://gray@git.sv.gnu.org/srv/git/mailutils

2 parents 910f96ee 6f6ee025
Expand all
Inline Side-by-side
Showing 91 changed files with 227 additions and 216 deletions
## Process this file with GNU Automake to create Makefile.in
## Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008
## Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
## Free Software Foundation, Inc.
##
## GNU Mailutils is free software; you can redistribute it and/or
......@@ -27,14 +27,14 @@ SUBDIRS = \
testsuite\
mailbox\
sql\
auth\
libmu_auth\
libproto\
lib\
libsieve\
libmu_argp\
libmu_cfg\
libmu_cpp\
libmu_scm\
libargp\
libcfg\
libmu_sieve\
doc\
config\
examples\
......
......@@ -12,8 +12,8 @@ AC_DEFUN([MU_CHECK_LIB],
[
for path in $6
do
LIBS="$save_LIBS -L$path"
AC_CHECK_LIB($1, $2,
LIBS="$save_LIBS $3 -L$path -l$1"
AC_TRY_LINK_FUNC($2,
[mu_cv_lib_$1="$3 -L$path -l$1"
break],
[mu_cv_lib_$1=no],$3)
......
dnl Configuration for GNU Mailutils -- a suite of utilities for electronic mail
dnl
dnl Copyright (C) 1999,2000,2001,2002,2003,2004,2005,
dnl 2006,2007,2008 Free Software Foundation, Inc.
dnl 2006,2007,2008,2009 Free Software Foundation, Inc.
dnl
dnl GNU Mailutils is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
......@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License along
dnl with GNU Mailutils; if not, write to the Free Software Foundation,
dnl Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
AC_INIT([GNU Mailutils], [2.0], [bug-mailutils@gnu.org], [mailutils])
AC_INIT([GNU Mailutils], [2.0.90], [bug-mailutils@gnu.org], [mailutils])
AC_CONFIG_SRCDIR([mailbox/mailbox.c])
AC_CONFIG_AUX_DIR([scripts])
AM_INIT_AUTOMAKE
......@@ -34,7 +34,7 @@ AC_SUBST(VI_REVISION, 2)
AC_SUBST(VI_AGE, 1)
dnl Library paths
AC_SUBST(MU_LIB_AUTH,'${top_builddir}/auth/libmuauth.la')
AC_SUBST(MU_LIB_AUTH,'${top_builddir}/libmu_auth/libmu_auth.la')
AC_SUBST(MU_LIB_MAILUTILS,'${top_builddir}/mailbox/libmailutils.la')
AC_SUBST(MU_LIB_SQL,'${top_builddir}/sql/libsql.la')
AC_SUBST(MU_LIB_IMAP,'${top_builddir}/libproto/imap/libmu_imap.la')
......@@ -45,18 +45,18 @@ AC_SUBST(MU_LIB_MH,'${top_builddir}/libproto/mh/libmu_mh.la')
AC_SUBST(MU_LIB_NNTP,'${top_builddir}/libproto/nntp/libmu_nntp.la')
AC_SUBST(MU_LIB_POP,'${top_builddir}/libproto/pop/libmu_pop.la')
AC_SUBST(MU_LIB_REMOTE,'${top_builddir}/libproto/remote/libmu_remotembox.la')
AC_SUBST(MU_LIB_SIEVE,'${top_builddir}/libsieve/libsieve.la')
AC_SUBST(MU_LIB_SIEVE,'${top_builddir}/libmu_sieve/libmu_sieve.la')
AC_SUBST(MU_LIB_SCM,'${top_builddir}/libmu_scm/libmu_scm.la')
AC_SUBST(MU_LIB_CPP,'${top_builddir}/libmu_cpp/libmu_cpp.la')
AC_SUBST(MU_LIB_ARGP,'${top_builddir}/libargp/libargp.la')
AC_SUBST(MU_LIB_ARGP,'${top_builddir}/libmu_argp/libmu_argp.la')
dnl Other variables
AC_SUBST(SIEVE_MODDIR,'$(libdir)/$(PACKAGE)')
AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)')
AC_SUBST(MU_APP_LIBRARIES,'../libargp/libmuargp.a ../libcfg/libmucfg.la ../lib/libmuaux.la')
AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a ../libmu_cfg/libmu_cfg.la ../lib/libmuaux.la')
AC_SUBST(MU_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libargp -I${top_srcdir}/libcfg')
AC_SUBST(MU_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libmu_argp -I${top_srcdir}/libmu_cfg')
dnl Check for programs
AC_PROG_CC
......@@ -144,7 +144,7 @@ AC_SUBST(MU_AUTHLIBS_DEPENDENCY)
AC_SUBST(MU_AUTHINCS)
MU_AUTHLIBS=
MU_AUTHLIBS_DEPENDENCY=../auth/libmuauth.la
MU_AUTHLIBS_DEPENDENCY=../libmu_auth/libmu_auth.la
dnl Check for arguments
AC_ARG_ENABLE([pam],
......@@ -1216,7 +1216,6 @@ status_sendmail=$mu_cv_enable_sendmail
dnl Output Makefiles
AC_CONFIG_FILES([Makefile
sql/Makefile
auth/Makefile
comsat/Makefile
config/Makefile
doc/Makefile
......@@ -1238,8 +1237,13 @@ AC_CONFIG_FILES([Makefile
include/mailutils/Makefile
include/mailutils/sys/Makefile
lib/Makefile
libmu_argp/Makefile
libmu_auth/Makefile
libmu_cfg/Makefile
libmu_cpp/Makefile
libmu_scm/Makefile
libmu_sieve/Makefile
libmu_sieve/extensions/Makefile
libproto/Makefile
libproto/mbox/Makefile
libproto/mh/Makefile
......@@ -1250,10 +1254,6 @@ AC_CONFIG_FILES([Makefile
libproto/imap/Makefile
libproto/include/Makefile
libproto/remote/Makefile
libsieve/Makefile
libsieve/extensions/Makefile
libargp/Makefile
libcfg/Makefile
maidag/Makefile
mail/Makefile
mail/testsuite/Makefile
......
%%comments:
Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2009 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.2 or
......@@ -12,8 +12,8 @@ Texts. A copy of the license is included in the file COPYING.
%%short-description: A set of libraries and programs for handling e-mail messages.
%%full-description:
GNU mailutils is a collection of mail-related utilities. At the
core of mailutils is libmailbox, a library which provides access
GNU Mailutils is a collection of mail-related utilities. At the
core of mailutils is libmailutils, a library which provides access
to various forms of mailbox files (including remote mailboxes via
popular protocols). It also provides support for parsing of RFC-2822
style messages and MIME support. The utilities, provided by
......@@ -26,11 +26,9 @@ Texts. A copy of the license is included in the file COPYING.
%%license: GPL
%%maintainer:
Jeff Bailey <jbailey@nisa.net>,
Alain Magloire <alainm@gnu.org>,
Sergey Poznyakoff <gray@Mirddin.farlep.net>
Sergey Poznyakoff <gray@gnu.org.ua>
%%updated: 5 Jul 2006
%%updated: 14 Feb 2009
%%keywords: mail, email, pop3, imap4, sieve, comsat, smtp, mh, maildir, movemail
......@@ -53,25 +51,24 @@ Texts. A copy of the license is included in the file COPYING.
Jeff Bailey <jbailey@gnu.org>,
Sam Roberts <sroberts@uniserve.com>,
Sean 'Shaleh' Perry <shaleh@debian.org>,
Sergey Poznyakoff <gray@Mirddin.farlep.net>,
Sergey Poznyakoff <gray@gnu.org.ua>,
Wojciech Polak <polak@gnu.org>
%%source-tarball: ftp://ftp.gnu.org/pub/gnu/mailutils/mailutils-1.0.tar.gz
%%source-tarball: ftp://ftp.gnu.org/pub/gnu/mailutils/mailutils-2.0.tar.gz
%%source-info: http://savannah.gnu.org/projects/mailutils
%%repository:
:pserver:anonymous@cvs.savannah.gnu.org:/cvsroot/mailutils co mailutils,
http://savannah.gnu.org/cvs/?group_id=36,
http://savannah.gnu.org/cgi-bin/viewcvs/mailutils/mailutils,
git clone git://git.savannah.gnu.org/mailutils.git,
http://savannah.gnu.org/git/?group=mailutils,
http://git.savannah.gnu.org/gitweb/?p=mailutils.git
%%source-language: C
%%weak-prerequisites: Guile 1.6.7, Libtool 1.4.2, GSASL 0.2.3, GnuTLS 1.0.18
%%version: 1.0 released on 07 Dec 2006
%%version: 2.0 released on 26 Dec 2008
%%bug-list: bug-mailutils@gnu.org bug-mailutils@gnu.org http://mail.gnu.org/mailman/listinfo/bug-mailutils
%%bug-list: bug-mailutils@gnu.org bug-mailutils@gnu.org http://lists.gnu.org/mailman/listinfo/bug-mailutils
%%entry-written-by: Sergey Poznyakoff <gray@gnu.org>
......
## Process this file with GNU Automake to create Makefile.in
## Copyright (C) 2001, 2002, 2003, 2004, 2006,
## 2007 Free Software Foundation, Inc.
## 2007, 2009 Free Software Foundation, Inc.
##
## GNU Mailutils is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
......@@ -46,8 +46,8 @@ mailutils_TEXINFOS = \
imap4.texi\
iterator.texi\
libmu_scm.texi\
libmuauth.texi\
libsieve.texi\
libmu_auth.texi\
libmu_sieve.texi\
locker.texi\
mailbox.texi\
mailcap.texi\
......
@c This is part of the GNU Mailutils manual.
@c Copyright (C) 1999,2000,2001,2002,2003,2004,
@c 2007 Free Software Foundation, Inc.
@c 2007,2009 Free Software Foundation, Inc.
@c See file mailutils.texi for copying conditions.
@comment *******************************************************************
The functions from @file{libmailbox} library get user information from
the system user database. The library @file{libmuauth} extends this
functionality, allowing @file{libmailbox} functions to obtain
The functions from @file{libmailutils} library get user information from
the system user database. The library @file{libmu_auth} extends this
functionality, allowing @file{libmailutils} functions to obtain
information about a user from several places, like @sc{sql} database,
etc. The method used is described in detail in @ref{Auth Statement,
authentication}. This chapter contains a very succinct description of
......@@ -14,16 +14,16 @@ the underlying library mechanism.
@menu
* Data Types::
* Initializing libmuauth::
* Initializing libmu_auth::
* Module Creation and Destruction::
* Obtaining Authorization Information::
* Existing Modules::
* Using libmuauth in Your Programs::
* Using libmu_auth in Your Programs::
@end menu
@node Data Types
@subsection Data Types
@cindex libmuauth, data types
@cindex libmu_auth, data types
@deftp {Data Type} mu_auth_fp
......@@ -98,7 +98,7 @@ struct mu_auth_data @{
@deftp {Data Type} mu_auth_module
The @code{mu_auth_module} structure contains full information about a
libmuauth module. It is declared as follows:
libmu_auth module. It is declared as follows:
@smallexample
@group
......@@ -116,12 +116,12 @@ struct mu_auth_module @{
@end smallexample
@end deftp
@node Initializing libmuauth
@subsection Initializing @file{libmuauth}
@node Initializing libmu_auth
@subsection Initializing @file{libmu_auth}
@deftypefun void mu_auth_init (void)
This function registers the command line capability ``auth''. It must be
called after registering @file{libmuauth} modules and before calling
called after registering @file{libmu_auth} modules and before calling
@code{mu_agrp_parse()}. If an error occurs, this function prints
diagnostic message and aborts the program.
@end deftypefun
......@@ -150,7 +150,7 @@ Register the module defined by the @var{mod} argument.
@node Obtaining Authorization Information
@subsection Obtaining Authorization Information
@cindex libmuauth, obtaining authorization information
@cindex libmu_auth, obtaining authorization information
@deftypefun int mu_auth_runlist (list_t @var{flist}, struct mu_auth_data **@var{return_data}, void *@var{key}, void *@var{call_data});
The list is expected to contain @code{mu_auth_fp} pointers. Each of them
......@@ -183,20 +183,20 @@ Authenticate the user whose data are in @var{auth_data} using password
@node Existing Modules
@subsection Existing Modules
@cindex libmuauth modules
@cindex libmu_auth modules
@deftypefun int mu_auth_nosupport (struct mu_auth_data **@var{return_data}, void *@var{key}, void *@var{func_data}, void *@var{call_data});
The ``not-supported'' module. Always returns @code{ENOSYS}.
@end deftypefun
@defvar mu_auth_system_module
This module is always registered even if @file{libmuauth} is not linked.
This module is always registered even if @file{libmu_auth} is not linked.
It performs usual authentication using system user database
(@file{/etc/password} et al.)
@end defvar
@defvar mu_auth_generic_module
This module is always registered even if @file{libmuauth} is not linked.
This module is always registered even if @file{libmu_auth} is not linked.
Both its authorization handlers are @code{mu_auth_nosupport}. Its
authentication handler computes the MD5 or DES hash over the supplied
password with the seed taken from @code{passwd} member of its @var{key}
......@@ -228,13 +228,13 @@ module.
@end defvar
@node Using libmuauth in Your Programs
@subsection Using @file{libmuauth} in Your Programs
@cindex Using @file{libmuauth}
@cindex Linking with @file{libmuauth}
@cindex libmuauth, linking with
@node Using libmu_auth in Your Programs
@subsection Using @file{libmu_auth} in Your Programs
@cindex Using @file{libmu_auth}
@cindex Linking with @file{libmu_auth}
@cindex libmu_auth, linking with
To link your program against @file{libmuauth}, obtain loader arguments
To link your program against @file{libmu_auth}, obtain loader arguments
by running @command{mailutils-config} as follows:
@smallexample
......
@c This is part of the GNU Mailutils manual.
@c Copyright (C) 1999,2000,2001,2002,2003,2004,2006,
@c 2007 Free Software Foundation, Inc.
@c 2007,2009 Free Software Foundation, Inc.
@c See file mailutils.texi for copying conditions.
@comment *******************************************************************
@code{Libsieve} is GNU implementation of the mail filtering
@code{Libmu_sieve} is GNU implementation of the mail filtering
language Sieve. The library is built around a @dfn{Sieve Machine} --- an
abstract computer constructed specially to handle mail filtering tasks.
This computer has two registers: program counter and numeric accumulator;
......@@ -13,7 +13,7 @@ functions is provided for creating and destroying instances of Sieve
Machine, manipulating its internal data, compiling and executing a
sieve program.
The following is a typical scenario of using @code{libsieve}:
The following is a typical scenario of using @code{libmu_sieve}:
@enumerate
@item Application program creates the instance of sieve machine.
......@@ -664,7 +664,7 @@ Dump the disassembled code of the sieve machine @var{mach}.
@subsection Writing Loadable Commands
This section contains an example of how to write external loadable
commands for GNU libsieve.
commands for GNU libmu_sieve.
@smallexample
@include numaddr.inc
......
......@@ -337,10 +337,10 @@ Major differences between Mailutils MH and other MH implementations
Mailutils Libraries
* libmailbox:: The Core Library.
* libmuauth:: Auxiliary Library for Authenticating Users.
* libmailutils:: The Core Library.
* libmu_auth:: Auxiliary Library for Authenticating Users.
* libmu_scm:: Mailutils to Scheme Interface.
* libsieve:: GNU Implementation of Sieve Mail Filtering.
* libmu_sieve:: GNU Implementation of Sieve Mail Filtering.
Framework
......@@ -364,11 +364,11 @@ Framework
Authentication Library
* Data Types::
* Initializing libmuauth::
* Initializing libmu_auth::
* Module Creation and Destruction::
* Obtaining Authorization Information::
* Existing Modules::
* Using libmuauth in Your Programs::
* Using libmu_auth in Your Programs::
Mailutils to Scheme Interface
......@@ -521,22 +521,22 @@ automatically as soon as it is compiled against the new library.
@cindex Libraries
@menu
* libmailbox:: The Core Library.
* libmuauth:: Auxiliary Library for Authenticating Users.
* libmailutils:: The Core Library.
* libmu_auth:: Auxiliary Library for Authenticating Users.
* libmu_scm:: Mailutils to Scheme Interface.
* libsieve:: GNU Implementation of Sieve Mail Filtering.
* libmu_sieve:: GNU Implementation of Sieve Mail Filtering.
@end menu
@node libmailbox
@node libmailutils
@section Framework
@cindex Framework
@include framework.texi
@node libmuauth
@node libmu_auth
@section Authentication Library
@cindex Authentication Library
@cindex libmuauth
@include libmuauth.texi
@cindex libmu_auth
@include libmu_auth.texi
@node libmu_scm
@section Mailutils to Scheme Interface
......@@ -544,11 +544,11 @@ automatically as soon as it is compiled against the new library.
@cindex libmu_scm
@include libmu_scm.texi
@node libsieve
@node libmu_sieve
@section Sieve Library
@cindex Sieve Library
@cindex libsieve
@include libsieve.texi
@cindex libmu_sieve
@include libmu_sieve.texi
@node Sieve Language
@chapter Sieve Language
......
......@@ -6679,7 +6679,7 @@ $B(,5)\
@pindex mailutils-config
This program is designed for developers wishing to link their programs
against libmailbox. It allows to examine the particulars of the
against libmailutils. It allows to examine the particulars of the
current build of Mailutils and to get the command line parameters
necessary for compiling and linking an application with Mailutils
libraries.
......@@ -6710,14 +6710,14 @@ standard output the loader flags necessary to link a program against
Mailutils libraries.
When invoked without arguments, it produces the flags necessary to
link against the basic library of Mailutils: @file{libmailbox}.
link against the basic library of Mailutils: @file{libmailutils}.
Arguments may be given that alter this behavior. These are:
@table @samp
@item auth
Print flags to link against @file{libmuauth}, the library adding new
authentication methods to @file{libmailbox}.
Print flags to link against @file{libmu_auth}, the library adding new
authentication methods to @file{libmailutils}.
@item guile
Print flags to link against @file{libmu_scm}, the Guile interface
......
......@@ -131,7 +131,7 @@ text:
This results in the contents of file @file{myresponse.txt} being read
and interpreted as the contents of the multiline string.
GNU libsieve extends the described syntax as follows. If the keyword
GNU libmu_sieve extends the described syntax as follows. If the keyword
@code{text:} is immediately followed by a dash (@samp{-}), then all
leading tab characters are stripped from input lines and the line
containing delimiter (@samp{.}). This allows multiline strings within
......@@ -460,7 +460,7 @@ require "fileinto";
require "comparator-i;ascii-numeric";
@end smallexample
When processing arguments for @code{require} statement, GNU libsieve
When processing arguments for @code{require} statement, GNU libmu_sieve
uses the following algorithm:
@enumerate 1
......@@ -504,7 +504,7 @@ The value of @env{LTDL_LIBRARY_PATH} and @env{LD_LIBRARY_PATH} must be a
colon-separated list of absolute directories, for example,
@samp{"/usr/lib/mypkg:/lib/foo"}.
In any of these directories, @command{libsieve} first attempts to find
In any of these directories, @command{libmu_sieve} first attempts to find
and load the given filename. If this fails, it tries to append the
following suffixes to the file name:
......@@ -515,13 +515,13 @@ following suffixes to the file name:
platform, e.g., @samp{.so}, @samp{.sl}, etc.
@end enumerate
@item If the module is found, @command{libsieve} executes its
@item If the module is found, @command{libmu_sieve} executes its
initialization function (see below) and again looks up the name
in the symbol table. If found, search terminates successfully.
@item If either the module is not found, or the symbol wasn't
found after execution of the module initialization function,
search is terminated with an error status. @command{libsieve} then
search is terminated with an error status. @command{libmu_sieve} then
issues the following diagnostic message:
@smallexample
......@@ -533,7 +533,7 @@ source for the required action NAME is not available
@section Comparators
@cindex comparator, sieve
GNU libsieve supports the following built-in comparators:
GNU libmu_sieve supports the following built-in comparators:
@table @code
@item i;octet
......@@ -553,7 +553,7 @@ be explicitly required prior to use.
@section Tests
@cindex test, sieve
This section describes the built-in tests supported by GNU libsieve.
This section describes the built-in tests supported by GNU libmu_sieve.
In the discussion below the following macro-notations are used:
@table @var
......@@ -1130,7 +1130,7 @@ loadable modules that can be linked in at run time using the
@node Built-in Actions
@subsection Built-in Actions
The GNU libsieve supports the following built-in actions:
The GNU libmu_sieve supports the following built-in actions:
@itemize
@item stop
......@@ -1510,7 +1510,7 @@ This section summarizes the GNU extensions to the sieve language
@enumerate 1
@item Multiline strings syntax
GNU libsieve understands the following multiline string syntax:
GNU libmu_sieve understands the following multiline string syntax:
@smallexample
@group
......
......@@ -40,7 +40,7 @@
#endif
#include <stdlib.h>
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
struct val_ctr { /* Data passed to the counter function */
mu_header_t hdr; /* Headers of the current message */
......
......@@ -58,7 +58,6 @@ pkginclude_HEADERS = \
ldap.h\
libargp.h\
libcfg.h\
libsieve.h\
list.h\
locker.h\
mailbox.h\
......@@ -85,6 +84,7 @@ pkginclude_HEADERS = \
registrar.h\
sha1.h\
server.h\
sieve.h\
stream.h\
syslog.h\
sql.h\
......
......@@ -34,7 +34,7 @@
#include <mailutils/header.h>
#include <mailutils/iterator.h>
#include <mailutils/kwd.h>
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
#include <mailutils/list.h>
#include <mailutils/locker.h>
#include <mailutils/mailbox.h>
......
# This file is part of GNU Mailutils
# Copyright (C) 2007 Free Software Foundation, Inc.
# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
#
# GNU Mailutils is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
......@@ -22,9 +22,9 @@ AM_CPPFLAGS = \
-DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
-DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
lib_LIBRARIES = libmuargp.a
lib_LIBRARIES = libmu_argp.a
libmuargp_a_SOURCES =\
libmu_argp_a_SOURCES =\
auth.c\
cmdline.c\
cmdline.h\
......
......@@ -31,7 +31,7 @@
#ifdef WITH_GSASL
# include "mailutils/gsasl.h"
#endif
#include "mailutils/libsieve.h"
#include "mailutils/sieve.h"
#ifndef MU_COMPAT_CONFIG_FILE
# define MU_COMPAT_CONFIG_FILE SYSCONFDIR "/mailutils.rc"
......
......@@ -21,7 +21,7 @@
# include <config.h>
#endif
#include "cmdline.h"
#include "mailutils/libsieve.h"
#include "mailutils/sieve.h"
enum {
OPT_CLEAR_INCLUDE_PATH = 256,
......
......@@ -21,9 +21,9 @@ INCLUDES = @MU_COMMON_INCLUDES@
AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
-DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
lib_LTLIBRARIES = libmuauth.la
lib_LTLIBRARIES = libmu_auth.la
libmuauth_la_SOURCES = \
libmu_auth_la_SOURCES = \
gsasl.c\
lbuf.c\
lbuf.h\
......@@ -35,6 +35,6 @@ libmuauth_la_SOURCES = \
tls.c\
virtual.c
libmuauth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@
libmuauth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
libmuauth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@
libmu_auth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@
libmu_auth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
libmu_auth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@
......
# This file is part of GNU Mailutils
# Copyright (C) 2007 Free Software Foundation, Inc.
# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
#
# GNU Mailutils is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
......@@ -20,8 +20,8 @@ INCLUDES = @MU_COMMON_INCLUDES@
AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
-DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
lib_LTLIBRARIES = libmucfg.la
libmucfg_la_SOURCES=\
lib_LTLIBRARIES = libmu_cfg.la
libmu_cfg_la_SOURCES=\
acl.c\
auth.c\
common.c\
......
......@@ -20,7 +20,7 @@
#endif
#include <stdlib.h>
#include "mailutils/libcfg.h"
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
static struct mu_gocs_sieve sieve_settings;
......
;;;; -*- scheme -*-
;;;; GNU Mailutils -- a suite of utilities for electronic mail
;;;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
;;;; Copyright (C) 2002,2003,2004,2006,2007,2009 Free Software Foundation, Inc.
;;;;
;;;; GNU Mailutils is free software; you can redistribute it and/or modify
;;;; it under the terms of the GNU General Public License as published by
......@@ -25,7 +25,7 @@ changequote([,])dnl
(list "SITEDIR/guile-procedures.txt")))
(define mu-libs (list "libmailutils"
"libmuauth"
"libmu_auth"
"libmu_mbox"
"libmu_mh"
"libmu_maildir"
......
## Process this file with GNU Automake to create Makefile.in
## Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
## Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009
## Free Software Foundation, Inc.
##
## GNU Mailutils is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
......@@ -25,9 +26,9 @@ AM_CPPFLAGS = -DSIEVE_MODDIR=\"@SIEVE_MODDIR@\"
SUBDIRS = . extensions
lib_LTLIBRARIES = libsieve.la
lib_LTLIBRARIES = libmu_sieve.la
libsieve_la_SOURCES = \
libmu_sieve_la_SOURCES = \
actions.c\
conf.c\
comparator.c\
......@@ -42,10 +43,10 @@ libsieve_la_SOURCES = \
sieve-lex.c\
tests.c\
util.c
libsieve_la_LIBADD = ${MU_LIB_MAILUTILS} @LTDL_LIB@
libsieve_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
libmu_sieve_la_LIBADD = ${MU_LIB_MAILUTILS} @LTDL_LIB@
libmu_sieve_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
noinst_HEADERS = sieve.h
noinst_HEADERS = sieve-priv.h
BUILT_SOURCES = \
sieve-gram.c sieve-gram.h \
......@@ -67,9 +68,9 @@ sieve-gram.c sieve-gram.h: $(srcdir)/sieve.y
CFLOW_FLAGS=-i^s --brief -v
libsieve_CFLOW_INPUT=$(libsieve_la_OBJECTS:.lo=.c)
libsieve.cflow: $(libsieve_CFLOW_INPUT) Makefile
libmu_sieve_CFLOW_INPUT=$(libmu_sieve_la_OBJECTS:.lo=.c)
libmu_sieve.cflow: $(libmu_sieve_CFLOW_INPUT) Makefile
cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) \
$(libsieve_CFLOW_INPUT)
$(libmu_sieve_CFLOW_INPUT)
......
......@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <sieve.h>
#include <sieve-priv.h>
static int
sieve_mark_deleted (mu_message_t msg, int deleted)
......
......@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <sieve.h>
#include <sieve-priv.h>
#include <fnmatch.h>
#include <regex.h>
#include <ctype.h>
......
......@@ -20,7 +20,7 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <sieve.h>
#include <sieve-priv.h>
#include <string.h>
mu_list_t mu_sieve_include_path = NULL;
......
## Process this file with GNU Automake to create Makefile.in
## Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
## Copyright (C) 2004, 2005, 2006, 2007, 2009
## Free Software Foundation, Inc.
##
## GNU Mailutils is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
......@@ -31,25 +32,25 @@ INCLUDES = @MU_COMMON_INCLUDES@
AM_LDFLAGS = ../../lib/libmuaux.la ${MU_LIB_MAILUTILS}
list_la_SOURCES = list.c
list_la_LIBADD = ../libsieve.la
list_la_LIBADD = ../libmu_sieve.la
list_la_LDFLAGS = -module -avoid-version -no-undefined
moderator_la_SOURCES = moderator.c
moderator_la_LIBADD = ../libsieve.la
moderator_la_LIBADD = ../libmu_sieve.la
moderator_la_LDFLAGS = -module -avoid-version -no-undefined
spamd_la_SOURCES = spamd.c
spamd_la_LIBADD = ../libsieve.la
spamd_la_LIBADD = ../libmu_sieve.la
spamd_la_LDFLAGS = -module -avoid-version -no-undefined
timestamp_la_SOURCES = timestamp.c
timestamp_la_LIBADD = ../libsieve.la
timestamp_la_LIBADD = ../libmu_sieve.la
timestamp_la_LDFLAGS = -module -avoid-version -no-undefined
vacation_la_SOURCES = vacation.c
vacation_la_LIBADD = ../libsieve.la
vacation_la_LIBADD = ../libmu_sieve.la
vacation_la_LDFLAGS = -module -avoid-version -no-undefined
pipe_la_SOURCES = pipe.c
pipe_la_LIBADD = ../libsieve.la
pipe_la_LIBADD = ../libmu_sieve.la
pipe_la_LDFLAGS = -module -avoid-version -no-undefined
......
......@@ -26,7 +26,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
......
......@@ -63,7 +63,7 @@
#endif
#include <unistd.h>
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
#include <stdlib.h>
static int
......
......@@ -40,7 +40,7 @@
#include <signal.h>
#include <regex.h>
#include <mu_dbm.h>
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
#define ASSERT(expr, diag, ec) \
if (!(expr)) \
......
......@@ -30,7 +30,7 @@
#include <sys/un.h>
#include <string.h>
#include <signal.h>
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
#include <mailutils/mu_auth.h>
#include <mailutils/nls.h>
......
......@@ -44,7 +44,7 @@
#endif
#include <stdlib.h>
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
/* Handler for the timestamp test */
static int
......
......@@ -37,7 +37,7 @@
#include <signal.h>
#include <regex.h>
#include <mu_dbm.h>
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
#include <mailutils/mu_auth.h>
/* Build a mime response message from original message MSG. TEXT
......
......@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <sieve.h>
#include <sieve-priv.h>
#include <ltdl.h>
#include <ctype.h>
......@@ -153,7 +153,7 @@ mu_sv_load_add_dir (mu_sieve_machine_t mach, const char *name)
}
#else
#include <sieve.h>
#include <sieve-priv.h>
int
mu_sieve_load_ext (mu_sieve_machine_t mach, const char *name)
......
......@@ -23,7 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <sieve.h>
#include <sieve-priv.h>
int
mu_sv_code (sieve_op_t *op)
......
......@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <sieve.h>
#include <sieve-priv.h>
static mu_sieve_register_t *
reg_lookup (mu_list_t list, const char *name)
......
......@@ -22,7 +22,7 @@
#include <unistd.h>
#include <string.h>
#include <sieve.h>
#include <sieve-priv.h>
#define CAT2(a,b) a##b
#define CAT3(a,b,c) a##b##c
......
......@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <sieve.h>
#include <sieve-priv.h>
void
mu_sieve_require (mu_list_t slist)
......
......@@ -23,7 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <sieve.h>
#include <sieve-priv.h>
#define SIEVE_ARG(m,n,t) ((m)->prog[(m)->pc+(n)].t)
#define SIEVE_ADJUST(m,n) (m)->pc+=(n)
......
......@@ -17,7 +17,7 @@
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA */
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
#include <mu_asprintf.h>
#include <setjmp.h>
#include <string.h>
......
......@@ -31,7 +31,7 @@
#include <string.h>
#include <ctype.h>
#include <mailutils/argcv.h>
#include <sieve.h>
#include <sieve-priv.h>
#include <sieve-gram.h>
mu_sieve_locus_t mu_sieve_locus;
......
......@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <sieve.h>
#include <sieve-priv.h>
mu_sieve_machine_t mu_sieve_machine;
int mu_sieve_error_count;
......
......@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <sieve.h>
#include <sieve-priv.h>
typedef int (*address_aget_t) (mu_address_t addr, size_t no, char **buf);
......
......@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <sieve.h>
#include <sieve-priv.h>
void *
mu_sieve_alloc (size_t size)
......
......@@ -80,7 +80,7 @@
#include <mailutils/stream.h>
#include <mailutils/url.h>
#include <mailutils/mu_auth.h>
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
#include <mailutils/nls.h>
#include <mailutils/daemon.h>
#include <mailutils/acl.h>
......
......@@ -145,8 +145,8 @@ dbm_retrieve_quota (char *name, mu_off_t *quota)
#ifdef USE_SQL
#include <mailutils/sql.h>
/* FIXME: defined in auth/sql.c */
#include <auth/sql.h>
/* FIXME: defined in libmu_auth/sql.c */
#include <libmu_auth/sql.h>
int
sql_retrieve_quota (char *name, mu_off_t *quota)
......
......@@ -81,7 +81,7 @@
#include <mailutils/stream.h>
#include <mailutils/url.h>
#include <mailutils/mu_auth.h>
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
#include <mailutils/nls.h>
#include <mu_dbm.h>
......
......@@ -145,8 +145,8 @@ dbm_retrieve_quota (char *name, mu_off_t *quota)
#ifdef USE_SQL
#include <mailutils/sql.h>
/* FIXME: defined in auth/sql.c */
#include <auth/sql.h>
/* FIXME: defined in libmu_auth/sql.c */
#include <libmu_auth/sql.h>
int
sql_retrieve_quota (char *name, mu_off_t *quota)
......
......@@ -161,6 +161,8 @@ mu_registrar_lookup_url (mu_url_t url, int flags,
mu_record_t *precord, int *pflags)
{
mu_iterator_t iterator;
mu_record_t last_record = NULL;
int last_flags = 0;
int status = mu_registrar_get_iterator (&iterator);
if (status != 0)
return status;
......@@ -173,20 +175,33 @@ mu_registrar_lookup_url (mu_url_t url, int flags,
mu_iterator_current (iterator, (void **)&record);
if ((rc = mu_record_is_scheme (record, url, flags)))
{
status = 0;
if (precord)
*precord = record;
if (pflags)
*pflags = rc;
break;
if (rc == flags)
{
status = 0;
last_record = record;
last_flags = rc;
break;
}
else if (rc > last_flags)
{
status = 0;
last_record = record;
last_flags = rc;
}
}
}
mu_iterator_destroy (&iterator);
if (status &&
/*s FIXME: This check is not enough. */
!mu_is_proto (mu_url_to_string (url))
&& mu_registrar_get_default_record (precord) == 0)
if (status == 0)
{
if (precord)
*precord = last_record;
if (pflags)
*pflags = last_flags;
}
else if (!mu_is_proto (mu_url_to_string (url)) /* FIXME: This check is not
enough. */
&& mu_registrar_get_default_record (precord) == 0)
{
status = 0;
if (pflags)
......
#
# List of source files containing translatable strings.
# Copyright (C) 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
# Copyright (C) 2002,2003,2004,2005,2008,2009 Free Software Foundation, Inc.
#
auth/ldap.c
auth/radius.c
auth/sql.c
auth/tls.c
comsat/action.c
comsat/oldcfg.c
comsat/comsat.c
......@@ -44,56 +39,58 @@ lib/tcpwrap.c
lib/xmalloc.c
lib/strexit.c
libargp/auth.c
libargp/cmdline.c
libargp/common.c
libargp/compat.c
libargp/gsasl.c
libargp/mu_argp.c
libargp/pam.c
libargp/radius.c
libargp/sieve.c
libargp/sql.c
libargp/tls.c
libargp/virtdomain.c
libcfg/acl.c
libcfg/auth.c
libcfg/common.c
libcfg/gsasl.c
libcfg/init.c
libcfg/ldap.c
libcfg/pam.c
libcfg/radius.c
libcfg/sieve.c
libcfg/sql.c
libcfg/tls.c
libcfg/virtdomain.c
libmu_argp/auth.c
libmu_argp/cmdline.c
libmu_argp/common.c
libmu_argp/compat.c
libmu_argp/gsasl.c
libmu_argp/mu_argp.c
libmu_argp/pam.c
libmu_argp/radius.c
libmu_argp/sieve.c
libmu_argp/sql.c
libmu_argp/tls.c
libmu_argp/virtdomain.c
libmu_auth/ldap.c
libmu_auth/radius.c
libmu_auth/sql.c
libmu_auth/tls.c
libmu_cfg/acl.c
libmu_cfg/auth.c
libmu_cfg/common.c
libmu_cfg/gsasl.c
libmu_cfg/init.c
libmu_cfg/ldap.c
libmu_cfg/pam.c
libmu_cfg/radius.c
libmu_cfg/sieve.c
libmu_cfg/sql.c
libmu_cfg/tls.c
libmu_cfg/virtdomain.c
libmu_sieve/actions.c
libmu_sieve/comparator.c
libmu_sieve/conf.c
libmu_sieve/prog.c
libmu_sieve/relational.c
libmu_sieve/require.c
libmu_sieve/runtime.c
libmu_sieve/sieve.l
libmu_sieve/sieve.y
libmu_sieve/tests.c
libmu_sieve/util.c
libmu_sieve/extensions/list.c
libmu_sieve/extensions/moderator.c
libmu_sieve/extensions/spamd.c
libmu_sieve/extensions/timestamp.c
libmu_sieve/extensions/vacation.c
libproto/imap/folder.c
libproto/mbox/mbox.c
libsieve/actions.c
libsieve/comparator.c
libsieve/extensions/list.c
libsieve/extensions/moderator.c
libsieve/extensions/spamd.c
libsieve/extensions/timestamp.c
libsieve/extensions/vacation.c
libsieve/actions.c
libsieve/comparator.c
libsieve/conf.c
libsieve/prog.c
libsieve/relational.c
libsieve/require.c
libsieve/runtime.c
libsieve/sieve.l
libsieve/sieve.y
libsieve/tests.c
libsieve/util.c
maidag/maidag.c
maidag/deliver.c
maidag/lmtp.c
......
......@@ -34,7 +34,7 @@
#include <mu_asprintf.h>
#include <mailutils/argcv.h>
#include <mailutils/libsieve.h>
#include <mailutils/sieve.h>
#include <mailutils/auth.h>
#include <mailutils/errno.h>
#include <mailutils/folder.h>
......