diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2006-06-30 15:03:24 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2006-06-30 15:03:24 +0000 |
commit | f41c2cbd210a989e5de01c18446c61a464904e10 (patch) | |
tree | b0406c28148bce94844518e8cee7b69d740c7533 | |
parent | cece453761eb1c867dc64c334c4370fd4501843a (diff) | |
download | mailfromd-f41c2cbd210a989e5de01c18446c61a464904e10.tar.gz mailfromd-f41c2cbd210a989e5de01c18446c61a464904e10.tar.bz2 |
Updatev_1_0
git-svn-id: file:///svnroot/mailfromd/branches/v_1_0@245 7a8a7f39-df28-0410-adc6-e0d955640f24
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | doc/mailfromd.texi | 18 |
2 files changed, 22 insertions, 1 deletions
@@ -2,18 +2,21 @@ | |||
2 | 2 | ||
3 | * NEWS: Update | 3 | * NEWS: Update |
4 | * configure.ac: Raise version to 1.4.91 | 4 | * configure.ac: Raise version to 1.4.91 |
5 | (MAILUTILS_LIBS): Require auth | 5 | (MAILUTILS_LIBS): Require auth |
6 | * src/Makefile.am (mailfromd_SOURCES): Add func.c | 6 | * src/Makefile.am (mailfromd_SOURCES): Add func.c |
7 | * src/gram.y: Implement functions, function calls and new | 7 | * src/gram.y: Implement functions, function calls and new |
8 | conditional `validuser' | 8 | conditionals `validuser' and `dbmap' |
9 | * src/lex.l: Likewise | 9 | * src/lex.l: Likewise |
10 | * src/mailfrom.h (FUNCTION,LOCUS): New types. | 10 | * src/mailfrom.h (FUNCTION,LOCUS): New types. |
11 | (node_type): New types node_type_funcall and node_type_validuser | 11 | (node_type): New types node_type_funcall and node_type_validuser |
12 | (parse_error_locus): New function | 12 | (parse_error_locus): New function |
13 | (function_lookup,function_install): New function | 13 | (function_lookup,function_install): New function |
14 | (node_type): New type node_type_dbmap | ||
15 | (struct dbmap_node): New data type | ||
16 | (struct node): New member `map'. | ||
14 | * src/main.c: Use enum instead of defines for long option codes. | 17 | * src/main.c: Use enum instead of defines for long option codes. |
15 | New options: --dump-grammar-trace, --dump-lex-trace and | 18 | New options: --dump-grammar-trace, --dump-lex-trace and |
16 | --dump-tree. | 19 | --dump-tree. |
17 | (capa): Use "auth" capability | 20 | (capa): Use "auth" capability |
18 | (main): Call MU_AUTH_REGISTER_ALL_MODULES | 21 | (main): Call MU_AUTH_REGISTER_ALL_MODULES |
19 | * doc/mailfromd.texi: Update | 22 | * doc/mailfromd.texi: Update |
diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi index 51be5e3a..b9629c68 100644 --- a/doc/mailfromd.texi +++ b/doc/mailfromd.texi | |||
@@ -744,12 +744,30 @@ variable to @command{mailfromd} (@pxref{Sendmail Configuration}). | |||
744 | @anchor{Expressions} | 744 | @anchor{Expressions} |
745 | Expressions operate on atoms and return literal values. Think of | 745 | Expressions operate on atoms and return literal values. Think of |
746 | them as of functions in programming languages. Currently the following | 746 | them as of functions in programming languages. Currently the following |
747 | expressions are implemented: | 747 | expressions are implemented: |
748 | 748 | ||
749 | @table @code | 749 | @table @code |
750 | @item dbmap @var{file} @var{atom} | ||
751 | @var{file} should be a literal string, @var{atom} an arbitrary | ||
752 | atom which evaluates to a valid string. This conditional returns | ||
753 | @code{true} if the key @var{atom} is present in the @acronym{DBM} file | ||
754 | @var{file}. If @var{atom} contains a @samp{@@} character, only the | ||
755 | part before this character will be used, thus allowing to check emails | ||
756 | against the aliases database: | ||
757 | |||
758 | @smallexample | ||
759 | @group | ||
760 | if not dbmap "/etc/mail/aliases" $f | ||
761 | @dots{} | ||
762 | fi | ||
763 | @end group | ||
764 | @end smallexample | ||
765 | |||
766 | Notice that @var{file} must not end in @samp{.db} suffix. | ||
767 | |||
750 | @item hostname @var{atom} | 768 | @item hostname @var{atom} |
751 | @cindex @code{hostname} | 769 | @cindex @code{hostname} |
752 | @var{atom} should be a string representing an IP address in | 770 | @var{atom} should be a string representing an IP address in |
753 | @samp{dotted-quad} notation. The result of this expression is the | 771 | @samp{dotted-quad} notation. The result of this expression is the |
754 | canonical name of host with this IP address obtained from DNS | 772 | canonical name of host with this IP address obtained from DNS |
755 | lookup. For example | 773 | lookup. For example |