From MAILER-DAEMON Fri Mar 04 02:31:54 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1PvPUQ-0006zO-9g
	for mharc-commit-mailutils@gnu.org; Fri, 04 Mar 2011 02:31:54 -0500
Received: from [140.186.70.92] (port=60786 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PvPUO-0006zD-QI
	for commit-mailutils@gnu.org; Fri, 04 Mar 2011 02:31:53 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PvPUN-0000VA-Pw
	for commit-mailutils@gnu.org; Fri, 04 Mar 2011 02:31:52 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:56544
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PvPUN-0000V6-Ms
	for commit-mailutils@gnu.org; Fri, 04 Mar 2011 02:31:51 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PvPUM-00037k-Tr
	for commit-mailutils@gnu.org; Fri, 04 Mar 2011 07:31:51 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PvPUM-0001cT-5c
	for commit-mailutils@gnu.org; Fri, 04 Mar 2011 07:31:50 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 42d2ff71265b62e778b89a035efb2be795ce8956
X-Git-Newrev: 776056e2e3e7529fc64ca30bf055646fd6f11a2a
Message-Id: <E1PvPUM-0001cT-5c@vcs-noshell.in.savannah.gnu.org>
Date: Fri, 04 Mar 2011 07:31:50 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-350-g776056e
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Mar 2011 07:31:53 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=776056e2e3e7529fc64ca30bf055646fd6f11a2a

The branch, master has been updated
       via  776056e2e3e7529fc64ca30bf055646fd6f11a2a (commit)
      from  42d2ff71265b62e778b89a035efb2be795ce8956 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 776056e2e3e7529fc64ca30bf055646fd6f11a2a
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Fri Mar 4 09:32:26 2011 +0200

    Bugfixes
    
    * libmailutils/server/acl.c (_run_entry): Fix log output.
    * mu/shell.c: Fix compilation without readline.

-----------------------------------------------------------------------

Summary of changes:
 libmailutils/server/acl.c |   10 +++-------
 mu/shell.c                |    3 ++-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/libmailutils/server/acl.c b/libmailutils/server/acl.c
index b7f508a..0b7a507 100644
--- a/libmailutils/server/acl.c
+++ b/libmailutils/server/acl.c
@@ -673,17 +673,13 @@ _run_entry (void *item, void *data)
 	    char *s;
 	    if (ent->arg && expand_arg (ent->arg, rp, &s) == 0)
 	      {
-		if (mu_debug_level_p (MU_DEBCAT_ACL, MU_DEBUG_TRACE9))
-		  mu_debug_log_end ("%s", s);
+		mu_diag_output (MU_DIAG_INFO, "%s", s);
 		free (s);
 	      }
 	    else
 	      {
-		if (mu_debug_level_p (MU_DEBCAT_ACL, MU_DEBUG_TRACE9))
-		  {
-		    debug_sockaddr (rp->sa, rp->salen);
-		    mu_debug_log_nl ();
-		  }
+	        debug_sockaddr (rp->sa, rp->salen);
+	        mu_debug_log_nl ();
 	      }
 	  }
 	  break;
diff --git a/mu/shell.c b/mu/shell.c
index 1112dc7..9baceb1 100644
--- a/mu/shell.c
+++ b/mu/shell.c
@@ -412,13 +412,14 @@ shell_history (int argc, char **argv)
 
 #else
 # define finish_readline()
-# define mutool_initialize_readline (const char *name)
+# define mutool_initialize_readline(name)
 
 char *
 readline (char *prompt)
 {
   static size_t size = 0;
   static char *buf = NULL;
+  size_t n;
 
   if (prompt)
     {


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Sat Mar 05 04:14:18 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1PvnZ4-0001yK-39
	for mharc-commit-mailutils@gnu.org; Sat, 05 Mar 2011 04:14:18 -0500
Received: from [140.186.70.92] (port=41412 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PvnYz-0001wO-Tk
	for commit-mailutils@gnu.org; Sat, 05 Mar 2011 04:14:16 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PvnYx-0004ZF-0H
	for commit-mailutils@gnu.org; Sat, 05 Mar 2011 04:14:13 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:54334
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PvnYw-0004Z9-U4
	for commit-mailutils@gnu.org; Sat, 05 Mar 2011 04:14:10 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PvnYw-0004Rz-8f
	for commit-mailutils@gnu.org; Sat, 05 Mar 2011 09:14:10 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PvnYv-0008HP-U5
	for commit-mailutils@gnu.org; Sat, 05 Mar 2011 09:14:10 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 776056e2e3e7529fc64ca30bf055646fd6f11a2a
X-Git-Newrev: 4dda9b21c67b6d03b852f57325cd0c88d266b463
Message-Id: <E1PvnYv-0008HP-U5@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 05 Mar 2011 09:14:09 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-352-g4dda9b2
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Mar 2011 09:14:17 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=4dda9b21c67b6d03b852f57325cd0c88d266b463

The branch, master has been updated
       via  4dda9b21c67b6d03b852f57325cd0c88d266b463 (commit)
       via  d19d346f9e9822aa541c4860483045ecf4bea336 (commit)
      from  776056e2e3e7529fc64ca30bf055646fd6f11a2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4dda9b21c67b6d03b852f57325cd0c88d266b463
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Sat Mar 5 11:07:24 2011 +0200

    Introduce "parser hints", to provide better control over configuration parsing.
    
    * include/mailutils/cfg.h (mu_cfg_parse_hints): New struct.
    (mu_cfg_tree_postprocess): Change signature.  Last argument is
    struct mu_cfg_parse_hints *.
    (MU_CFG_PARSE_SITE_RCFILE,MU_CFG_PARSE_CUSTOM_RCFILE)
    (MU_CFG_PARSE_PROGRAM): New flags.
    (mu_cfg_parse_config): New proto.
    * libmailutils/cfg/lexer.l (mu_get_config): Fix call to
    mu_cfg_tree_postprocess.
    
    * libmailutils/cfg/parser.y (do_include): Takes hints as 2nd argument.
    (mu_cfg_tree_postprocess): Likewise.
    (mu_cfg_parse_config): New function.
    
    * libmu_cfg/init.c (mu_libcfg_parse_config): Rewrite as a wrapper
    over mu_cfg_parse_config.
    * libmu_argp/muinit.c (mu_app_init): Update.
    
    * mu/query.c: New option --program.
    (mutool_query): Use mu_cfg_parse_config interface.

commit d19d346f9e9822aa541c4860483045ecf4bea336
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Fri Mar 4 12:12:09 2011 +0200

    mu: improve query interface.
    
    * include/mailutils/cfg.h (mu_cfg_node) <parent>: New member.
    (MU_CFG_FMT_VALUE_ONLY)
    (MU_CFG_FMT_PARAM_PATH): New flags.
    * libmailutils/cfg/format.c (format_path): New static.
    (format_node,format_node_end): Handle new flags.
    (mu_cfg_format_node): Clear MU_CFG_FMT_VALUE_ONLY if the
    requested node is mu_cfg_node_statement.
    * libmailutils/cfg/parser.y: Set node parents.
    (mu_cfg_find_node): Fix coredump.
    * mu/query.c: New options --value and --path.

-----------------------------------------------------------------------

Summary of changes:
 include/mailutils/cfg.h   |   31 +++-
 libmailutils/cfg/format.c |   72 +++++++---
 libmailutils/cfg/lexer.l  |    7 +-
 libmailutils/cfg/parser.y |  350 +++++++++++++++++++++++++++++----------------
 libmu_argp/muinit.c       |   10 +-
 libmu_cfg/init.c          |   71 ++--------
 mu/query.c                |   47 +++++--
 7 files changed, 362 insertions(+), 226 deletions(-)

diff --git a/include/mailutils/cfg.h b/include/mailutils/cfg.h
index e2f1584..a27eb5c 100644
--- a/include/mailutils/cfg.h
+++ b/include/mailutils/cfg.h
@@ -69,6 +69,15 @@ struct mu_cfg_node
   char *tag;
   mu_config_value_t *label;
   mu_list_t nodes;   /* a list of mu_cfg_node_t */
+  struct mu_cfg_node *parent; /* parent node */
+};
+
+struct mu_cfg_parse_hints
+{
+  int flags;
+  char *site_rcfile;
+  char *custom_rcfile;
+  char *program;
 };
 
 struct mu_cfg_tree
@@ -79,7 +88,8 @@ struct mu_cfg_tree
 
 int mu_cfg_parse (mu_cfg_tree_t **ptree);
 int mu_cfg_tree_union (mu_cfg_tree_t **pa, mu_cfg_tree_t **pb);
-int mu_cfg_tree_postprocess (mu_cfg_tree_t *tree, int flags);
+int mu_cfg_tree_postprocess (mu_cfg_tree_t *tree,
+			     struct mu_cfg_parse_hints *hints);
 
 extern struct mu_locus mu_cfg_locus;
 
@@ -230,10 +240,16 @@ int mu_config_register_plain_section (const char *parent_path,
 				      const char *ident,
 				      struct mu_cfg_param *params);
 
-#define MU_PARSE_CONFIG_GLOBAL  0x1
-#define MU_PARSE_CONFIG_VERBOSE 0x2
-#define MU_PARSE_CONFIG_DUMP    0x4
-#define MU_PARSE_CONFIG_PLAIN   0x8
+#define MU_PARSE_CONFIG_GLOBAL     0x001
+#define MU_PARSE_CONFIG_VERBOSE    0x002
+#define MU_PARSE_CONFIG_DUMP       0x004
+#define MU_PARSE_CONFIG_PLAIN      0x008
+#define MU_CFG_PARSE_SITE_RCFILE   0x010
+#define MU_CFG_PARSE_CUSTOM_RCFILE 0x020
+#define MU_CFG_PARSE_PROGRAM       0x040
+#define MU_CFG_FMT_LOCUS           0x080
+#define MU_CFG_FMT_VALUE_ONLY      0x100
+#define MU_CFG_FMT_PARAM_PATH      0x200
 
 #ifdef MU_CFG_COMPATIBILITY
 # define MU_CFG_DEPRECATED
@@ -250,8 +266,6 @@ int mu_cfg_parse_boolean (const char *str, int *res);
 extern int mu_cfg_parser_verbose;
 extern size_t mu_cfg_error_count;
 
-#define MU_CFG_FMT_LOCUS 0x01
-  
 void mu_cfg_format_docstring (mu_stream_t stream, const char *docstring,
 			      int level);
 void mu_cfg_format_parse_tree (mu_stream_t stream, struct mu_cfg_tree *tree,
@@ -292,6 +306,9 @@ int mu_cfg_find_node (mu_cfg_tree_t *tree, const char *path,
 		      mu_cfg_node_t **pnode);
 int mu_cfg_create_subtree (const char *path, mu_cfg_node_t **pnode);
 
+int mu_cfg_parse_config (mu_cfg_tree_t **ptree,
+			 struct mu_cfg_parse_hints *hints);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libmailutils/cfg/format.c b/libmailutils/cfg/format.c
index 03dc745..2faee80 100644
--- a/libmailutils/cfg/format.c
+++ b/libmailutils/cfg/format.c
@@ -129,6 +129,25 @@ format_value (struct tree_print *tp, mu_config_value_t *val)
     }
 }
 
+static void
+format_path (struct tree_print *tp, const mu_cfg_node_t *node, int delim)
+{
+  char c;
+  
+  if (node->parent)
+    format_path (tp, node->parent, MU_CFG_PATH_DELIM);
+
+  mu_stream_write (tp->stream, node->tag, strlen (node->tag), NULL);
+  if (node->type == mu_cfg_node_statement && node->label)
+    {
+      mu_stream_write (tp->stream, "=\"", 2, NULL);
+      format_value (tp, node->label);
+      mu_stream_write (tp->stream, "\"", 1, NULL);
+    }
+  c = delim;
+  mu_stream_write (tp->stream, &c, 1, NULL);
+}
+
 static int
 format_node (const mu_cfg_node_t *node, void *data)
 {
@@ -147,25 +166,39 @@ format_node (const mu_cfg_node_t *node, void *data)
       break;
 
     case mu_cfg_node_statement:
-      {
-	mu_stream_write (tp->stream, node->tag, strlen (node->tag), NULL);
-	if (node->label)
-	  {
-	    mu_stream_write (tp->stream, " ", 1, NULL);
-	    format_value (tp, node->label);
-	  }
-	mu_stream_write (tp->stream, " {", 2, NULL);
-	tp->level++;
-      }
+      if (tp->flags & MU_CFG_FMT_PARAM_PATH)
+	return MU_CFG_ITER_OK;
+      else
+	{
+	  mu_stream_write (tp->stream, node->tag, strlen (node->tag), NULL);
+	  if (node->label)
+	    {
+	      mu_stream_write (tp->stream, " ", 1, NULL);
+	      format_value (tp, node->label);
+	    }
+	  mu_stream_write (tp->stream, " {", 2, NULL);
+	  tp->level++;
+	}
       break;
 
     case mu_cfg_node_param:
-      mu_stream_write (tp->stream, node->tag, strlen (node->tag), NULL);
-      if (node->label)
+      if (tp->flags & MU_CFG_FMT_VALUE_ONLY)
+	format_value (tp, node->label);
+      else if (tp->flags & MU_CFG_FMT_PARAM_PATH)
 	{
+	  format_path (tp, node, ':');
 	  mu_stream_write (tp->stream, " ", 1, NULL);
 	  format_value (tp, node->label);
-	  mu_stream_write (tp->stream, ";", 1, NULL);
+	}
+      else
+	{
+	  mu_stream_write (tp->stream, node->tag, strlen (node->tag), NULL);
+	  if (node->label)
+	    {
+	      mu_stream_write (tp->stream, " ", 1, NULL);
+	      format_value (tp, node->label);
+	      mu_stream_write (tp->stream, ";", 1, NULL);
+	    }
 	}
       break;
     }
@@ -177,9 +210,12 @@ static int
 format_node_end (const mu_cfg_node_t *node, void *data)
 {
   struct tree_print *tp = data;
-  tp->level--;
-  format_level (tp->stream, tp->level);
-  mu_stream_write (tp->stream, "};\n", 3, NULL);
+  if (!(tp->flags & MU_CFG_FMT_PARAM_PATH))
+    {
+      tp->level--;
+      format_level (tp->stream, tp->level);
+      mu_stream_write (tp->stream, "};\n", 3, NULL);
+    }
   return MU_CFG_ITER_OK;
 }
 
@@ -205,7 +241,9 @@ void
 mu_cfg_format_node (mu_stream_t stream, const mu_cfg_node_t *node, int flags)
 {
   struct tree_print t;
-  
+
+  if (node->type == mu_cfg_node_statement)
+    flags &= ~MU_CFG_FMT_VALUE_ONLY;
   t.flags = flags;
   t.level = 0;
   t.stream = stream;
diff --git a/libmailutils/cfg/lexer.l b/libmailutils/cfg/lexer.l
index 4e3755e..9f2c719 100644
--- a/libmailutils/cfg/lexer.l
+++ b/libmailutils/cfg/lexer.l
@@ -387,7 +387,12 @@ mu_get_config (const char *file, const char *progname,
   int rc = mu_cfg_parse_file (&parse_tree, file, flags);
   if (rc == 0)
     {
-      rc = mu_cfg_tree_postprocess (parse_tree, flags);
+      struct mu_cfg_parse_hints hints;
+
+      hints.flags = flags | MU_CFG_PARSE_PROGRAM;
+      hints.program = progname;
+      
+      rc = mu_cfg_tree_postprocess (parse_tree, &hints);
       if (rc == 0)
 	rc = mu_cfg_tree_reduce (parse_tree, progname, progparam, flags,
 				 target_ptr);
diff --git a/libmailutils/cfg/parser.y b/libmailutils/cfg/parser.y
index 0b13c07..397e80f 100644
--- a/libmailutils/cfg/parser.y
+++ b/libmailutils/cfg/parser.y
@@ -77,6 +77,14 @@ config_value_dup (mu_config_value_t *src)
     }
 }
 
+static int
+_node_set_parent (void *item, void *data)
+{
+  struct mu_cfg_node *node = item;
+  node->parent = data;
+  return 0;
+}
+
 static mu_cfg_node_t *
 mu_cfg_alloc_node (enum mu_cfg_node_type type, struct mu_locus *loc,
 		   const char *tag, mu_config_value_t *label,
@@ -93,6 +101,7 @@ mu_cfg_alloc_node (enum mu_cfg_node_type type, struct mu_locus *loc,
   strcpy (p, tag);
   np->label = label;
   np->nodes = nodelist;
+  np->parent = NULL;
   return np;
 }
 
@@ -220,13 +229,12 @@ block   : ident tag '{' '}' opt_sc
 	    $$ = mu_cfg_alloc_node (mu_cfg_node_statement, &$1.locus,
 				    $1.name, $2,
 				    NULL);
-
 	  }
 	| ident tag '{' stmtlist '}' opt_sc
 	  {
 	    $$ = mu_cfg_alloc_node (mu_cfg_node_statement, &$1.locus,
 				    $1.name, $2, $4);
-
+	    mu_list_do ($4, _node_set_parent, $$);
 	  }
 	;
 
@@ -281,16 +289,16 @@ vallist : vlist
 	;
 
 vlist   : value
-	    {
-	      int rc = mu_list_create (&$$);
-	      if (rc)
-		{
-		  mu_diag_at_locus (MU_LOG_ERROR, &mu_cfg_locus,
-				    _("cannot create list: %s"),
-				    mu_strerror (rc));
-		  abort ();
-		}
-	      mu_list_append ($$, config_value_dup (&$1)); /* FIXME */
+          {
+	    int rc = mu_list_create (&$$);
+	    if (rc)
+	      {
+		mu_diag_at_locus (MU_LOG_ERROR, &mu_cfg_locus,
+				  _("cannot create list: %s"),
+				  mu_strerror (rc));
+		abort ();
+	      }
+	    mu_list_append ($$, config_value_dup (&$1)); /* FIXME */
 	  }
 	| vlist value
 	  {
@@ -472,7 +480,8 @@ mu_cfg_tree_union (mu_cfg_tree_t **pa, mu_cfg_tree_t **pb)
 }
 
 static mu_cfg_tree_t *
-do_include (const char *name, int flags, struct mu_locus *loc)
+do_include (const char *name, struct mu_cfg_parse_hints *hints,
+	    struct mu_locus *loc)
 {
   struct stat sb;
   char *tmpname = NULL;
@@ -490,21 +499,26 @@ do_include (const char *name, int flags, struct mu_locus *loc)
   if (stat (name, &sb) == 0)
     {
       int rc = 0;
-
+      
       if (S_ISDIR (sb.st_mode))
 	{
-	  if (flags & MU_PARSE_CONFIG_GLOBAL)
+	  if ((hints->flags & (MU_PARSE_CONFIG_GLOBAL|MU_CFG_PARSE_PROGRAM)) ==
+	      (MU_PARSE_CONFIG_GLOBAL|MU_CFG_PARSE_PROGRAM))
 	    {
-	      char *file = mu_make_file_name (name, mu_program_name);
-	      rc = mu_cfg_parse_file (&tree, file, flags);
+	      char *file = mu_make_file_name (name, hints->program);
+	      rc = mu_cfg_parse_file (&tree, file, hints->flags);
 	      free (file);
 	    }
 	}
       else
-	rc = mu_cfg_parse_file (&tree, name, flags);
-	      
+	rc = mu_cfg_parse_file (&tree, name, hints->flags);
+      
       if (rc == 0 && tree)
-	mu_cfg_tree_postprocess (tree, flags & ~MU_PARSE_CONFIG_GLOBAL);
+	{
+	  struct mu_cfg_parse_hints xhints = *hints;
+	  xhints.flags &= ~MU_PARSE_CONFIG_GLOBAL;
+	  mu_cfg_tree_postprocess (tree, &xhints);
+	}
     }
   else if (errno == ENOENT)
     {
@@ -519,17 +533,18 @@ do_include (const char *name, int flags, struct mu_locus *loc)
 			mu_strerror (errno));
       mu_cfg_error_count++;
     }		   
-      
+  
   free (tmpname);
   return tree;
 }
-    
+
 int
-mu_cfg_tree_postprocess (mu_cfg_tree_t *tree, int flags)
+mu_cfg_tree_postprocess (mu_cfg_tree_t *tree,
+			 struct mu_cfg_parse_hints *hints)
 {
   int rc;
   mu_iterator_t itr;
-
+  
   if (!tree->nodes)
     return 0;
   rc = mu_list_get_iterator (tree->nodes, &itr);
@@ -539,18 +554,22 @@ mu_cfg_tree_postprocess (mu_cfg_tree_t *tree, int flags)
        mu_iterator_next (itr))
     {
       mu_cfg_node_t *node;
-
+      
       mu_iterator_current (itr, (void**) &node);
-
+      
       if (node->type == mu_cfg_node_statement)
 	{
-	  if ((flags & MU_PARSE_CONFIG_GLOBAL) &&
+	  if ((hints->flags & MU_PARSE_CONFIG_GLOBAL) &&
 	      strcmp (node->tag, "program") == 0)
 	    {
 	      if (node->label->type == MU_CFG_STRING)
 		{
-		  if (strcmp (node->label->v.string, mu_program_name) == 0)
+		  if ((hints->flags & MU_CFG_PARSE_PROGRAM)
+		      && strcmp (node->label->v.string, hints->program) == 0)
 		    {
+		      /* Reset the parent node */
+		      mu_list_do (node->nodes, _node_set_parent,
+				  node->parent);
 		      /* Move all nodes from this block to the topmost
 			 level */
 		      mu_iterator_ctl (itr, mu_itrctl_insert_list,
@@ -573,7 +592,8 @@ mu_cfg_tree_postprocess (mu_cfg_tree_t *tree, int flags)
 	{
 	  if (node->label->type == MU_CFG_STRING)
 	    {
-	      mu_cfg_tree_t *t = do_include (node->label->v.string, flags,
+	      mu_cfg_tree_t *t = do_include (node->label->v.string,
+					     hints,
 					     &node->locus);
 	      if (t)
 		{
@@ -590,7 +610,7 @@ mu_cfg_tree_postprocess (mu_cfg_tree_t *tree, int flags)
 				_("argument to `include' is not a string"));
 	      mu_cfg_error_count++;
 	    }
-			   
+	  
 	  /* Remove node from the list */
 	  mu_iterator_ctl (itr, mu_itrctl_delete, NULL);
 	}
@@ -603,12 +623,12 @@ _mu_cfg_preorder_recursive (void *item, void *cbdata)
 {
   mu_cfg_node_t *node = item;
   struct mu_cfg_iter_closure *clos = cbdata;
-
+  
   switch (node->type)
     {
     case mu_cfg_node_undefined:
       abort ();
-
+      
     case mu_cfg_node_statement:
       switch (clos->beg (node, clos->data))
 	{
@@ -618,15 +638,15 @@ _mu_cfg_preorder_recursive (void *item, void *cbdata)
 	  if (clos->end && clos->end (node, clos->data) == MU_CFG_ITER_STOP)
 	    return 1;
 	  break;
-
+	  
 	case MU_CFG_ITER_SKIP:
 	  break;
-
+	  
 	case MU_CFG_ITER_STOP:
 	  return 1;
 	}
       break;
-
+      
     case mu_cfg_node_param:
       return clos->beg (node, clos->data) == MU_CFG_ITER_STOP;
     }
@@ -676,17 +696,17 @@ find_container (mu_list_t list, enum mu_cfg_cont_type type,
 {
   mu_iterator_t iter;
   struct mu_cfg_cont *ret = NULL;
-
+  
   if (len == 0)
     len = strlen (ident);
-
+  
   mu_list_get_iterator (list, &iter);
   for (mu_iterator_first (iter); !mu_iterator_is_done (iter);
        mu_iterator_next (iter))
     {
       struct mu_cfg_cont *cont;
       mu_iterator_current (iter, (void**) &cont);
-
+      
       if (cont->type == type
 	  && strlen (cont->v.ident) == len
 	  && memcmp (cont->v.ident, ident, len) == 0)
@@ -763,7 +783,7 @@ pop_section (struct scan_tree_data *dat)
 #define STRTONUM(s, type, base, res, limit, d, loc)			\
   {									\
     type sum = 0;							\
-									\
+    									\
     for (; *s; s++)							\
       {									\
 	type x;								\
@@ -786,7 +806,7 @@ pop_section (struct scan_tree_data *dat)
 	else if (limit && x > limit)					\
 	  {								\
 	    mu_diag_at_locus (MU_LOG_ERROR, loc,			\
-			    _("value out of allowed range"));		\
+			      _("value out of allowed range"));		\
 	    mu_cfg_error_count++;					\
 	    return 1;							\
 	  }								\
@@ -822,9 +842,9 @@ pop_section (struct scan_tree_data *dat)
     STRxTONUM (s, type, tmpres, 0, d, loc);				\
     if (*s)								\
       {									\
-        mu_diag_at_locus (MU_LOG_ERROR, loc,			        \
-		       _("not a number (stopped near `%s')"),		\
-		       s);						\
+	mu_diag_at_locus (MU_LOG_ERROR, loc,			        \
+			  _("not a number (stopped near `%s')"),	\
+			  s);						\
 	mu_cfg_error_count++;						\
 	return 1;							\
       }									\
@@ -837,7 +857,7 @@ pop_section (struct scan_tree_data *dat)
     const char *s = str;						\
     int sign;								\
     unsigned type limit;						\
-									\
+    									\
     if (*s == '-')							\
       {									\
 	sign++;								\
@@ -850,11 +870,11 @@ pop_section (struct scan_tree_data *dat)
 	sign = 0;							\
 	limit = TYPE_MAXIMUM (type);					\
       }									\
-									\
+    									\
     STRxTONUM (s, unsigned type, tmpres, limit, d, loc);		\
     if (*s)								\
       {									\
-        mu_diag_at_locus (MU_LOG_ERROR, loc,			        \
+	mu_diag_at_locus (MU_LOG_ERROR, loc,			        \
 			  _("not a number (stopped near `%s')"),	\
 			  s);						\
 	mu_cfg_error_count++;						\
@@ -910,7 +930,7 @@ parse_cidr (struct scan_tree_data *sdata, const struct mu_locus *locus,
   unsigned long mask;
   char astr[16];
   const char *p, *s;
-
+  
   p = strchr (str, '/');
   if (p)
     {
@@ -932,7 +952,7 @@ parse_cidr (struct scan_tree_data *sdata, const struct mu_locus *locus,
 	  return 1;
 	}
       addr.s_addr = ntohl (addr.s_addr);
-
+      
       p++;
       s = p;
       STRxTONUM (s, unsigned long, mask, 0, sdata->tree->debug, locus);
@@ -967,7 +987,7 @@ parse_cidr (struct scan_tree_data *sdata, const struct mu_locus *locus,
       int i;
       unsigned short x;
       addr.s_addr = 0;
-
+      
       p = str;
       for (i = 0; i < 3; i++)
 	{
@@ -976,7 +996,7 @@ parse_cidr (struct scan_tree_data *sdata, const struct mu_locus *locus,
 	    break;
 	  addr.s_addr = (addr.s_addr << 8) + x;
 	}
-
+      
       if (*p)
 	{
 	  mu_diag_at_locus (MU_LOG_ERROR, &mu_cfg_locus,
@@ -985,12 +1005,12 @@ parse_cidr (struct scan_tree_data *sdata, const struct mu_locus *locus,
 	  mu_cfg_error_count++;
 	  return 1;
 	}
-
+      
       mask = i * 8;
-
+      
       addr.s_addr <<= (4 - i) * 8;
     }
-
+  
   res->addr = addr;
   res->mask = mask;
   return 0;
@@ -1049,71 +1069,71 @@ valcvt (struct scan_tree_data *sdata, const struct mu_locus *locus,
 	*(char**)tgt = s;
 	break;
       }
-
+      
     case mu_cfg_short:
       GETSNUM (val->v.string, short, *(short*)tgt, sdata->tree->debug, locus);
       break;
-
+      
     case mu_cfg_ushort:
       GETUNUM (val->v.string, unsigned short, *(unsigned short*)tgt,
 	       sdata->tree->debug, locus);
       break;
-
+      
     case mu_cfg_int:
       GETSNUM (val->v.string, int, *(int*)tgt, sdata->tree->debug, locus);
       break;
-
+      
     case mu_cfg_uint:
       GETUNUM (val->v.string, unsigned int, *(unsigned int*)tgt,
 	       sdata->tree->debug, locus);
       break;
-
+      
     case mu_cfg_long:
       GETSNUM (val->v.string, long, *(long*)tgt,
 	       sdata->tree->debug, locus);
       break;
-
+      
     case mu_cfg_ulong:
       GETUNUM (val->v.string, unsigned long, *(unsigned long*)tgt,
 	       sdata->tree->debug, locus);
       break;
-
+      
     case mu_cfg_size:
       GETUNUM (val->v.string, size_t, *(size_t*)tgt,
 	       sdata->tree->debug, locus);
       break;
-
+      
     case mu_cfg_off:
       mu_diag_at_locus (MU_LOG_ERROR, locus, _("not implemented yet"));
       mu_cfg_error_count++;
       /* GETSNUM(node->tag_label, off_t, *(off_t*)tgt); */
       return 1;
-
+      
     case mu_cfg_time:
       GETUNUM (val->v.string, time_t, *(time_t*)tgt,
 	       sdata->tree->debug, locus);
       break;
-
+      
     case mu_cfg_bool:
       if (parse_bool (sdata, locus, val->v.string, (int*) tgt))
 	return 1;
       break;
-
+      
     case mu_cfg_ipv4:
       if (parse_ipv4 (sdata, locus, val->v.string, (struct in_addr *)tgt))
 	return 1;
       break;
-
+      
     case mu_cfg_cidr:
       if (parse_cidr (sdata, locus, val->v.string, (mu_cfg_cidr_t *)tgt))
 	return 1;
       break;
-
+      
     case mu_cfg_host:
       if (parse_host (sdata, locus, val->v.string, (struct in_addr *)tgt))
 	return 1;
       break;
-
+      
     default:
       return 1;
     }
@@ -1145,7 +1165,7 @@ static size_t config_type_size[] = {
   sizeof (struct in_addr), /* mu_cfg_host */
   0,                       /* mu_cfg_callback */
   0,                       /* mu_cfg_section */
-}  ;
+};
 
 static int
 _set_fun (void *item, void *data)
@@ -1154,7 +1174,7 @@ _set_fun (void *item, void *data)
   struct set_closure *clos = data;
   void *tgt;
   size_t size;
-
+  
   if (clos->type >= MU_ARRAY_SIZE(config_type_size)
       || (size = config_type_size[clos->type]) == 0)
     {
@@ -1164,7 +1184,7 @@ _set_fun (void *item, void *data)
       mu_cfg_error_count++;
       return 1;
     }
-
+  
   tgt = mu_alloc (size);
   if (!tgt)
     {
@@ -1172,7 +1192,7 @@ _set_fun (void *item, void *data)
       mu_cfg_error_count++;
       return 1;
     }
-
+  
   if (valcvt (clos->sdata, clos->locus, &tgt, clos->type, val) == 0)
     mu_list_append (clos->list, tgt);
   return 0;
@@ -1185,7 +1205,7 @@ parse_param (struct scan_tree_data *sdata, const mu_cfg_node_t *node)
   struct set_closure clos;
   struct mu_cfg_param *param = find_param (sdata->list->sec, node->tag,
 					   0);
-
+  
   if (!param)
     {
       mu_diag_at_locus (MU_LOG_ERROR, &node->locus,
@@ -1194,7 +1214,7 @@ parse_param (struct scan_tree_data *sdata, const mu_cfg_node_t *node)
       mu_cfg_error_count++;
       return 1;
     }
-
+  
   if (param->data)
     tgt = param->data;
   else if (sdata->list->sec->target)
@@ -1210,7 +1230,7 @@ parse_param (struct scan_tree_data *sdata, const mu_cfg_node_t *node)
 			  "%s"), param->ident);
       abort ();
     }
-
+  
   memset (&clos, 0, sizeof clos);
   clos.type = MU_CFG_TYPE (param->type);
   if (MU_CFG_IS_LIST (param->type))
@@ -1221,7 +1241,7 @@ parse_param (struct scan_tree_data *sdata, const mu_cfg_node_t *node)
 	{
 	case MU_CFG_LIST:
 	  break;
-
+	  
 	case MU_CFG_STRING:
 	  {
 	    mu_list_t list;
@@ -1231,14 +1251,14 @@ parse_param (struct scan_tree_data *sdata, const mu_cfg_node_t *node)
 	    node->label->v.list = list;
 	  }
 	  break;
-
+	  
 	case MU_CFG_ARRAY:
 	  mu_diag_at_locus (MU_LOG_ERROR, &node->locus,
-			 _("expected list, but found array"));
+			    _("expected list, but found array"));
 	  mu_cfg_error_count++;
 	  return 1;
 	}
-
+      
       mu_list_create (&clos.list);
       mu_list_do (node->label->v.list, _set_fun, &clos);
       *(mu_list_t*)tgt = clos.list;
@@ -1253,14 +1273,14 @@ parse_param (struct scan_tree_data *sdata, const mu_cfg_node_t *node)
 	  abort ();
 	}
       mu_stream_ioctl (mu_strerr, MU_IOCTL_LOGSTREAM, 
-                       MU_IOCTL_LOGSTREAM_SET_LOCUS,
+		       MU_IOCTL_LOGSTREAM_SET_LOCUS,
 		       (void*) &node->locus);
       if (param->callback (tgt, node->label))
 	return 1;
     }
   else
     return valcvt (sdata, &node->locus, tgt, clos.type, node->label);
-
+  
   return 0;
 }
 
@@ -1270,12 +1290,12 @@ _scan_tree_helper (const mu_cfg_node_t *node, void *data)
 {
   struct scan_tree_data *sdata = data;
   struct mu_cfg_section *sec;
-
+  
   switch (node->type)
     {
     case mu_cfg_node_undefined:
       abort ();
-
+      
     case mu_cfg_node_statement:
       sec = find_subsection (sdata->list->sec, node->tag, 0);
       if (!sec)
@@ -1297,7 +1317,7 @@ _scan_tree_helper (const mu_cfg_node_t *node, void *data)
       if (sec->parser)
 	{
 	  mu_stream_ioctl (mu_strerr, MU_IOCTL_LOGSTREAM, 
-                           MU_IOCTL_LOGSTREAM_SET_LOCUS,
+			   MU_IOCTL_LOGSTREAM_SET_LOCUS,
 			   (void*) &node->locus);
 	  if (sec->parser (mu_cfg_section_start, node,
 			   sec->label, &sec->target,
@@ -1309,7 +1329,7 @@ _scan_tree_helper (const mu_cfg_node_t *node, void *data)
 	}
       push_section(sdata, sec);
       break;
-
+      
     case mu_cfg_node_param:
       if (parse_param (sdata, node))
 	{
@@ -1326,12 +1346,12 @@ _scan_tree_end_helper (const mu_cfg_node_t *node, void *data)
 {
   struct scan_tree_data *sdata = data;
   struct mu_cfg_section *sec;
-
+  
   switch (node->type)
     {
     default:
       abort ();
-
+      
     case mu_cfg_node_statement:
       sec = pop_section (sdata);
       if (sec && sec->parser)
@@ -1350,7 +1370,7 @@ _scan_tree_end_helper (const mu_cfg_node_t *node, void *data)
 
 int
 mu_cfg_scan_tree (mu_cfg_tree_t *tree, struct mu_cfg_section *sections,
-		  void *target, void *data)
+		   void *target, void *data)
 {
   struct scan_tree_data dat;
   struct mu_cfg_iter_closure clos;
@@ -1362,15 +1382,15 @@ mu_cfg_scan_tree (mu_cfg_tree_t *tree, struct mu_cfg_section *sections,
   dat.error = 0;
   dat.call_data = data;
   dat.target = target;
-
+  
   mu_stream_ioctl (mu_strerr, MU_IOCTL_LOGSTREAM, 
-                   MU_IOCTL_LOGSTREAM_GET_MODE, &save_mode);
+		   MU_IOCTL_LOGSTREAM_GET_MODE, &save_mode);
   mode = save_mode | MU_LOGMODE_LOCUS;
   mu_stream_ioctl (mu_strerr, MU_IOCTL_LOGSTREAM, 
-                   MU_IOCTL_LOGSTREAM_SET_MODE, &mode);
+		   MU_IOCTL_LOGSTREAM_SET_MODE, &mode);
   mu_stream_ioctl (mu_strerr, MU_IOCTL_LOGSTREAM, 
-                   MU_IOCTL_LOGSTREAM_GET_LOCUS, &save_locus);
-  
+		   MU_IOCTL_LOGSTREAM_GET_LOCUS, &save_locus);
+
   if (push_section (&dat, sections))
     return 1;
   clos.beg = _scan_tree_helper;
@@ -1378,11 +1398,11 @@ mu_cfg_scan_tree (mu_cfg_tree_t *tree, struct mu_cfg_section *sections,
   clos.data = &dat;
   mu_cfg_preorder (tree->nodes, &clos);
   pop_section (&dat);
-
+  
   mu_stream_ioctl (mu_strerr, MU_IOCTL_LOGSTREAM, 
-                   MU_IOCTL_LOGSTREAM_SET_MODE, &save_mode);
+		   MU_IOCTL_LOGSTREAM_SET_MODE, &save_mode);
   mu_stream_ioctl (mu_strerr, MU_IOCTL_LOGSTREAM, 
-                   MU_IOCTL_LOGSTREAM_SET_LOCUS, &save_locus);
+		   MU_IOCTL_LOGSTREAM_SET_LOCUS, &save_locus);
   free (save_locus.mu_file);
   
   return dat.error;
@@ -1397,19 +1417,19 @@ mu_cfg_find_section (struct mu_cfg_section *root_sec,
       struct mu_cfg_section *sec;
       size_t len;
       const char *p;
-
+      
       while (*path == MU_CFG_PATH_DELIM)
 	path++;
-
+      
       if (*path == 0)
 	return MU_ERR_NOENT;
-
+      
       p = strchr (path, MU_CFG_PATH_DELIM);
       if (p)
 	len = p - path;
       else
 	len = strlen (path);
-
+      
       sec = find_subsection (root_sec, path, len);
       if (!sec)
 	return MU_ERR_NOENT;
@@ -1444,7 +1464,7 @@ mu_cfg_tree_create_node (struct mu_cfg_tree *tree,
   mu_cfg_node_t *np;
   size_t size = sizeof *np + strlen (tag) + 1;
   mu_config_value_t val;
-
+  
   np = mu_alloc (size);
   np->type = type;
   if (loc)
@@ -1504,7 +1524,7 @@ mu_cfg_value_eq (mu_config_value_t *a, mu_config_value_t *b)
       if (a->v.string == NULL)
 	return b->v.string == NULL;
       return strcmp (a->v.string, b->v.string) == 0;
-		     
+      
     case MU_CFG_LIST:
       {
 	int ret = 1;
@@ -1516,7 +1536,7 @@ mu_cfg_value_eq (mu_config_value_t *a, mu_config_value_t *b)
 	mu_list_count (b->v.list, &i);
 	if (i != cnt)
 	  return 1;
-
+	
 	mu_list_get_iterator (a->v.list, &aitr);
 	mu_list_get_iterator (b->v.list, &bitr);
 	for (i = 0,
@@ -1538,7 +1558,7 @@ mu_cfg_value_eq (mu_config_value_t *a, mu_config_value_t *b)
 	mu_iterator_destroy (&bitr);
 	return ret && i == cnt;
       }
-	
+      
     case MU_CFG_ARRAY:
       if (a->v.arg.c == b->v.arg.c)
 	{
@@ -1586,7 +1606,7 @@ split_cfg_path (const char *path, int *pargc, char ***pargv)
 	  path++;
 	}
       ws.ws_delim = delim;
-
+      
       if (mu_wordsplit (path, &ws, MU_WRDSF_DEFFLAGS|MU_WRDSF_DELIM))
 	{
 	  mu_error (_("cannot split line `%s': %s"), path,
@@ -1599,10 +1619,10 @@ split_cfg_path (const char *path, int *pargc, char ***pargv)
       ws.ws_wordv = NULL;
       mu_wordsplit_free (&ws);
     }
-
+  
   *pargc = argc;
   *pargv = argv;
-
+  
   return 0;
 }
 
@@ -1659,7 +1679,7 @@ parse_label (const char *str)
   if (len > 1 && str[0] == '(' && str[len-1] == ')')
     {
       mu_list_t lst;
-
+      
       ws.ws_delim = ",";
       if (mu_wordsplit_len (str + 1, len - 2, &ws,
 			    MU_WRDSF_DEFFLAGS|MU_WRDSF_DELIM|MU_WRDSF_WS))
@@ -1668,7 +1688,7 @@ parse_label (const char *str)
 		    mu_wordsplit_strerror (&ws));
 	  return NULL;
 	}
-
+      
       mu_list_create (&lst);
       mu_list_set_destroy_item (lst, destroy_value);
       for (i = 0; i < ws.ws_wordc; i++)
@@ -1752,23 +1772,27 @@ mu_cfg_find_node (mu_cfg_tree_t *tree, const char *path, mu_cfg_node_t **pval)
 {
   int rc;
   struct find_data data;
-  struct mu_cfg_iter_closure clos;
-
+  
   rc = split_cfg_path (path, &data.argc, &data.argv);
   if (rc)
     return rc;
   data.tag = 0;
-  parse_tag (&data);
-
-  clos.beg = node_finder;
-  clos.end = NULL;
-  clos.data = &data;
-  rc = mu_cfg_preorder (tree->nodes, &clos);
-  destroy_value (data.label);
-  if (rc)
+  if (data.argc)
     {
-      *pval = (mu_cfg_node_t *) data.node;
-      return 0;
+      struct mu_cfg_iter_closure clos;
+      
+      parse_tag (&data);
+      
+      clos.beg = node_finder;
+      clos.end = NULL;
+      clos.data = &data;
+      rc = mu_cfg_preorder (tree->nodes, &clos);
+      destroy_value (data.label);
+      if (rc)
+	{
+	  *pval = (mu_cfg_node_t *) data.node;
+	  return 0;
+	}
     }
   return MU_ERR_NOENT;
 }
@@ -1784,20 +1808,21 @@ mu_cfg_create_subtree (const char *path, mu_cfg_node_t **pnode)
   enum mu_cfg_node_type type;
   mu_cfg_node_t *node = NULL;
   struct mu_locus locus;
-
+  
   locus.mu_file = "<int>";
   locus.mu_line = 0;
   locus.mu_col = 0;
-
+  
   rc = split_cfg_path (path, &argc, &argv);
   if (rc)
     return rc;
-
+  
   for (i = argc - 1; i >= 0; i--)
     {
       mu_list_t nodelist = NULL;
       mu_config_value_t *label = NULL;
       char *q = argv[i], *p;
+      mu_cfg_node_t *parent;
       
       type = mu_cfg_node_statement;
       do
@@ -1823,14 +1848,89 @@ mu_cfg_create_subtree (const char *path, mu_cfg_node_t **pnode)
 	  mu_cfg_create_node_list (&nodelist);
 	  mu_list_append (nodelist, node);
 	}
-      node = mu_cfg_alloc_node (type, &locus, argv[i], label, nodelist);
+      parent = mu_cfg_alloc_node (type, &locus, argv[i], label, nodelist);
+      if (node)
+	node->parent = parent;
+      node = parent;
     }
-
+  
   mu_argcv_free (argc, argv);
   *pnode = node;
   return 0;
 }
 
+int
+mu_cfg_parse_config (mu_cfg_tree_t **ptree, struct mu_cfg_parse_hints *hints)
+{
+  int rc = 0;
+  mu_cfg_tree_t *tree = NULL, *tmp;
+  
+  if ((hints->flags & MU_CFG_PARSE_SITE_RCFILE) && hints->site_rcfile)
+    {
+      rc = mu_cfg_parse_file (&tmp, hints->site_rcfile, hints->flags);
+      
+      if (rc == ENOMEM)
+	{
+	  mu_error ("%s", mu_strerror (rc));
+	  return rc;
+	}
+      else if (rc == 0)
+	{
+	  struct mu_cfg_parse_hints xhints = *hints;
+	  xhints.flags |= MU_PARSE_CONFIG_GLOBAL;
+	  mu_cfg_tree_postprocess (tmp, &xhints);
+	  mu_cfg_tree_union (&tree, &tmp);
+	}
+    }
+  
+  if ((hints->flags & MU_CFG_PARSE_PROGRAM) && hints->program)
+    {
+      size_t size = 3 + strlen (hints->program) + 1;
+      char *file_name = malloc (size);
+      if (file_name)
+	{
+	  strcpy (file_name, "~/.");
+	  strcat (file_name, hints->program);
+	  
+	  rc = mu_cfg_parse_file (&tmp, file_name, hints->flags);
+	  if (rc == ENOMEM)
+	    {
+	      mu_error ("%s", mu_strerror (rc));
+	      mu_cfg_destroy_tree (&tree);
+	      return rc;
+	    }
+	  else if (rc == 0)
+	    {
+	      mu_cfg_tree_postprocess (tmp, hints);
+	      mu_cfg_tree_union (&tree, &tmp);
+	    }
+	  else if (rc == ENOENT)
+	    rc = 0;
+	  free (file_name);
+	}
+    }
+  
+  if ((hints->flags & MU_CFG_PARSE_CUSTOM_RCFILE) && hints->custom_rcfile)
+    {
+      rc = mu_cfg_parse_file (&tmp, hints->custom_rcfile, hints->flags);
+      if (rc)
+	{
+	  mu_error (_("errors parsing file %s: %s"), hints->custom_rcfile,
+		    mu_strerror (rc));
+	  mu_cfg_destroy_tree (&tree);
+	  return rc;
+	}
+      else
+	{
+	  mu_cfg_tree_postprocess (tmp, hints);
+	  mu_cfg_tree_union (&tree, &tmp);
+	}
+    }
+  
+  *ptree = tree;
+  return rc;
+}
+
   
 	  
         
diff --git a/libmu_argp/muinit.c b/libmu_argp/muinit.c
index a0c098d..cd769eb 100644
--- a/libmu_argp/muinit.c
+++ b/libmu_argp/muinit.c
@@ -165,16 +165,16 @@ mu_app_init (struct argp *myargp, const char **capa,
   rc = mu_libcfg_parse_config (&parse_tree);
   if (rc == 0)
     {
-      int cfgflags = MU_PARSE_CONFIG_PLAIN;
+      struct mu_cfg_parse_hints hints = { MU_PARSE_CONFIG_PLAIN };
 
       if (mu_cfg_parser_verbose)
-	cfgflags |= MU_PARSE_CONFIG_VERBOSE;
+	hints.flags |= MU_PARSE_CONFIG_VERBOSE;
       if (mu_cfg_parser_verbose > 1)
-	cfgflags |= MU_PARSE_CONFIG_DUMP;
-      mu_cfg_tree_postprocess (mu_argp_tree, cfgflags);
+	hints.flags |= MU_PARSE_CONFIG_DUMP;
+      mu_cfg_tree_postprocess (mu_argp_tree, &hints);
       mu_cfg_tree_union (&parse_tree, &mu_argp_tree);
       rc = mu_cfg_tree_reduce (parse_tree, mu_program_name, cfg_param,
-			       cfgflags, data);
+			       hints.flags, data);
     }
   
   if (mu_rcfile_lint)
diff --git a/libmu_cfg/init.c b/libmu_cfg/init.c
index 8bb35f3..1429075 100644
--- a/libmu_cfg/init.c
+++ b/libmu_cfg/init.c
@@ -88,77 +88,34 @@ mu_libcfg_init (char **cnames)
 int
 mu_libcfg_parse_config (mu_cfg_tree_t **ptree)
 {
-  int flags = 0;
-  int rc = 0;
-  mu_cfg_tree_t *tree = NULL, *tmp;
+  struct mu_cfg_parse_hints hints;
+
+  memset (&hints, 0, sizeof (hints));
   
   if (mu_cfg_parser_verbose)
-    flags |= MU_PARSE_CONFIG_VERBOSE;
+    hints.flags |= MU_PARSE_CONFIG_VERBOSE;
   if (mu_cfg_parser_verbose > 1)
-    flags |= MU_PARSE_CONFIG_DUMP;
+    hints.flags |= MU_PARSE_CONFIG_DUMP;
   
   if (mu_load_site_rcfile)
     {
-      rc = mu_cfg_parse_file (&tmp, MU_CONFIG_FILE, flags);
-
-      if (rc == ENOMEM)
-	{
-	  mu_error ("%s", mu_strerror (rc));
-	  return rc;
-	}
-      else if (rc == 0)
-	{
-	  mu_cfg_tree_postprocess (tmp, flags | MU_PARSE_CONFIG_GLOBAL);
-	  mu_cfg_tree_union (&tree, &tmp);
-	}
+      hints.flags |= MU_CFG_PARSE_SITE_RCFILE;
+      hints.site_rcfile = MU_CONFIG_FILE;
     }
-
+  
   if (mu_load_user_rcfile && mu_program_name)
     {
-      size_t size = 3 + strlen (mu_program_name) + 1;
-      char *file_name = malloc (size);
-      if (file_name)
-	{
-	  strcpy (file_name, "~/.");
-	  strcat (file_name, mu_program_name);
-
-	  rc = mu_cfg_parse_file (&tmp, file_name, flags);
-	  if (rc == ENOMEM)
-	    {
-	      mu_error ("%s", mu_strerror (rc));
-	      mu_cfg_destroy_tree (&tree);
-	      return rc;
-	    }
-	  else if (rc == 0)
-	    {
-	      mu_cfg_tree_postprocess (tmp, flags);
-	      mu_cfg_tree_union (&tree, &tmp);
-	    }
-	  else if (rc == ENOENT)
-	    rc = 0;
-	  free (file_name);
-	}
+      hints.flags |= MU_CFG_PARSE_PROGRAM;
+      hints.program = (char*) mu_program_name;
     }
-
+  
   if (mu_load_rcfile)
     {
-      rc = mu_cfg_parse_file (&tmp, mu_load_rcfile, flags);
-      if (rc)
-	{
-	  mu_error (_("errors parsing file %s: %s"), mu_load_rcfile,
-		    mu_strerror (rc));
-	  mu_cfg_destroy_tree (&tree);
-	  return rc;
-	}
-      else
-	{
-	  mu_cfg_tree_postprocess (tmp, flags);
-	  mu_cfg_tree_union (&tree, &tmp);
-	}
+      hints.flags |= MU_CFG_PARSE_CUSTOM_RCFILE;
+      hints.custom_rcfile = mu_load_rcfile;
     }
 
-  *ptree = tree;
-  return rc;
+  return mu_cfg_parse_config (ptree, &hints);
 }
 
 
diff --git a/mu/query.c b/mu/query.c
index 6e61b0c..b089af0 100644
--- a/mu/query.c
+++ b/mu/query.c
@@ -28,13 +28,26 @@ static char query_doc[] = N_("mu query - query configuration values.");
 char query_docstring[] = N_("query configuration values");
 static char query_args_doc[] = N_("path [path...]");
 
-char *file_name;
-int verbose_option;
+static char *file_name;
+static struct mu_cfg_parse_hints hints;
+
+enum {
+  VALUE_OPTION = 256,
+  PATH_OPTION
+};
 
 static struct argp_option query_options[] = {
   { "file", 'f', N_("FILE"), 0,
     N_("query configuration values from FILE (default mailutils.rc)"),
     0 },
+  { "value", VALUE_OPTION, NULL, 0,
+    N_("display parameter values only"),
+    0 },
+  { "program", 'p', N_("NAME"), 0,
+    N_("set program name for configuration lookup"),
+    0 },
+  { "path", PATH_OPTION, NULL, 0,
+    N_("display parameters as paths") },
   { "verbose", 'v', NULL, 0,
     N_("increase output verbosity"), 0},
   { NULL }
@@ -49,8 +62,21 @@ query_parse_opt (int key, char *arg, struct argp_state *state)
       file_name = arg;
       break;
 
+    case 'p':
+      hints.flags |= MU_CFG_PARSE_PROGRAM;
+      hints.program = arg;
+      break;
+      
     case 'v':
-      verbose_option++;
+      hints.flags |= MU_CFG_FMT_LOCUS;
+      break;
+
+    case VALUE_OPTION:
+      hints.flags |= MU_CFG_FMT_VALUE_ONLY;
+      break;
+      
+    case PATH_OPTION:
+      hints.flags |= MU_CFG_FMT_PARAM_PATH;
       break;
       
     default:
@@ -74,7 +100,6 @@ mutool_query (int argc, char **argv)
 {
   int index;
   mu_cfg_tree_t *tree = NULL;
-  int fmtflags = 0;
   
   if (argp_parse (&query_argp, argc, argv, ARGP_IN_ORDER, &index, NULL))
     return 1;
@@ -88,26 +113,20 @@ mutool_query (int argc, char **argv)
       return 1;
     }
 
-  if (file_name)
-    {
-      mu_load_site_rcfile = 0;
-      mu_load_user_rcfile = 0;
-      mu_load_rcfile = file_name;
-    }
+  hints.flags |= MU_CFG_PARSE_SITE_RCFILE | MU_PARSE_CONFIG_GLOBAL;
+  hints.site_rcfile = file_name ? file_name : MU_CONFIG_FILE;
   
-  if (mu_libcfg_parse_config (&tree))
+  if (mu_cfg_parse_config (&tree, &hints))
     return 1;
   if (!tree)
     return 0;
-  if (verbose_option)
-    fmtflags = MU_CFG_FMT_LOCUS;
   for ( ; argc > 0; argc--, argv++)
     {
       char *path = *argv;
       mu_cfg_node_t *node;
 
       if (mu_cfg_find_node (tree, path, &node) == 0)
-	mu_cfg_format_node (mu_strout, node, fmtflags);
+	mu_cfg_format_node (mu_strout, node, hints.flags);
     }
   return 0;
 }


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Sat Mar 05 09:43:30 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Pvshe-0004Eq-7a
	for mharc-commit-mailutils@gnu.org; Sat, 05 Mar 2011 09:43:30 -0500
Received: from [140.186.70.92] (port=56845 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PvshY-0004Cg-1g
	for commit-mailutils@gnu.org; Sat, 05 Mar 2011 09:43:29 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PvshO-0003cB-Ct
	for commit-mailutils@gnu.org; Sat, 05 Mar 2011 09:43:23 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:50448
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PvshO-0003bu-AY
	for commit-mailutils@gnu.org; Sat, 05 Mar 2011 09:43:14 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PvshN-0008L2-Uj
	for commit-mailutils@gnu.org; Sat, 05 Mar 2011 14:43:13 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PvshN-0006pB-BU
	for commit-mailutils@gnu.org; Sat, 05 Mar 2011 14:43:13 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4dda9b21c67b6d03b852f57325cd0c88d266b463
X-Git-Newrev: ad938c5af5952cfbe1cb9782999a674eb5ceddbb
Message-Id: <E1PvshN-0006pB-BU@vcs-noshell.in.savannah.gnu.org>
Date: Sat, 05 Mar 2011 14:43:13 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-353-gad938c5
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Mar 2011 14:43:29 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=ad938c5af5952cfbe1cb9782999a674eb5ceddbb

The branch, master has been updated
       via  ad938c5af5952cfbe1cb9782999a674eb5ceddbb (commit)
      from  4dda9b21c67b6d03b852f57325cd0c88d266b463 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ad938c5af5952cfbe1cb9782999a674eb5ceddbb
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Sat Mar 5 14:51:26 2011 +0200

    Simplify mu_cfg_tree_reduce.
    
    This function used to handle include/program statements, which
    is useless now, as these are expanded by mu_cfg_tree_postprocess.
    
    * include/mailutils/cfg.h (mu_cfg_tree_reduce): Change signature.
    (mu_format_config_tree): Change signature.
    (mu_config_clone_root_container): New proto.
    (mu_config_register_section): Rename to mu_config_root_register_section.
    mu_config_container_register_section. All uses changed.
    (mu_config_root_register_section): New proto.
    
    * libmailutils/cfg/driver.c (prog_parser)
    (_cb_include): Remove unnecessary code.
    (mu_build_container): Simplify. All uses updated.
    (mu_cfg_tree_reduce): Simplify invocation. All uses updated.
    
    * libmu_argp/muinit.c (mu_app_init): Re-implement --config-help support.
    
    * sieve/sieve.c (sieve_cfg_param): Fix docstring for "debug".
    * sieve/tests/testsuite.at (MUT_SIEVE_DEFAULT_OPTIONS): New variable.
    (MUT_SIEVE_CMDLINE): Include MUT_SIEVE_DEFAULT_OPTIONS.
    (MUT_SIEVE_COMPILE): Pass MUT_SIEVE_DEFAULT_OPTIONS to sieve.

-----------------------------------------------------------------------

Summary of changes:
 include/mailutils/cfg.h   |   29 +++++--
 libmailutils/cfg/driver.c |  207 ++++++++-------------------------------------
 libmailutils/cfg/lexer.l  |    5 +-
 libmu_argp/muinit.c       |   25 +++++-
 libmu_cfg/init.c          |    4 +-
 mu/acl.c                  |    4 +-
 sieve/sieve.c             |    6 +-
 sieve/tests/testsuite.at  |   11 ++-
 8 files changed, 94 insertions(+), 197 deletions(-)

diff --git a/include/mailutils/cfg.h b/include/mailutils/cfg.h
index a27eb5c..95e89c7 100644
--- a/include/mailutils/cfg.h
+++ b/include/mailutils/cfg.h
@@ -211,6 +211,8 @@ struct mu_cfg_cidr
 int mu_config_create_container (struct mu_cfg_cont **pcont,
 				enum mu_cfg_cont_type type);
 int mu_config_clone_container (struct mu_cfg_cont *cont);
+struct mu_cfg_cont *mu_config_clone_root_container (void);
+
 void mu_config_destroy_container (struct mu_cfg_cont **pcont);
 
 int mu_cfg_section_add_container (struct mu_cfg_section *sect,
@@ -231,11 +233,19 @@ int mu_cfg_scan_tree (mu_cfg_tree_t *tree, struct mu_cfg_section *sections,
 int mu_cfg_find_section (struct mu_cfg_section *root_sec,
 			 const char *path, struct mu_cfg_section **retval);
 
-int mu_config_register_section (const char *parent_path,
-				const char *ident,
-				const char *label,
-				mu_cfg_section_fp parser,
-				struct mu_cfg_param *param);
+int mu_config_container_register_section (struct mu_cfg_cont **proot,
+					  const char *parent_path,
+					  const char *ident,
+					  const char *label,
+					  mu_cfg_section_fp parser,
+					  struct mu_cfg_param *param,
+					  struct mu_cfg_section **psection);
+int mu_config_root_register_section (const char *parent_path,
+				     const char *ident,
+				     const char *label,
+				     mu_cfg_section_fp parser,
+				     struct mu_cfg_param *param);
+
 int mu_config_register_plain_section (const char *parent_path,
 				      const char *ident,
 				      struct mu_cfg_param *params);
@@ -274,11 +284,12 @@ void mu_cfg_format_node (mu_stream_t stream, const mu_cfg_node_t *node,
 			 int flags);
   
 void mu_cfg_format_container (mu_stream_t stream, struct mu_cfg_cont *cont);
-void mu_format_config_tree (mu_stream_t stream, const char *progname,
-			    struct mu_cfg_param *progparam, int flags);
-int mu_cfg_tree_reduce (mu_cfg_tree_t *parse_tree, const char *progname,
+void mu_format_config_tree (mu_stream_t stream,
+			    struct mu_cfg_param *progparam);
+int mu_cfg_tree_reduce (mu_cfg_tree_t *parse_tree,
+                        struct mu_cfg_parse_hints *hints,
 		        struct mu_cfg_param *progparam,
-		        int flags, void *target_ptr);
+		        void *target_ptr);
 int mu_cfg_assert_value_type (mu_config_value_t *val, int type);
 int mu_cfg_string_value_cb (mu_config_value_t *val,
 			    int (*fun) (const char *, void *),
diff --git a/libmailutils/cfg/driver.c b/libmailutils/cfg/driver.c
index 6a925eb..8db81a2 100644
--- a/libmailutils/cfg/driver.c
+++ b/libmailutils/cfg/driver.c
@@ -340,13 +340,13 @@ mu_config_clone_container (struct mu_cfg_cont *cont)
 
 
 int
-_mu_config_register_section (struct mu_cfg_cont **proot,
-			     const char *parent_path,
-			     const char *ident,
-			     const char *label,
-			     mu_cfg_section_fp parser,
-			     struct mu_cfg_param *param,
-			     struct mu_cfg_section **psection)
+mu_config_container_register_section (struct mu_cfg_cont **proot,
+				      const char *parent_path,
+				      const char *ident,
+				      const char *label,
+				      mu_cfg_section_fp parser,
+				      struct mu_cfg_param *param,
+				      struct mu_cfg_section **psection)
 {
   int rc;
   struct mu_cfg_section *root_section;
@@ -420,172 +420,54 @@ _mu_config_register_section (struct mu_cfg_cont **proot,
 }
   
 int
-mu_config_register_section (const char *parent_path,
-			    const char *ident,
-			    const char *label,
-			    mu_cfg_section_fp parser,
-			    struct mu_cfg_param *param)
+mu_config_root_register_section (const char *parent_path,
+				 const char *ident,
+				 const char *label,
+				 mu_cfg_section_fp parser,
+				 struct mu_cfg_param *param)
 {
-  return _mu_config_register_section (&root_container,
-				      parent_path,
-				      ident, label,
-				      parser, param, NULL);
+  return mu_config_container_register_section (&root_container,
+					       parent_path,
+					       ident, label,
+					       parser, param, NULL);
 }
 
 int
 mu_config_register_plain_section (const char *parent_path, const char *ident,
 				  struct mu_cfg_param *params)
 {
-  return mu_config_register_section (parent_path, ident, NULL, NULL, params);
-}
-
-static int
-prog_parser (enum mu_cfg_section_stage stage,
-	     const mu_cfg_node_t *node,
-	     const char *label, void **section_data,
-	     void *call_data,
-	     mu_cfg_tree_t *tree)
-{
-  if (stage == mu_cfg_section_start)
-    {
-      return node->label->type == MU_CFG_STRING
-	     && strcmp (node->label->v.string, label);
-    }
-  
-  return 0;
-}
-
-struct include_data
-{
-  const char *progname;
-  struct mu_cfg_param *progparam;
-  int flags;
-  void *target;
-};
-
-static int
-_cb_include (void *data, mu_config_value_t *val)
-{
-  int ret = 0;
-  struct stat sb;
-  const char *dirname;
-  struct include_data *idp = data;
-  char *tmp = NULL;
-
-  if (mu_cfg_assert_value_type (val, MU_CFG_STRING))
-    return 1;
-
-  dirname = val->v.string;
-  if (dirname[0] != '/')
-    {
-      dirname = tmp = mu_make_file_name (SYSCONFDIR, dirname);
-      if (!dirname)
-        {
-          mu_error ("%s", mu_strerror (errno));
-          return 1;
-        }
-    }
-    
-  if (stat (dirname, &sb) == 0)
-    {
-      if (S_ISDIR (sb.st_mode))
-	{
-	  char *file = mu_make_file_name (dirname, idp->progname);
-	  ret = mu_get_config (file, idp->progname, idp->progparam,
-			       idp->flags & ~MU_PARSE_CONFIG_GLOBAL,
-			       idp->target);
-	}
-      else
-	ret = mu_get_config (dirname, idp->progname, idp->progparam,
-			     idp->flags, idp->target);
-    }
-  else if (errno == ENOENT)
-    {
-      mu_error (_("include file or directory does not exist"));
-      ret = 1;
-    }
-  else
-    {
-      mu_error (_("cannot stat include file or directory: %s"),
-		mu_strerror (errno));
-      ret = 1;
-    }
-  free (tmp);
-  return ret;
+  return mu_config_root_register_section (parent_path, ident, NULL, NULL,
+					  params);
 }
 
 struct mu_cfg_cont *
-mu_build_container (const char *progname, struct include_data *idp)
+mu_config_clone_root_container (void)
 {
   struct mu_cfg_cont *cont = root_container;
-
   mu_config_clone_container (cont);
-  
-  if (idp->flags & MU_PARSE_CONFIG_PLAIN)
-    {
-      struct mu_cfg_param mu_include_param[] = {
-	{ "include", mu_cfg_callback, NULL, 0, _cb_include,
-	  N_("Include contents of the given file.  If a directory is given, "
-	     "include contents of the file <file>/<program>, where "
-	     "<program> is the name of the program.  This latter form is "
-	     "allowed only in the site-wide configuration file."),
-	  N_("file-or-directory") },
-	{ NULL }
-      };
-
-      mu_include_param[0].data = idp;
-      _mu_config_register_section (&cont, NULL, NULL, NULL,
-				   (void*) progname, mu_include_param, NULL);
-      
-      if (idp->flags & MU_PARSE_CONFIG_GLOBAL)
-	{
-	  mu_iterator_t iter;
-	  struct mu_cfg_section *prog_sect;
-	  struct mu_cfg_cont *old_root = root_container;
-	  static struct mu_cfg_param empty_param = { NULL };
-	  
-	  _mu_config_register_section (&cont, NULL, "program", progname,
-				       prog_parser,
-				       idp->progparam ?
-				       idp->progparam : &empty_param,
-				       &prog_sect);
-      
-	  if (old_root->v.section.children)
-	    {
-	      if (!prog_sect->children)
-		mu_list_create (&prog_sect->children);
-	      mu_list_get_iterator (old_root->v.section.children, &iter);
-	      for (mu_iterator_first (iter); !mu_iterator_is_done (iter);
-		   mu_iterator_next (iter))
-		{
-		  struct mu_cfg_cont *c;
-		  mu_iterator_current (iter, (void**)&c);
-		  mu_list_append (prog_sect->children, c);
-		}
-	      mu_iterator_destroy (&iter);
-	    }
-	}
-      else if (idp->progparam)
-	_mu_config_register_section (&cont, NULL, NULL, NULL, NULL,
-				     idp->progparam, NULL);
-    }
-  else if (idp->progparam)
-    _mu_config_register_section (&cont, NULL, NULL, NULL, NULL,
-				 idp->progparam, NULL);
-  
+  return cont;
+}
+
+static struct mu_cfg_cont *
+mu_build_container (struct mu_cfg_param *param)
+{
+  struct mu_cfg_cont *cont = mu_config_clone_root_container ();
+  mu_config_container_register_section (&cont, NULL, NULL, NULL, NULL,
+					param, NULL);
   return cont;
 }
 
 int
-mu_cfg_tree_reduce (mu_cfg_tree_t *parse_tree, const char *progname,
-		    struct mu_cfg_param *progparam, int flags,
+mu_cfg_tree_reduce (mu_cfg_tree_t *parse_tree,
+		    struct mu_cfg_parse_hints *hints,
+		    struct mu_cfg_param *progparam,
 		    void *target_ptr)
 {
   int rc = 0;
 
   if (!parse_tree)
     return 0;
-  if (flags & MU_PARSE_CONFIG_DUMP)
+  if (hints && (hints->flags & MU_PARSE_CONFIG_DUMP))
     {
       int yes = 1;
       mu_stream_t stream;
@@ -598,18 +480,9 @@ mu_cfg_tree_reduce (mu_cfg_tree_t *parse_tree, const char *progname,
 
   if (root_container)
     {
-      struct include_data idata;
-      struct mu_cfg_cont *cont;
-      
-      idata.progname = progname;
-      idata.progparam = progparam;
-      idata.flags = flags;
-      idata.target = target_ptr;
-      
-      cont = mu_build_container (progname, &idata);
-      
+      struct mu_cfg_cont *cont = mu_build_container (progparam);
       rc = mu_cfg_scan_tree (parse_tree, &cont->v.section, target_ptr,
-			     (void*) progname);
+			     NULL);
       mu_config_destroy_container (&cont);
     }
 
@@ -617,17 +490,9 @@ mu_cfg_tree_reduce (mu_cfg_tree_t *parse_tree, const char *progname,
 }
 
 void
-mu_format_config_tree (mu_stream_t stream, const char *progname,
-		       struct mu_cfg_param *progparam, int flags)
+mu_format_config_tree (mu_stream_t stream, struct mu_cfg_param *progparam)
 {
-  struct include_data idata;
-  struct mu_cfg_cont *cont;
-  
-  idata.progname = progname;
-  idata.progparam = progparam;
-  idata.flags = flags;
-  idata.target = NULL;
-  cont = mu_build_container (progname, &idata);
+  struct mu_cfg_cont *cont = mu_build_container (progparam);
   mu_cfg_format_container (stream, cont);
   mu_config_destroy_container (&cont);
 }
diff --git a/libmailutils/cfg/lexer.l b/libmailutils/cfg/lexer.l
index 9f2c719..3762d5d 100644
--- a/libmailutils/cfg/lexer.l
+++ b/libmailutils/cfg/lexer.l
@@ -390,12 +390,11 @@ mu_get_config (const char *file, const char *progname,
       struct mu_cfg_parse_hints hints;
 
       hints.flags = flags | MU_CFG_PARSE_PROGRAM;
-      hints.program = progname;
+      hints.program = (char*)progname;
       
       rc = mu_cfg_tree_postprocess (parse_tree, &hints);
       if (rc == 0)
-	rc = mu_cfg_tree_reduce (parse_tree, progname, progparam, flags,
-				 target_ptr);
+	rc = mu_cfg_tree_reduce (parse_tree, &hints, progparam, target_ptr);
       mu_cfg_destroy_tree (&parse_tree);
     }
 
diff --git a/libmu_argp/muinit.c b/libmu_argp/muinit.c
index cd769eb..93047c4 100644
--- a/libmu_argp/muinit.c
+++ b/libmu_argp/muinit.c
@@ -137,6 +137,16 @@ mu_app_init (struct argp *myargp, const char **capa,
       char *comment;
       char *canonical_name = get_canonical_name ();
       mu_stream_t stream;
+      struct mu_cfg_cont *cont;
+      static struct mu_cfg_param dummy_include_param[] = {
+	{ "include", mu_cfg_string, NULL, 0, NULL,
+	  N_("Include contents of the given file.  If a directory is given, "
+	     "include contents of the file <file>/<program>, where "
+	     "<program> is the name of the program.  This latter form is "
+	     "allowed only in the site-wide configuration file."),
+	  N_("file-or-directory") },
+	{ NULL }
+      };
 
       mu_stdio_stream_create (&stream, MU_STDOUT_FD, 0);
 
@@ -156,8 +166,15 @@ mu_app_init (struct argp *myargp, const char **capa,
 		   canonical_name);
       mu_cfg_format_docstring (stream, comment, 0);
       free (comment);
+
+      cont = mu_config_clone_root_container ();
+      mu_config_container_register_section (&cont, NULL, NULL, NULL, NULL,
+					    dummy_include_param, NULL);
+      mu_config_container_register_section (&cont, NULL, NULL, NULL, NULL,
+					    cfg_param, NULL);
+      mu_cfg_format_container (stream, cont);
+      mu_config_destroy_container (&cont);
       
-      mu_format_config_tree (stream, mu_program_name, cfg_param, 0);
       mu_stream_destroy (&stream);
       exit (0);
     }
@@ -167,14 +184,16 @@ mu_app_init (struct argp *myargp, const char **capa,
     {
       struct mu_cfg_parse_hints hints = { MU_PARSE_CONFIG_PLAIN };
 
+      hints.flags |= MU_CFG_PARSE_PROGRAM;
+      hints.program = (char*)mu_program_name;
+
       if (mu_cfg_parser_verbose)
 	hints.flags |= MU_PARSE_CONFIG_VERBOSE;
       if (mu_cfg_parser_verbose > 1)
 	hints.flags |= MU_PARSE_CONFIG_DUMP;
       mu_cfg_tree_postprocess (mu_argp_tree, &hints);
       mu_cfg_tree_union (&parse_tree, &mu_argp_tree);
-      rc = mu_cfg_tree_reduce (parse_tree, mu_program_name, cfg_param,
-			       hints.flags, data);
+      rc = mu_cfg_tree_reduce (parse_tree, &hints, cfg_param, data);
     }
   
   if (mu_rcfile_lint)
diff --git a/libmu_cfg/init.c b/libmu_cfg/init.c
index 1429075..86f1c83 100644
--- a/libmu_cfg/init.c
+++ b/libmu_cfg/init.c
@@ -79,8 +79,8 @@ mu_libcfg_init (char **cnames)
 	    mu_error (_("unknown configuration group requested `%s'"),
 		      cnames[i]);
 	  else
-	    mu_config_register_section (NULL, cp->name, NULL,
-					cp->parser, cp->cfgparam);
+	    mu_config_root_register_section (NULL, cp->name, NULL,
+					     cp->parser, cp->cfgparam);
 	}
     }
 }
diff --git a/mu/acl.c b/mu/acl.c
index 6cd9be3..9e9fd8b 100644
--- a/mu/acl.c
+++ b/mu/acl.c
@@ -113,7 +113,6 @@ mutool_acl (int argc, char **argv)
   mu_acl_result_t result;
   mu_cfg_tree_t *tree = NULL, *temp_tree = NULL;
   mu_cfg_node_t *node;
-  int flags = 0;
   
   if (argp_parse (&acl_argp, argc, argv, ARGP_IN_ORDER, &index, NULL))
     return 1;
@@ -148,8 +147,7 @@ mutool_acl (int argc, char **argv)
 
   mu_cfg_tree_create (&temp_tree);
   mu_cfg_tree_add_node (temp_tree, node);
-  rc = mu_cfg_tree_reduce (temp_tree, mu_program_name, acl_cfg_param,
-			   flags, NULL);
+  rc = mu_cfg_tree_reduce (temp_tree, NULL, acl_cfg_param, NULL);
   if (rc)
     return 1;
   if (!acl)
diff --git a/sieve/sieve.c b/sieve/sieve.c
index a62d2fb..07c41f5 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -293,8 +293,8 @@ static struct mu_cfg_param sieve_cfg_param[] = {
     N_("Debug flags.  Argument consists of one or more of the following "
        "flags:\n"
        "   g - main parser traces\n"
-       "   T - mailutils traces (MU_DEBUG_TRACE0-MU_DEBUG_TRACE1)\n"
-       "   P - network protocols (MU_DEBUG_PROT)\n"
+       "   T - mailutils traces (sieve.trace9)\n"
+       "   P - network protocols (sieve.prot)\n"
        "   t - sieve trace (MU_SIEVE_DEBUG_TRACE)\n"
        "   i - sieve instructions trace (MU_SIEVE_DEBUG_INSTR).") },
   { "verbose", mu_cfg_bool, &verbose, 0, NULL,
@@ -467,7 +467,7 @@ main (int argc, char *argv[])
   if (mu_app_init (&argp, sieve_argp_capa, sieve_cfg_param, 
 		   argc, argv, ARGP_IN_ORDER, NULL, NULL))
     exit (EX_USAGE);
-
+  
   if (!script)
     {
       mu_error (_("script must be specified"));
diff --git a/sieve/tests/testsuite.at b/sieve/tests/testsuite.at
index 0f381dc..d2c4426 100644
--- a/sieve/tests/testsuite.at
+++ b/sieve/tests/testsuite.at
@@ -28,6 +28,12 @@ AT_CLEANUP
 ])
 
 dnl ------------------------------------------------------------
+m4_define([MUT_SIEVE_DEFAULT_OPTIONS],[dnl
+ --no-site-config dnl
+ --no-user-config dnl
+])
+
+dnl ------------------------------------------------------------
 dnl MUT_SIEVE_OPTIONS  -- additional command line options for Sieve
 m4_define([MUT_SIEVE_OPTIONS])
 
@@ -38,10 +44,9 @@ m4_define([MUT_SIEVE_MAILBOX],[sieve.mbox])
 dnl ------------------------------------------------------------
 m4_define([MUT_SIEVE_CMDLINE],[dnl
  --verbose dnl
+ MUT_SIEVE_DEFAULT_OPTIONS dnl
  --line-info=no dnl
  --no-program-name dnl
- --no-site-config dnl
- --no-user-config dnl
  -M sendmail:$abs_top_builddir/examples/mta dnl
  --email foobar@nonexistent.net])
  
@@ -53,7 +58,7 @@ dnl
 m4_define([MUT_SIEVE_COMPILE],[
 AT_DATA([prog],[$1
 ])
-AT_CHECK([sieve MUT_SIEVE_OPTIONS -c prog],m4_shift($@))])
+AT_CHECK([sieve MUT_SIEVE_DEFAULT_OPTIONS MUT_SIEVE_OPTIONS -c prog],m4_shift($@))])
 
 dnl ------------------------------------------------------------
 dnl MUT_SIEVE_RUN(SCRIPT, MBOX, [ADD-TEST = `'],


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Mon Mar 07 08:50:24 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1PwapM-0001nS-F8
	for mharc-commit-mailutils@gnu.org; Mon, 07 Mar 2011 08:50:24 -0500
Received: from [140.186.70.92] (port=51830 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PwapJ-0001mU-C9
	for commit-mailutils@gnu.org; Mon, 07 Mar 2011 08:50:22 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PwapH-00020S-Uo
	for commit-mailutils@gnu.org; Mon, 07 Mar 2011 08:50:21 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:46453
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PwapH-00020G-Fc
	for commit-mailutils@gnu.org; Mon, 07 Mar 2011 08:50:19 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PwapG-0007JA-D5
	for commit-mailutils@gnu.org; Mon, 07 Mar 2011 13:50:18 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PwapF-0005W3-77
	for commit-mailutils@gnu.org; Mon, 07 Mar 2011 13:50:18 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ad938c5af5952cfbe1cb9782999a674eb5ceddbb
X-Git-Newrev: 4bcd5c9de0cb6ca85bcc3a35b1518739b939b009
Message-Id: <E1PwapF-0005W3-77@vcs-noshell.in.savannah.gnu.org>
Date: Mon, 07 Mar 2011 13:50:17 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-354-g4bcd5c9
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Mar 2011 13:50:22 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=4bcd5c9de0cb6ca85bcc3a35b1518739b939b009

The branch, master has been updated
       via  4bcd5c9de0cb6ca85bcc3a35b1518739b939b009 (commit)
      from  ad938c5af5952cfbe1cb9782999a674eb5ceddbb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4bcd5c9de0cb6ca85bcc3a35b1518739b939b009
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Mon Mar 7 15:47:15 2011 +0200

    New global variable mu_site_rcfile keeps the name of the site-wide configuration file.
    
    * include/mailutils/gocs.h (mu_site_rcfile): New extern.
    * include/mailutils/libcfg.h (MU_CONFIG_FILE): Remove.
    (mu_register_cfg_capa): Remove proto.
    (mu_libcfg_register_capa): New proto.
    * libmailutils/cfg/gocs.c (mu_site_rcfile): New variable.
    
    * libmu_argp/muinit.c (mu_app_init): Use mu_site_rcfile instead
    of MU_CONFIG_FILE.
    Destroy parse_tree when no longer needed.
    * libmu_cfg/init.c (cfg_capa_table): Static.
    (find_cfg_capa): Likewise.
    (reserved_name): Treat names starting with dot as reserved.
    (mu_libcfg_register_capa): New function.
    (mu_libcfg_parse_config): Use mu_site_rcfile instead
    of MU_CONFIG_FILE.
    * mu/query.c (mutool_query): Use mu_site_rcfile instead
    of MU_CONFIG_FILE.

-----------------------------------------------------------------------

Summary of changes:
 include/mailutils/gocs.h   |    1 +
 include/mailutils/libcfg.h |    9 +--------
 libmailutils/cfg/gocs.c    |    5 +++++
 libmu_argp/muinit.c        |    3 ++-
 libmu_cfg/init.c           |   24 ++++++++++++++++++++----
 mu/query.c                 |    2 +-
 6 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/include/mailutils/gocs.h b/include/mailutils/gocs.h
index 781a3d9..c4e0310 100644
--- a/include/mailutils/gocs.h
+++ b/include/mailutils/gocs.h
@@ -70,6 +70,7 @@ struct mu_gocs_virtual
 };
 
 /* Auxiliary variables for use by libargp/libcfg */
+extern char *mu_site_rcfile;
 extern int mu_load_user_rcfile;
 extern int mu_load_site_rcfile;
 extern char *mu_load_rcfile;
diff --git a/include/mailutils/libcfg.h b/include/mailutils/libcfg.h
index 6574d58..6a36b53 100644
--- a/include/mailutils/libcfg.h
+++ b/include/mailutils/libcfg.h
@@ -25,10 +25,6 @@
 #include <mailutils/error.h>
 #include <mailutils/errno.h>
 
-#ifndef MU_CONFIG_FILE
-# define MU_CONFIG_FILE SYSCONFDIR "/mailutils.rc"
-#endif
-
 #ifndef MU_USER_CONFIG_FILE
 # define MU_USER_CONFIG_FILE "~/.mailutils"
 #endif
@@ -44,10 +40,7 @@ struct mu_cfg_capa
   mu_cfg_section_fp parser;
 };
 
-extern int mu_register_cfg_capa (const char *name,
-				 struct mu_cfg_param *cfgparam,
-				 mu_cfg_section_fp *parser);
-
+extern int mu_libcfg_register_capa (struct mu_cfg_capa *capa);
 extern void mu_libcfg_init (char **cnames);
 extern int mu_parse_config_files (struct mu_cfg_param *param,
 				  void *target_ptr) MU_CFG_DEPRECATED;
diff --git a/libmailutils/cfg/gocs.c b/libmailutils/cfg/gocs.c
index 9dd1bab..ba376b3 100644
--- a/libmailutils/cfg/gocs.c
+++ b/libmailutils/cfg/gocs.c
@@ -38,6 +38,11 @@
 #include <mailutils/log.h>
 #include <syslog.h>
 
+#ifndef MU_CONFIG_FILE
+# define MU_CONFIG_FILE SYSCONFDIR "/mailutils.rc"
+#endif
+
+char *mu_site_rcfile = MU_CONFIG_FILE;
 int mu_load_user_rcfile = 1;
 int mu_load_site_rcfile = 1;
 char *mu_load_rcfile = NULL;
diff --git a/libmu_argp/muinit.c b/libmu_argp/muinit.c
index 93047c4..4f73948 100644
--- a/libmu_argp/muinit.c
+++ b/libmu_argp/muinit.c
@@ -158,7 +158,7 @@ mu_app_init (struct argp *myargp, const char **capa,
       mu_asprintf (&comment,
 		   "For use in global configuration file (%s), enclose it "
 		   "in `program %s { ... };",
-		   MU_CONFIG_FILE,
+		   mu_site_rcfile,
 		   mu_program_name);		   
       mu_cfg_format_docstring (stream, comment, 0);
       free (comment);
@@ -207,6 +207,7 @@ mu_app_init (struct argp *myargp, const char **capa,
   
   mu_gocs_flush ();
   mu_cfg_destroy_tree (&mu_argp_tree);
+  mu_cfg_destroy_tree (&parse_tree);
 
   return !!(rc || mu_cfg_error_count);
 }
diff --git a/libmu_cfg/init.c b/libmu_cfg/init.c
index 86f1c83..1f885a2 100644
--- a/libmu_cfg/init.c
+++ b/libmu_cfg/init.c
@@ -24,7 +24,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-struct mu_cfg_capa *cfg_capa_table[] = {
+#define CFG_CAPA_MAX 512
+static struct mu_cfg_capa *cfg_capa_table[CFG_CAPA_MAX] = {
 #define S(c) &__mu_common_cat3__(mu_,c,_cfg_capa)
   S (auth),
   S (mailbox),
@@ -44,7 +45,9 @@ struct mu_cfg_capa *cfg_capa_table[] = {
   NULL
 };
 
-struct mu_cfg_capa *
+static int cfg_capa_index = MU_ARRAY_SIZE(cfg_capa_table) - 1;
+
+static struct mu_cfg_capa *
 find_cfg_capa (const char *name)
 {
   int i;
@@ -60,12 +63,25 @@ reserved_name (const char *name)
 {
   static char *reserved[] = { "common", NULL };
   char **p;
+
+  if (name[0] == '.')
+    return 1;
+  
   for (p = reserved; *p; p++)
     if (strcmp (name, *p) == 0)
       return 1;
   return 0;
 }
 
+int
+mu_libcfg_register_capa (struct mu_cfg_capa *capa)
+{
+  if (cfg_capa_index == CFG_CAPA_MAX)
+    return MU_ERR_NOENT;
+  cfg_capa_table[cfg_capa_index++] = capa;
+  return 0;
+}
+
 void
 mu_libcfg_init (char **cnames)
 {
@@ -100,7 +116,7 @@ mu_libcfg_parse_config (mu_cfg_tree_t **ptree)
   if (mu_load_site_rcfile)
     {
       hints.flags |= MU_CFG_PARSE_SITE_RCFILE;
-      hints.site_rcfile = MU_CONFIG_FILE;
+      hints.site_rcfile = mu_site_rcfile;
     }
   
   if (mu_load_user_rcfile && mu_program_name)
@@ -134,7 +150,7 @@ mu_parse_config_files (struct mu_cfg_param *param, void *target)
   
   if (mu_load_site_rcfile)
     {
-      rc = mu_parse_config (MU_CONFIG_FILE, mu_program_name, param,
+      rc = mu_parse_config (mu_site_rcfile, mu_program_name, param,
 			    flags | MU_PARSE_CONFIG_GLOBAL, target);
       if (rc == ENOMEM)
 	{
diff --git a/mu/query.c b/mu/query.c
index b089af0..b798fe8 100644
--- a/mu/query.c
+++ b/mu/query.c
@@ -114,7 +114,7 @@ mutool_query (int argc, char **argv)
     }
 
   hints.flags |= MU_CFG_PARSE_SITE_RCFILE | MU_PARSE_CONFIG_GLOBAL;
-  hints.site_rcfile = file_name ? file_name : MU_CONFIG_FILE;
+  hints.site_rcfile = file_name ? file_name : mu_site_rcfile;
   
   if (mu_cfg_parse_config (&tree, &hints))
     return 1;


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Wed Mar 09 09:18:07 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1PxKDH-0007Pt-1p
	for mharc-commit-mailutils@gnu.org; Wed, 09 Mar 2011 09:18:07 -0500
Received: from [140.186.70.92] (port=43907 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PxKDD-0007O8-UP
	for commit-mailutils@gnu.org; Wed, 09 Mar 2011 09:18:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PxKDC-0000T0-97
	for commit-mailutils@gnu.org; Wed, 09 Mar 2011 09:18:03 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:39801
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PxKDC-0000Sq-7S
	for commit-mailutils@gnu.org; Wed, 09 Mar 2011 09:18:02 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PxKDB-0007YE-6q
	for commit-mailutils@gnu.org; Wed, 09 Mar 2011 14:18:01 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PxKD9-0006v9-A4
	for commit-mailutils@gnu.org; Wed, 09 Mar 2011 14:18:00 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4bcd5c9de0cb6ca85bcc3a35b1518739b939b009
X-Git-Newrev: ac1262fb8a5d845c9e16a9679239142d0bf00522
Message-Id: <E1PxKD9-0006v9-A4@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 09 Mar 2011 14:17:59 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-355-gac1262f
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Mar 2011 14:18:05 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=ac1262fb8a5d845c9e16a9679239142d0bf00522

The branch, master has been updated
       via  ac1262fb8a5d845c9e16a9679239142d0bf00522 (commit)
      from  4bcd5c9de0cb6ca85bcc3a35b1518739b939b009 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ac1262fb8a5d845c9e16a9679239142d0bf00522
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Wed Mar 9 16:15:53 2011 +0200

    mail: bugfix
    
    * mail/mailline.c (ml_readline_internal): Remove trailing \n.

-----------------------------------------------------------------------

Summary of changes:
 mail/mailline.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/mail/mailline.c b/mail/mailline.c
index 5151f71..c78e7b9 100644
--- a/mail/mailline.c
+++ b/mail/mailline.c
@@ -135,6 +135,7 @@ ml_readline_internal ()
     }
   if (n == 0)
     return NULL;
+  mu_rtrim_cset (buf, "\n");
   return buf;
 }
 


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Thu Mar 10 03:00:52 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Pxank-0002lR-En
	for mharc-commit-mailutils@gnu.org; Thu, 10 Mar 2011 03:00:52 -0500
Received: from [140.186.70.92] (port=60924 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Pxani-0002lJ-NN
	for commit-mailutils@gnu.org; Thu, 10 Mar 2011 03:00:51 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Pxanh-0004gO-7T
	for commit-mailutils@gnu.org; Thu, 10 Mar 2011 03:00:50 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:51611
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Pxanh-0004gJ-4W
	for commit-mailutils@gnu.org; Thu, 10 Mar 2011 03:00:49 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Pxang-000369-C5
	for commit-mailutils@gnu.org; Thu, 10 Mar 2011 08:00:48 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Pxanc-0004jG-3y
	for commit-mailutils@gnu.org; Thu, 10 Mar 2011 08:00:47 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ac1262fb8a5d845c9e16a9679239142d0bf00522
X-Git-Newrev: 0ac52e06cb1cb91602ee4dc4de32f66423e96b32
Message-Id: <E1Pxanc-0004jG-3y@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 10 Mar 2011 08:00:46 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-356-g0ac52e0
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Mar 2011 08:00:52 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=0ac52e06cb1cb91602ee4dc4de32f66423e96b32

The branch, master has been updated
       via  0ac52e06cb1cb91602ee4dc4de32f66423e96b32 (commit)
      from  ac1262fb8a5d845c9e16a9679239142d0bf00522 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0ac52e06cb1cb91602ee4dc4de32f66423e96b32
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Thu Mar 10 09:58:45 2011 +0200

    message_stream: deduce default envelope address from the current user email
    
    * libmailutils/stream/message_stream.c: Unless specified otherwise,
    set envelope address based on the current user email.
    * mh/tests/burst.at: Remove all X-Envelope headers before comparison.

-----------------------------------------------------------------------

Summary of changes:
 libmailutils/stream/message_stream.c |   14 ++++++++------
 mh/tests/burst.at                    |   18 ++++++------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/libmailutils/stream/message_stream.c b/libmailutils/stream/message_stream.c
index ecef8bf..03e0260 100644
--- a/libmailutils/stream/message_stream.c
+++ b/libmailutils/stream/message_stream.c
@@ -236,13 +236,15 @@ _message_open (mu_stream_t stream)
 	  mu_address_t addr;
 	  
 	  mu_address_create (&addr, from);
-	  if (!addr
-	      || mu_address_aget_email (addr, 1, &env_from))
-	    env_from = mu_strdup ("GNU-Mailutils");
-	  mu_address_destroy (&addr);
+	  if (addr)
+	    {
+	      mu_address_aget_email (addr, 1, &env_from);
+	      mu_address_destroy (&addr);
+	    }
 	}
-      else
-	env_from = mu_strdup ("GNU-MH");
+
+      if (!env_from)
+	env_from = mu_get_user_email (NULL);
     }
   free (from);
   
diff --git a/mh/tests/burst.at b/mh/tests/burst.at
index 6e6a4f9..2e383a2 100644
--- a/mh/tests/burst.at
+++ b/mh/tests/burst.at
@@ -40,16 +40,15 @@ Sergey
 ])
 
 burst +inbox 1 || exit $?
-grep -v ^X-Envelope-Date Mail/inbox/2
-grep -v ^X-Envelope-Date Mail/inbox/3
-grep -v ^X-Envelope-Date Mail/inbox/4
+grep -v ^X-Envelope- Mail/inbox/2
+grep -v ^X-Envelope- Mail/inbox/3
+grep -v ^X-Envelope- Mail/inbox/4
 ],
 [0],
 [X-Burst-Part: 1 1 01
 From: Sergey Poznyakoff <gray@example.net>
 To: root@example.com
 Subject: digest
-X-Envelope-Sender: gray@example.net
 
 Initial text.
 
@@ -57,13 +56,11 @@ X-Burst-Part: 1 2 02
 From: Puszcza hackers
 To: Sergey Poznyakoff <gray@gnu.org>
 Subject: Hello
-X-Envelope-Sender: GNU-Mailutils
 
 Greetings
 ---------
 How are you?
 X-Burst-Part: 1 3 00
-X-Envelope-Sender: GNU-MH
 
 Regards,
 Sergey
@@ -93,16 +90,15 @@ Sergey
 ])
 
 burst +inbox --length=7 1 || exit $?
-grep -v ^X-Envelope-Date Mail/inbox/2
-grep -v ^X-Envelope-Date Mail/inbox/3
-grep -v ^X-Envelope-Date Mail/inbox/4
+grep -v ^X-Envelope- Mail/inbox/2
+grep -v ^X-Envelope- Mail/inbox/3
+grep -v ^X-Envelope- Mail/inbox/4
 ],
 [0],
 [X-Burst-Part: 1 1 01
 From: Sergey Poznyakoff <gray@example.net>
 To: root@example.com
 Subject: digest
-X-Envelope-Sender: gray@example.net
 
 Initial text.
 
@@ -110,13 +106,11 @@ X-Burst-Part: 1 2 02
 From: Puszcza hackers
 To: Sergey Poznyakoff <gray@gnu.org>
 Subject: Hello
-X-Envelope-Sender: GNU-Mailutils
 
 Greetings
 -----
 How are you?
 X-Burst-Part: 1 3 00
-X-Envelope-Sender: GNU-MH
 
 Regards,
 Sergey


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Wed Mar 16 20:36:50 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q01Cs-00055j-KN
	for mharc-commit-mailutils@gnu.org; Wed, 16 Mar 2011 20:36:50 -0400
Received: from [140.186.70.92] (port=57288 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q01Cp-0004z6-HI
	for commit-mailutils@gnu.org; Wed, 16 Mar 2011 20:36:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q01Cn-00014P-C2
	for commit-mailutils@gnu.org; Wed, 16 Mar 2011 20:36:47 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:48508
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q01Cn-00014F-8t
	for commit-mailutils@gnu.org; Wed, 16 Mar 2011 20:36:45 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q01Cm-0005GF-QK
	for commit-mailutils@gnu.org; Thu, 17 Mar 2011 00:36:45 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q01Cl-00068t-Lj
	for commit-mailutils@gnu.org; Thu, 17 Mar 2011 00:36:44 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0ac52e06cb1cb91602ee4dc4de32f66423e96b32
X-Git-Newrev: 02634d3bf0932b8bde43a881d67760f38e3f9e9f
Message-Id: <E1Q01Cl-00068t-Lj@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 17 Mar 2011 00:36:43 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-357-g02634d3
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Mar 2011 00:36:49 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=02634d3bf0932b8bde43a881d67760f38e3f9e9f

The branch, master has been updated
       via  02634d3bf0932b8bde43a881d67760f38e3f9e9f (commit)
      from  0ac52e06cb1cb91602ee4dc4de32f66423e96b32 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 02634d3bf0932b8bde43a881d67760f38e3f9e9f
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Thu Mar 17 01:30:34 2011 +0200

    Bugfixes.
    
    * comsat/action.c (action_echo): Set omit_newline.
    * libmailutils/mailbox/mbx_default.c: Return 0 on success.
    Fix memory overrun.
    
    * libproto/mailer/smtp.c (smtp_open): Protect tls-related
    code with #ifdef WITH_TLS.
    * libproto/pop/mbox.c (pop_open): Likewise.
    * mu/imap.c (com_connect): Likewise.
    
    * mh/mhn.c (split_args): Preserve quotes.
    (mhn_compose_command): Handle type arguments (%a escape).
    (mhn_show_command): Likewise.
    (store_handler): Fix call to mh_getyn.
    (edit_mime): Pass typeargs to mhn_compose_command.
    Fix test for missing filename.
    * mh/tests/ali.at (ali04): The test wrongly assumed that the
    `root' group has some members.
    * mh/tests/folder.at: Always sort the output from find.
    * mh/tests/rmf.at: Likewise.
    * mh/tests/mhn.at: Likewise.
    Filter out timestamps from the tar output produced by mhn.
    
    * tests/testsuite.at (MH_SETUP): Define moreproc.
    * mh/tests/mhparam.at: Account for changes in mh_profile

-----------------------------------------------------------------------

Summary of changes:
 comsat/action.c                    |    3 ++
 libmailutils/mailbox/mbx_default.c |    5 +--
 libproto/mailer/smtp.c             |    3 +-
 libproto/pop/mbox.c                |    5 ++-
 mh/mhn.c                           |   57 +++++++++++++++++++++++++++---------
 mh/tests/ali.at                    |    9 ++---
 mh/tests/folder.at                 |    4 +-
 mh/tests/install-mh.at             |    2 +-
 mh/tests/mhn.at                    |   35 ++++++++++++++++------
 mh/tests/mhparam.at                |    1 +
 mh/tests/rmf.at                    |    4 +-
 mh/tests/send.at                   |    2 +-
 mh/tests/testsuite.at              |    1 +
 mu/imap.c                          |   11 +++----
 14 files changed, 95 insertions(+), 47 deletions(-)

diff --git a/comsat/action.c b/comsat/action.c
index a5a5ff7..81cdf28 100644
--- a/comsat/action.c
+++ b/comsat/action.c
@@ -353,6 +353,9 @@ action_echo (struct biffrc_environ *env, size_t argc, char **argv)
       omit_newline = 1;
       i++;
     }
+  else
+    omit_newline = 0;
+
   for (;;)
     {
       echo_string (env->tty, argv[i]);
diff --git a/libmailutils/mailbox/mbx_default.c b/libmailutils/mailbox/mbx_default.c
index f44bbef..0556304 100644
--- a/libmailutils/mailbox/mbx_default.c
+++ b/libmailutils/mailbox/mbx_default.c
@@ -136,14 +136,13 @@ mu_folder_directory ()
 int
 mu_construct_user_mailbox_url (char **pout, const char *name)
 {
-  int rc;
   const char *pat = mu_mailbox_url ();
   const char *env[3];
   struct mu_wordsplit ws;
 
   env[0] = "user";
   env[1] = (char*) name;
-  env[3] = NULL;
+  env[2] = NULL;
   ws.ws_env = env;
   if (mu_wordsplit (pat, &ws,
 		    MU_WRDSF_NOSPLIT | MU_WRDSF_NOCMD |
@@ -162,7 +161,7 @@ mu_construct_user_mailbox_url (char **pout, const char *name)
   mu_wordsplit_free (&ws);
   if (!*pout)
     return ENOMEM;
-  return rc;
+  return 0;
 }
 
 /* Is this a security risk?  */
diff --git a/libproto/mailer/smtp.c b/libproto/mailer/smtp.c
index e5026fe..fdda4b6 100644
--- a/libproto/mailer/smtp.c
+++ b/libproto/mailer/smtp.c
@@ -182,6 +182,7 @@ smtp_open (mu_mailer_t mailer, int flags)
   if (rc)
     return rc;
 
+#ifdef WITH_TLS
   if (!notls && mu_tls_enable &&
       mu_smtp_capa_test (smtp_mailer->smtp, "STARTTLS", NULL) == 0)
     {
@@ -193,7 +194,7 @@ smtp_open (mu_mailer_t mailer, int flags)
 	    return rc;
 	}
     }
-
+#endif
   if (!noauth && mu_smtp_capa_test (smtp_mailer->smtp, "AUTH", NULL) == 0)
     {
       rc = mu_smtp_auth (smtp_mailer->smtp);
diff --git a/libproto/pop/mbox.c b/libproto/pop/mbox.c
index b60c66e..3a9102b 100644
--- a/libproto/pop/mbox.c
+++ b/libproto/pop/mbox.c
@@ -173,7 +173,8 @@ pop_open (mu_mailbox_t mbox, int flags)
       if (status)
 	break;
 
-      if (WITH_TLS && !mpd->pops &&
+#ifdef WITH_TLS      
+      if (!mpd->pops &&
 	  mu_url_sget_param (mbox->url, "notls", NULL) == MU_ERR_NOENT &&
 	  mu_pop3_capa_test (mpd->pop3, "STLS", NULL) == 0)
 	{
@@ -181,7 +182,7 @@ pop_open (mu_mailbox_t mbox, int flags)
 	  if (status)
 	    break;
 	}
-
+#endif
       status = mu_authority_authenticate (mbox->folder->authority);
     }
   while (0);
diff --git a/mh/mhn.c b/mh/mhn.c
index 0c36d72..cb634ca 100644
--- a/mh/mhn.c
+++ b/mh/mhn.c
@@ -208,7 +208,8 @@ split_args (const char *argstr, size_t len, int *pargc, char ***pargv)
 
   ws.ws_delim = ";";
   if (mu_wordsplit_len (argstr, len, &ws,
-			MU_WRDSF_DEFFLAGS | MU_WRDSF_DELIM | MU_WRDSF_WS))
+			(MU_WRDSF_DEFFLAGS & ~MU_WRDSF_QUOTE) |
+			MU_WRDSF_DELIM | MU_WRDSF_WS))
     {
       mu_error (_("cannot split line `%s': %s"), argstr,
 		mu_wordsplit_strerror (&ws));
@@ -629,10 +630,11 @@ _mhn_profile_get (const char *prefix, const char *type, const char *subtype,
 }
 
 char *
-mhn_compose_command (char *typestr, int *flags, char *file)
+mhn_compose_command (char *typestr, char *typeargs, int *flags, char *file)
 {
   const char *p, *str;
-  char *type, *subtype, *typeargs;
+  char *type, *subtype, **typeargv = NULL;
+  int typeargc = 0;
   struct obstack stk;
 
   split_content (typestr, &type, &subtype);
@@ -660,7 +662,20 @@ mhn_compose_command (char *typestr, int *flags, char *file)
 	    {
 	    case 'a':
 	      /* additional arguments */
-	      obstack_grow (&stk, typeargs, strlen (typeargs));
+	      if (typeargs)
+		{
+		  int i;
+		  
+		  if (!typeargv)
+		    split_args (typeargs, strlen (typeargs),
+				&typeargc, &typeargv);
+		  for (i = 0; i < typeargc; i++)
+		    {
+		      if (i > 0)
+			obstack_1grow (&stk, ' ');
+		      obstack_grow (&stk, typeargv[i], strlen (typeargv[i]));
+		    }
+		}
 	      break;
 	      
 	    case 'F':
@@ -688,7 +703,8 @@ mhn_compose_command (char *typestr, int *flags, char *file)
 
   free (type);
   free (subtype);
-
+  mu_argcv_free (typeargc, typeargv);
+    
   str = obstack_finish (&stk);
   p = mu_str_skip_class (str, MU_CTYPE_SPACE);
   if (!*p)
@@ -755,6 +771,8 @@ mhn_show_command (mu_message_t msg, msg_part_t part, int *flags,
   struct obstack stk;
   mu_header_t hdr;
   char *temp_cmd = NULL;
+  int typeargc = 0;
+  char **typeargv = NULL;
   
   mu_message_get_header (msg, &hdr);
   _get_content_type (hdr, &typestr, &typeargs);
@@ -824,7 +842,20 @@ mhn_show_command (mu_message_t msg, msg_part_t part, int *flags,
 	    {
 	    case 'a':
 	      /* additional arguments */
-	      obstack_grow (&stk, typeargs, strlen (typeargs));
+	      if (typeargs)
+		{
+		  int i;
+		  
+		  if (!typeargv)
+		    split_args (typeargs, strlen (typeargs),
+				&typeargc, &typeargv);
+		  for (i = 0; i < typeargc; i++)
+		    {
+		      if (i > 0)
+			obstack_1grow (&stk, ' ');
+		      obstack_grow (&stk, typeargv[i], strlen (typeargv[i]));
+		    }
+		}
 	      break;
 	      
 	    case 'e':
@@ -883,6 +914,7 @@ mhn_show_command (mu_message_t msg, msg_part_t part, int *flags,
   free (type);
   free (subtype);
   free (temp_cmd);
+  mu_argcv_free (typeargc, typeargv);
   
   str = obstack_finish (&stk);
   p = mu_str_skip_class (str, MU_CTYPE_SPACE);
@@ -1745,12 +1777,9 @@ store_handler (mu_message_t msg, msg_part_t part, char *type, char *encoding,
 
       if (!(mode_options & OPT_QUIET) && access (name, R_OK) == 0)
 	{
-	  char *p;
 	  int ok;
 	  
-	  mu_asprintf (&p, _("File %s already exists. Rewrite"), name);
-	  ok = mh_getyn (p);
-	  free (p);
+	  ok = mh_getyn (_("File %s already exists. Rewrite"), name);
 	  if (!ok)
 	    {
 	      free (name);
@@ -2429,7 +2458,7 @@ edit_mime (char *cmd, struct compose_env *env, mu_message_t *msg, int level)
   mu_body_t body;
   mu_stream_t in, out = NULL, fstr;
   char *encoding;
-  char *p, *typestr;
+  char *typestr, *typeargs;
   char *shell_cmd;
   int flags;
   
@@ -2442,8 +2471,8 @@ edit_mime (char *cmd, struct compose_env *env, mu_message_t *msg, int level)
 
   mu_rtrim_class (cmd, MU_CTYPE_SPACE);
 
-  _get_content_type (hdr, &typestr, NULL);
-  shell_cmd = mhn_compose_command (typestr, &flags, cmd);
+  _get_content_type (hdr, &typestr, &typeargs);
+  shell_cmd = mhn_compose_command (typestr, typeargs, &flags, cmd);
   free (typestr);
 
   /* Open the input stream, whatever it is */
@@ -2452,7 +2481,7 @@ edit_mime (char *cmd, struct compose_env *env, mu_message_t *msg, int level)
       if (mhn_exec (&in, cmd, flags))
 	return 1;
     }
-  else if (p == cmd)
+  else if (cmd[0] == 0)
     {
       mu_error (_("%s:%lu: missing filename"),
 		input_file,
diff --git a/mh/tests/ali.at b/mh/tests/ali.at
index 36c1f40..8b640c7 100644
--- a/mh/tests/ali.at
+++ b/mh/tests/ali.at
@@ -74,11 +74,10 @@ ali: mh_aliases2:2: `mh_aliases' already included at top level
 ])
 
 MH_CHECK([ali: group name],[ali04 ali-group-name],[
-grep ^root: /etc/group >/dev/null || AT_SKIP_TEST
-AT_DATA([mh_aliases],[
-korzen: =root
-])
-awk -F : '$1=="root" { print $4 }' /etc/group | tr -d ' ' > expout
+awk -F : '$4!="" { print $1; print $4; exit 0 }' /etc/group > tmpout
+test -s tmpout || AT_SKIP_TEST
+sed -n '1s/.*/korzen: =&/p' tmpout > mh_aliases
+sed '1d' tmpout | tr -d ' ' > expout
 ali -a ./mh_aliases korzen | tr -d ' '
 ],
 [0],
diff --git a/mh/tests/folder.at b/mh/tests/folder.at
index f2e3314..8d89d9e 100644
--- a/mh/tests/folder.at
+++ b/mh/tests/folder.at
@@ -87,7 +87,7 @@ do
   mv Mail/inbox/$i Mail/inbox/${i}0
 done
 folder -pack || exit $?
-find Mail/inbox
+find Mail/inbox | sort
 ],
 [0],
 [Mail/inbox
@@ -105,7 +105,7 @@ do
   mv Mail/inbox/$i Mail/inbox/${i}0
 done
 folder --pack=1 || exit $?
-find Mail/inbox
+find Mail/inbox | sort
 ],
 [0],
 [Mail/inbox
diff --git a/mh/tests/install-mh.at b/mh/tests/install-mh.at
index 981e2c4..e5be717 100644
--- a/mh/tests/install-mh.at
+++ b/mh/tests/install-mh.at
@@ -21,7 +21,7 @@ AT_CHECK([
 mkdir home
 dir=`cd home; pwd`
 HOME=$dir MH=$dir/mh_profile install-mh -auto || exit $?
-find home
+find home | sort
 HOME=$dir MH=$dir/mh_profile install-mh -auto 2>errout
 echo $?
 cat errout
diff --git a/mh/tests/mhn.at b/mh/tests/mhn.at
index bd75887..7316b1c 100644
--- a/mh/tests/mhn.at
+++ b/mh/tests/mhn.at
@@ -192,7 +192,7 @@ chmod +w Mail/inbox/4
 
 echo "mhn-store-application: %%-%m%P.%s-%p" >> $MH
 mhn +inbox -store 4 | remove_curdir || exit $?
-find . -name '%*'
+find . -name '%*' | sort
 ],
 [0],
 [storing message 4 part 1 as file 4.1.plain
@@ -333,7 +333,12 @@ And the mome raths outgrabe.
 
 MH_CHECK([mhn-show type=tar],[mhn13 mhn-show-type=tar],[
 MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mime,[Mail/inbox])
-mhn -show 2 | sed /^X-IMAPbase/d
+AT_DATA([filter.awk],[
+/^X-IMAPbase/ { next }
+/^-rw-r--r--/ { print $1, $2, $3, $6; next }
+{ print }
+])
+mhn -show 2 | awk -f filter.awk
 ],
 [0],
 [Date:    Mon, 29 Nov 2010 14:04:19 +0200
@@ -348,8 +353,8 @@ X-Envelope-Sender: gray@example.net
 part     1 text/plain               15
 Initial text.
 
--rw-r--r-- gray/staff     1418 2010-11-29 13:58 Father_William
--rw-r--r-- gray/staff      937 2010-11-29 13:58 Jabberwocky
+-rw-r--r-- gray/staff 1418 Father_William
+-rw-r--r-- gray/staff 937 Jabberwocky
 ])
 
 # FIXME: What about exit code?
@@ -379,7 +384,12 @@ MH_CHECK([mhn-show- variable (with subtype)],
 [mhn15 mhn-show-with-subtype],[
 MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mime,[Mail/inbox])
 echo "mhn-show-application/x-tar: %ltar tvf '%F'" >> $MH
-mhn -show 1 | sed '/^X-IMAPbase/d;s/  *$//'
+AT_DATA([filter.awk],[
+/^X-IMAPbase/ { next }
+/^-rw-r--r--/ { print $1, $2, $3, $6; next }
+{ sub(/  *$/,"");  print }
+])
+mhn -show 1 | awk -f filter.awk
 ],
 [0],
 [Date:    Mon, 29 Nov 2010 14:00:03 +0200
@@ -395,15 +405,20 @@ part     1 text/plain               15
 Initial text.
 
 part     2 application/x-tar        13835
--rw-r--r-- gray/staff     1418 2010-11-29 13:58 Father_William
--rw-r--r-- gray/staff      937 2010-11-29 13:58 Jabberwocky
+-rw-r--r-- gray/staff 1418 Father_William
+-rw-r--r-- gray/staff 937 Jabberwocky
 ])
 
 MH_CHECK([mhn-show- variable (without subtype)],
 [mhn16 mhn-show-without-subtype],[
 MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mime,[Mail/inbox])
 echo "mhn-show-application: %ltar tvf '%F'" >> $MH
-mhn -show 1 | sed '/^X-IMAPbase/d;s/  *$//'
+AT_DATA([filter.awk],[
+/^X-IMAPbase/ { next }
+/^-rw-r--r--/ { print $1, $2, $3, $6; next }
+{ sub(/  *$/,"");  print }
+])
+mhn -show 1 | awk -f filter.awk
 ],
 [0],
 [Date:    Mon, 29 Nov 2010 14:00:03 +0200
@@ -419,8 +434,8 @@ part     1 text/plain               15
 Initial text.
 
 part     2 application/x-tar        13835
--rw-r--r-- gray/staff     1418 2010-11-29 13:58 Father_William
--rw-r--r-- gray/staff      937 2010-11-29 13:58 Jabberwocky
+-rw-r--r-- gray/staff 1418 Father_William
+-rw-r--r-- gray/staff 937 Jabberwocky
 ])
 
 dnl -------------------------------------------------------------------
diff --git a/mh/tests/mhparam.at b/mh/tests/mhparam.at
index 68be349..9720dd0 100644
--- a/mh/tests/mhparam.at
+++ b/mh/tests/mhparam.at
@@ -27,6 +27,7 @@ mhparam -all | tr '\t' ' ' | sed 's/^Path:.*/Path: Mail/;s/^mhetcdir:.*/mhetcdir
 [0],
 [Path: Mail
 mhetcdir: dir
+moreproc: /bin/cat
 Sequence-Negation: not
 Draft-Folder: Mail/drafts
 Aliasfile: .mh_aliases
diff --git a/mh/tests/rmf.at b/mh/tests/rmf.at
index 7260673..34b864c 100644
--- a/mh/tests/rmf.at
+++ b/mh/tests/rmf.at
@@ -21,7 +21,7 @@ MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1,[Mail/inbox])
 MUT_MBCOPY($abs_top_srcdir/testsuite/mh/teaparty,[Mail])
 echo 'Current-Folder: inbox' > Mail/context
 rmf +teaparty || exit $?
-find Mail -type d
+find Mail -type d | sort
 ],
 [0],
 [Mail
@@ -33,7 +33,7 @@ MUT_MBCOPY($abs_top_srcdir/testsuite/mh/mbox1,[Mail/inbox])
 MUT_MBCOPY($abs_top_srcdir/testsuite/mh/teaparty,[Mail])
 echo 'Current-Folder: teaparty' > Mail/context
 rmf || exit $?
-find Mail -type d
+find Mail -type d | sort
 ],
 [0],
 [[[+inbox now current]]
diff --git a/mh/tests/send.at b/mh/tests/send.at
index 3d9d000..ad5154d 100644
--- a/mh/tests/send.at
+++ b/mh/tests/send.at
@@ -66,7 +66,7 @@ export MTA_APPEND
 
 send ./input.1 ./input.2 || exit $?
 sed 's/: Date: .*/: Date: now/' $MTA_DIAG
-find . -name ',input.[[12]]'
+find . -name ',input.[[12]]' | sort
 ],
 [0],
 [ENVELOPE FROM: mhtester@example.net
diff --git a/mh/tests/testsuite.at b/mh/tests/testsuite.at
index 5565182..36e708a 100644
--- a/mh/tests/testsuite.at
+++ b/mh/tests/testsuite.at
@@ -24,6 +24,7 @@ export MH
 cat > $MH <<EOT
 Path: $curdir/Mail
 mhetcdir: $abs_top_srcdir/mh/etc
+moreproc: /bin/cat
 EOT
 MTSTAILOR=$curdir/mtstailor
 export MTSTAILOR
diff --git a/mu/imap.c b/mu/imap.c
index bb32f1e..85a27a3 100644
--- a/mu/imap.c
+++ b/mu/imap.c
@@ -180,13 +180,12 @@ com_connect (int argc, char **argv)
     {
       if (strcmp (argv[i], "-tls") == 0)
 	{
-	  if (WITH_TLS)
+#ifdef WITH_TLS
 	    tls = 1;
-	  else
-	    {
-	      mu_error ("TLS not supported");
-	      return 0;
-	    }
+#else
+            mu_error ("TLS not supported");
+	    return 0;
+#endif
 	}
       else
 	break;


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Thu Mar 17 03:14:06 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q07PK-0003ik-PV
	for mharc-commit-mailutils@gnu.org; Thu, 17 Mar 2011 03:14:06 -0400
Received: from [140.186.70.92] (port=35553 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q07PI-0003iU-0Q
	for commit-mailutils@gnu.org; Thu, 17 Mar 2011 03:14:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q07PG-0003rL-2k
	for commit-mailutils@gnu.org; Thu, 17 Mar 2011 03:14:03 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:44831
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q07PG-0003r2-0u
	for commit-mailutils@gnu.org; Thu, 17 Mar 2011 03:14:02 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q07PF-0001MP-DK
	for commit-mailutils@gnu.org; Thu, 17 Mar 2011 07:14:01 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q07PE-0003gL-Pv
	for commit-mailutils@gnu.org; Thu, 17 Mar 2011 07:14:01 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 02634d3bf0932b8bde43a881d67760f38e3f9e9f
X-Git-Newrev: dd33613b562970a194917f1934aeab56e3cfc4f9
Message-Id: <E1Q07PE-0003gL-Pv@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 17 Mar 2011 07:14:01 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-358-gdd33613
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Mar 2011 07:14:05 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=dd33613b562970a194917f1934aeab56e3cfc4f9

The branch, master has been updated
       via  dd33613b562970a194917f1934aeab56e3cfc4f9 (commit)
      from  02634d3bf0932b8bde43a881d67760f38e3f9e9f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dd33613b562970a194917f1934aeab56e3cfc4f9
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Thu Mar 17 09:08:21 2011 +0200

    More bugfixes.
    
    * examples/mblconv.c (main): Return 0.
    * examples/murun.c (main): Fix iteration body.
    * imap4d/append.c: Do not pass constructed string as format
    argument to io_completion_response, use %s instead.
    * imap4d/close.c: Likewise.
    * imap4d/create.c: Likewise.
    * imap4d/delete.c: Likewise.
    * imap4d/rename.c: Likewise.
    * imap4d/status.c: Likewise.
    * libmailutils/base/mutil.c (mutil_parse_field_map): Fix return
    code in case of wordsplit failure.
    * libmailutils/cfg/parser.y (GETSNUM): Initialize sign.
    * libmailutils/stream/streamref.c (_streamref_ctl)
    <MU_IOCTL_SEEK_LIMITS>: Initialize lim.
    * libmailutils/string/wordsplit.c: Typecast format width arguments
    to int.
    * libmu_sieve/extensions/vacation.c (check_db): Initialize days.
    Pass correct time value to test_and_update_prop.
    * libproto/pop/mbox.c (pop_create_pop3_message): Fix return code.
    * mail/mail.c (do_and_quit): Pass the command to util_do_command
    via the %s format.
    * mail/unset.c (mail_unset): Likewise.
    * mh/mh_fmtgram.y (function production): LIkewise for mu_error.
    * mu/logger.c (mutool_logger): Fix return code in case
    of mu_stdstream_strerr_create failure.

-----------------------------------------------------------------------

Summary of changes:
 examples/mblconv.c                |    1 +
 examples/murun.c                  |    5 +++--
 imap4d/append.c                   |    2 +-
 imap4d/close.c                    |    2 +-
 imap4d/create.c                   |    2 +-
 imap4d/delete.c                   |    2 +-
 imap4d/rename.c                   |    2 +-
 imap4d/status.c                   |    2 +-
 libmailutils/base/mutil.c         |    2 +-
 libmailutils/cfg/parser.y         |    4 ++--
 libmailutils/stream/streamref.c   |    2 +-
 libmailutils/string/wordsplit.c   |    6 +++---
 libmu_sieve/extensions/vacation.c |    4 ++--
 libproto/pop/mbox.c               |    3 +--
 mail/mail.c                       |    2 +-
 mail/unset.c                      |    2 +-
 mh/mh_fmtgram.y                   |    2 +-
 mu/logger.c                       |    7 ++++---
 18 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/examples/mblconv.c b/examples/mblconv.c
index 4f67714..8af3368 100644
--- a/examples/mblconv.c
+++ b/examples/mblconv.c
@@ -34,4 +34,5 @@ main ()
       else
 	putchar (c);
     }
+  return 0;
 }
diff --git a/examples/murun.c b/examples/murun.c
index 62195a8..09e28d1 100644
--- a/examples/murun.c
+++ b/examples/murun.c
@@ -122,11 +122,12 @@ main (int argc, char *argv[])
 	  rc = mu_string_split (argv[++i], ",", list);
 	  if (mu_list_get_iterator (list, &itr) == 0)
 	    {
-	      char *p;
-	      
 	      for (mu_iterator_first (itr);
 		   !mu_iterator_is_done (itr); mu_iterator_next (itr))
 		{
+	          char *p;
+
+		  mu_iterator_current (itr, (void**)&p);
 		  if (gn >= MU_ARRAY_SIZE (gid))
 		    {
 		      fprintf (stderr, "too many gids\n");
diff --git a/imap4d/append.c b/imap4d/append.c
index 003d8be..10cbafe 100644
--- a/imap4d/append.c
+++ b/imap4d/append.c
@@ -228,7 +228,7 @@ imap4d_append (struct imap4d_command *command, imap4d_tokbuf_t tok)
   if (status == 0)
     return io_completion_response (command, RESP_OK, "Completed");
 
-  return io_completion_response (command, RESP_NO, err_text);
+  return io_completion_response (command, RESP_NO, "%s", err_text);
 }
 
 
diff --git a/imap4d/close.c b/imap4d/close.c
index 0b4c020..0bc3ff1 100644
--- a/imap4d/close.c
+++ b/imap4d/close.c
@@ -53,7 +53,7 @@ imap4d_close0 (struct imap4d_command *command, imap4d_tokbuf_t tok,
   mu_mailbox_destroy (&mbox);
 
   if (msg)
-    return io_completion_response (command, RESP_NO, msg);
+    return io_completion_response (command, RESP_NO, "%s", msg);
   return io_completion_response (command, RESP_OK, "Completed");
 }
 
diff --git a/imap4d/create.c b/imap4d/create.c
index eac70e3..b65f419 100644
--- a/imap4d/create.c
+++ b/imap4d/create.c
@@ -118,5 +118,5 @@ imap4d_create (struct imap4d_command *command, imap4d_tokbuf_t tok)
       msg = "already exists";
     }
 
-  return io_completion_response (command, rc, msg);
+  return io_completion_response (command, rc, "%s", msg);
 }
diff --git a/imap4d/delete.c b/imap4d/delete.c
index 1e516e2..aed74ee 100644
--- a/imap4d/delete.c
+++ b/imap4d/delete.c
@@ -75,5 +75,5 @@ imap4d_delete (struct imap4d_command *command, imap4d_tokbuf_t tok)
       rc = RESP_NO;
       msg = "Cannot remove";
     }
-  return io_completion_response (command, rc, msg);
+  return io_completion_response (command, rc, "%s", msg);
 }
diff --git a/imap4d/rename.c b/imap4d/rename.c
index ccbfc2f..30efa94 100644
--- a/imap4d/rename.c
+++ b/imap4d/rename.c
@@ -226,5 +226,5 @@ imap4d_rename (struct imap4d_command *command, imap4d_tokbuf_t tok)
       free (oldname);
     }
   free (newname);
-  return io_completion_response (command, rc, msg);
+  return io_completion_response (command, rc, "%s", msg);
 }
diff --git a/imap4d/status.c b/imap4d/status.c
index 3333898..d0bd445 100644
--- a/imap4d/status.c
+++ b/imap4d/status.c
@@ -150,7 +150,7 @@ imap4d_status (struct imap4d_command *command, imap4d_tokbuf_t tok)
 	return io_completion_response (command, RESP_BAD, 
 	                               "Too few args (empty list)");
       else if (err_msg)
-	return io_completion_response (command, RESP_BAD, err_msg);
+	return io_completion_response (command, RESP_BAD, "%s", err_msg);
       return io_completion_response (command, RESP_OK, "Completed");
     }
   
diff --git a/libmailutils/base/mutil.c b/libmailutils/base/mutil.c
index fdbb626..87b2586 100644
--- a/libmailutils/base/mutil.c
+++ b/libmailutils/base/mutil.c
@@ -87,7 +87,7 @@ mutil_parse_field_map (const char *map, mu_assoc_t *passoc_tab, int *perr)
     {
       mu_error (_("cannot split line `%s': %s"), map,
 		mu_wordsplit_strerror (&ws));
-      return rc;
+      return errno;
     }
 
   for (i = 0; i < ws.ws_wordc; i++)
diff --git a/libmailutils/cfg/parser.y b/libmailutils/cfg/parser.y
index 397e80f..75fbab8 100644
--- a/libmailutils/cfg/parser.y
+++ b/libmailutils/cfg/parser.y
@@ -855,12 +855,12 @@ pop_section (struct scan_tree_data *dat)
   {									\
     unsigned type tmpres;						\
     const char *s = str;						\
-    int sign;								\
+    int sign;							        \
     unsigned type limit;						\
     									\
     if (*s == '-')							\
       {									\
-	sign++;								\
+	sign = 1;							\
 	s++;								\
 	limit = TYPE_MINIMUM (type);					\
 	limit = - limit;						\
diff --git a/libmailutils/stream/streamref.c b/libmailutils/stream/streamref.c
index ea8b682..2a52f87 100644
--- a/libmailutils/stream/streamref.c
+++ b/libmailutils/stream/streamref.c
@@ -212,7 +212,7 @@ _streamref_ctl (struct _mu_stream *str, int code, int opcode, void *arg)
 	return EINVAL;
       else
 	{
-	  mu_off_t *lim;
+	  mu_off_t *lim = arg;
 
 	  switch (opcode)
 	    {
diff --git a/libmailutils/string/wordsplit.c b/libmailutils/string/wordsplit.c
index 5792393..26342dc 100644
--- a/libmailutils/string/wordsplit.c
+++ b/libmailutils/string/wordsplit.c
@@ -412,7 +412,7 @@ mu_wordsplit_dump_nodes (struct mu_wordsplit *wsp)
       else
 	wsp->ws_debug ("%4d: %p: %#04x (%s):%.*s;",
 		       n, p, p->flags, wsnode_flagstr (p->flags),
-		       p->v.segm.end - p->v.segm.beg,
+		       (int)(p->v.segm.end - p->v.segm.beg),
 		       wsp->ws_input + p->v.segm.beg);
     }
 }
@@ -773,7 +773,7 @@ expvar (struct mu_wordsplit *wsp, const char *str, size_t len,
   else
     {
       if (wsp->ws_flags & MU_WRDSF_WARNUNDEF)
-	wsp->ws_error (_("warning: undefined variable `%.*s'"), i, str);
+	wsp->ws_error (_("warning: undefined variable `%.*s'"), (int) i, str);
       if (wsp->ws_flags & MU_WRDSF_KEEPUNDEF)
 	value = NULL;
       else
@@ -1346,7 +1346,7 @@ mu_wordsplit_len (const char *command, size_t len, struct mu_wordsplit *wsp,
     return rc;
 
   if (wsp->ws_flags & MU_WRDSF_SHOWDBG)
-    wsp->ws_debug ("Input:%.*s;", len, command);
+    wsp->ws_debug ("Input:%.*s;", (int)len, command);
 
   if (wsp->ws_flags & MU_WRDSF_NOSPLIT)
     {
diff --git a/libmu_sieve/extensions/vacation.c b/libmu_sieve/extensions/vacation.c
index b423615..02e8091 100644
--- a/libmu_sieve/extensions/vacation.c
+++ b/libmu_sieve/extensions/vacation.c
@@ -336,13 +336,13 @@ check_db (mu_sieve_machine_t mach, mu_list_t tags, char *from)
   char *file;
   mu_sieve_value_t *arg;
   unsigned int days;
-  time_t now;
   int rc;
   mu_stream_t str;
   mu_locker_t locker;
   
   if (mu_sieve_tag_lookup (tags, "days", &arg))
     {
+      days = arg->v.number;
       if (days > DAYS_MAX)
 	days = DAYS_MAX;
     }
@@ -402,7 +402,7 @@ check_db (mu_sieve_machine_t mach, mu_list_t tags, char *from)
       mu_sieve_abort (mach);
     }
 
-  rc = test_and_update_prop (prop, from, now, days, mach);
+  rc = test_and_update_prop (prop, from, time (NULL), days, mach);
   mu_property_destroy (&prop);
   mu_locker_unlock (locker);
   mu_locker_destroy (&locker);
diff --git a/libproto/pop/mbox.c b/libproto/pop/mbox.c
index 3a9102b..67d97a9 100644
--- a/libproto/pop/mbox.c
+++ b/libproto/pop/mbox.c
@@ -579,7 +579,6 @@ static int
 pop_create_pop3_message (struct _pop3_mailbox *mpd, size_t msgno,
 			 struct _pop3_message **mptr)
 {
-  int status;
   struct _pop3_message *mpm;
   
   if (msgno > mpd->msg_count)
@@ -607,7 +606,7 @@ pop_create_pop3_message (struct _pop3_mailbox *mpd, size_t msgno,
   
   mpd->msg[msgno - 1] = mpm;
   *mptr = mpm;
-  return status;
+  return 0;
 }
 
 
diff --git a/mail/mail.c b/mail/mail.c
index 449e8b2..c7ecab7 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -311,7 +311,7 @@ static char *default_setup[] = {
 static void
 do_and_quit (const char *command)
 {
-  int rc = util_do_command (command);
+  int rc = util_do_command ("%s", command);
   mu_mailbox_close (mbox);
   exit (rc != 0);
 }
diff --git a/mail/unset.c b/mail/unset.c
index 8d91d92..48417ff 100644
--- a/mail/unset.c
+++ b/mail/unset.c
@@ -37,7 +37,7 @@ mail_unset (int argc, char **argv)
 	  char *buf = xmalloc ((7+strlen (argv[i])) * sizeof (char));
 	  strcpy (buf, "set no");
 	  strcat (buf, argv[i]);
-	  if (!util_do_command (buf))
+	  if (!util_do_command ("%s", buf))
 	    status = 1;
 	  free (buf);
 	}
diff --git a/mh/mh_fmtgram.y b/mh/mh_fmtgram.y
index 2bb4b29..70b5f30 100644
--- a/mh/mh_fmtgram.y
+++ b/mh/mh_fmtgram.y
@@ -205,7 +205,7 @@ function  : FUNCTION
 	      else
 		{
 		  yyerror (_("undefined function"));
-		  mu_error ($1);
+		  mu_error ("%s", $1);
 		  YYERROR;
 		}
 	    }
diff --git a/mu/logger.c b/mu/logger.c
index 027d152..f3bb738 100644
--- a/mu/logger.c
+++ b/mu/logger.c
@@ -158,9 +158,10 @@ mutool_logger (int argc, char **argv)
 
   if (!syslog_tag)
     syslog_tag = "mu-logger";
-  if (mu_stdstream_strerr_create (&logger, logger_type,
-				  syslog_facility, syslog_priority,
-				  syslog_tag, NULL))
+  rc = mu_stdstream_strerr_create (&logger, logger_type,
+				   syslog_facility, syslog_priority,
+				   syslog_tag, NULL);
+  if (rc)
     {
       mu_error (_("cannot create log stream: %s"),
 		mu_strerror (rc));


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Wed Mar 23 03:59:51 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q2Iyt-000153-2I
	for mharc-commit-mailutils@gnu.org; Wed, 23 Mar 2011 03:59:51 -0400
Received: from [140.186.70.92] (port=48792 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q2Iyp-000136-Cl
	for commit-mailutils@gnu.org; Wed, 23 Mar 2011 03:59:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q2Iyn-0000zK-9i
	for commit-mailutils@gnu.org; Wed, 23 Mar 2011 03:59:46 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38770)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q2Iyn-0000zC-8A
	for commit-mailutils@gnu.org; Wed, 23 Mar 2011 03:59:45 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q2Iym-0001Pn-M1
	for commit-mailutils@gnu.org; Wed, 23 Mar 2011 07:59:44 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q2Iyk-0006qg-D5
	for commit-mailutils@gnu.org; Wed, 23 Mar 2011 07:59:44 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: dd33613b562970a194917f1934aeab56e3cfc4f9
X-Git-Newrev: 5acfb2a37b1bb49474d3bbb0137f22604b508310
Message-Id: <E1Q2Iyk-0006qg-D5@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 23 Mar 2011 07:59:42 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-359-g5acfb2a
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Mar 2011 07:59:49 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=5acfb2a37b1bb49474d3bbb0137f22604b508310

The branch, master has been updated
       via  5acfb2a37b1bb49474d3bbb0137f22604b508310 (commit)
      from  dd33613b562970a194917f1934aeab56e3cfc4f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5acfb2a37b1bb49474d3bbb0137f22604b508310
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Tue Mar 22 17:27:00 2011 +0200

    New filter "c-escape".
    
    * libmailutils/filter/c-escape.c: New file.
    * include/mailutils/filter.h (mu_c_escape_filter): New extern.
    * libmailutils/filter/Makefile.am (libfilter_la_SOURCES): Add c-escape.c
    * libmailutils/filter/filter.c (mu_filter_get_list): Add
    mu_c_escape_filter to the list.

-----------------------------------------------------------------------

Summary of changes:
 include/mailutils/filter.h                    |    1 +
 libmailutils/filter/Makefile.am               |    1 +
 libmailutils/filter/{crlfflt.c => c-escape.c} |  144 ++++++++++--------------
 libmailutils/filter/filter.c                  |    1 +
 mh/etc/components                             |    6 +-
 5 files changed, 66 insertions(+), 87 deletions(-)
 copy libmailutils/filter/{crlfflt.c => c-escape.c} (50%)

diff --git a/include/mailutils/filter.h b/include/mailutils/filter.h
index 09d2b92..d723066 100644
--- a/include/mailutils/filter.h
+++ b/include/mailutils/filter.h
@@ -123,6 +123,7 @@ extern mu_filter_record_t mu_header_filter;
 extern mu_filter_record_t mu_linecon_filter;
 extern mu_filter_record_t mu_linelen_filter;
 extern mu_filter_record_t mu_iconv_filter;
+extern mu_filter_record_t mu_c_escape_filter;
   
 enum mu_iconv_fallback_mode
   {
diff --git a/libmailutils/filter/Makefile.am b/libmailutils/filter/Makefile.am
index 0788a5c..5208b7c 100644
--- a/libmailutils/filter/Makefile.am
+++ b/libmailutils/filter/Makefile.am
@@ -20,6 +20,7 @@ noinst_LTLIBRARIES = libfilter.la
 libfilter_la_SOURCES =\
  base64.c\
  binflt.c\
+ c-escape.c\
  crlfdot.c\
  crlfflt.c\
  decode.c\
diff --git a/libmailutils/filter/crlfflt.c b/libmailutils/filter/c-escape.c
similarity index 50%
copy from libmailutils/filter/crlfflt.c
copy to libmailutils/filter/c-escape.c
index 96291b8..52ea48c 100644
--- a/libmailutils/filter/crlfflt.c
+++ b/libmailutils/filter/c-escape.c
@@ -1,19 +1,31 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011 Free Software Foundation, Inc.
 
-   This library is free software; you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. */
-
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library.  If not, see 
+   <http://www.gnu.org/licenses/>. */
+
+/* A C-escape filter.
+   In encode mode, replaces control characters with their C escapes.
+   For example, newline (ASCII 10) becomes \n, horizontal tab (ASCII 9)
+   becomes \t etc.
+   In decode mode, the reverse operation is performed, i.e. each C escape
+   is replaced with the corresponding character.  Unrecognized escape
+   sequences are copied verbatim.
+
+   FIXME: Only named escapes are supported.
+*/
+   
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -21,31 +33,25 @@
 #include <string.h>
 #include <mailutils/errno.h>
 #include <mailutils/filter.h>
+#include <mailutils/wordsplit.h>
+#include <mailutils/cctype.h>
 
-enum crlf_state
-{
-  state_init,
-  state_cr
-};
-  
-/* Move min(isize,osize) bytes from iptr to optr, replacing each \n
-   with \r\n.  Any input \r\n sequences remain untouched. */
+/* Move min(isize,osize) bytes from iptr to optr, replacing each
+   escapable control character with its escape sequence. */
 static enum mu_filter_result
-_crlf_encoder (void *xd,
-	       enum mu_filter_command cmd,
-	       struct mu_filter_io *iobuf)
+_c_escape_encoder (void *xd MU_ARG_UNUSED,
+		   enum mu_filter_command cmd,
+		   struct mu_filter_io *iobuf)
 {
   size_t i, j;
   const unsigned char *iptr;
   size_t isize;
   char *optr;
   size_t osize;
-  enum crlf_state *state = xd;
   
   switch (cmd)
     {
     case mu_filter_init:
-      *state = state_init;
     case mu_filter_done:
       return mu_filter_ok;
     default:
@@ -60,13 +66,14 @@ _crlf_encoder (void *xd,
   for (i = j = 0; i < isize && j < osize; i++)
     {
       unsigned char c = *iptr++;
-      if (c == '\n')
+
+      if (mu_iscntrl (c))
 	{
-	  if (*state == state_cr)
-	    {
-	      *state = state_init;
-	      optr[j++] = c;
-	    }
+	  int x;
+
+	  x = mu_wordsplit_c_quote_char (c);
+	  if (x == -1)
+	    optr[j++] = c;
 	  else if (j + 1 == osize)
 	    {
 	      if (i == 0)
@@ -78,15 +85,10 @@ _crlf_encoder (void *xd,
 	    }
 	  else
 	    {
-	      optr[j++] = '\r';
-	      optr[j++] = '\n';
+	      optr[j++] = '\\';
+	      optr[j++] = x;
 	    }
 	}
-      else if (c == '\r')
-	{
-	  *state = state_cr;
-	  optr[j++] = c;
-	}
       else
 	optr[j++] = c;
     }
@@ -95,19 +97,19 @@ _crlf_encoder (void *xd,
   return mu_filter_ok;
 }
 
-/* Move min(isize,osize) bytes from iptr to optr, replacing each \r\n
-   with \n. */
+/* Move min(isize,osize) bytes from iptr to optr, replacing each escape
+   sequence with its ASCII code. */
 static enum mu_filter_result
-_crlf_decoder (void *xd MU_ARG_UNUSED,
-	       enum mu_filter_command cmd,
-	       struct mu_filter_io *iobuf)
+_c_escape_decoder (void *xd MU_ARG_UNUSED,
+		   enum mu_filter_command cmd,
+		   struct mu_filter_io *iobuf)
 {
   size_t i, j;
   const unsigned char *iptr;
   size_t isize;
   char *optr;
   size_t osize;
-
+  
   switch (cmd)
     {
     case mu_filter_init:
@@ -125,57 +127,31 @@ _crlf_decoder (void *xd MU_ARG_UNUSED,
   for (i = j = 0; i < isize && j < osize; i++)
     {
       unsigned char c = *iptr++;
-      if (c == '\r')
+      if (c == '\\')
 	{
+	  int x;
 	  if (i + 1 == isize)
 	    break;
-	  if (*iptr == '\n')
-	    continue;
+	  c = *iptr++;
+	  i++;
+	  x = mu_wordsplit_c_unquote_char (c);
+	  optr[j++] = (x == -1) ? c : x;
 	}
-      optr[j++] = c;
+      else
+	optr[j++] = c;
     }
+
   iobuf->isize = i;
   iobuf->osize = j;
   return mu_filter_ok;
 }
 
-static int
-alloc_state (void **pret, int mode,
-	     int argc MU_ARG_UNUSED, const char **argv MU_ARG_UNUSED)
-{
-  switch (mode)
-    {
-    case MU_FILTER_ENCODE:
-      *pret = malloc (sizeof (int));
-      if (!*pret)
-	return ENOMEM;
-      break;
-
-    case MU_FILTER_DECODE:
-      *pret = NULL;
-    }
-  return 0;
-}
-  
-
-static struct _mu_filter_record _crlf_filter = {
-  "CRLF",
-  alloc_state,
-  _crlf_encoder,
-  _crlf_decoder
+static struct _mu_filter_record _c_escape_filter = {
+  "C-escape",
+  NULL,
+  _c_escape_encoder,
+  _c_escape_decoder,
 };
 
-mu_filter_record_t mu_crlf_filter = &_crlf_filter;
-
-
-/* For compatibility with previous versions */
-static struct _mu_filter_record _rfc822_filter = {
-  "RFC822",
-  alloc_state,
-  _crlf_encoder,
-  _crlf_decoder
-};
-
-mu_filter_record_t mu_rfc822_filter = &_rfc822_filter;
-
+mu_filter_record_t mu_c_escape_filter = &_c_escape_filter;
 
diff --git a/libmailutils/filter/filter.c b/libmailutils/filter/filter.c
index 9cc9045..a9e6eeb 100644
--- a/libmailutils/filter/filter.c
+++ b/libmailutils/filter/filter.c
@@ -83,6 +83,7 @@ mu_filter_get_list (mu_list_t *plist)
       mu_list_append (filter_list, mu_linecon_filter);
       mu_list_append (filter_list, mu_linelen_filter);
       mu_list_append (filter_list, mu_iconv_filter);
+      mu_list_append (filter_list, mu_c_escape_filter);
       /* FIXME: add the default encodings?  */
     }
   *plist = filter_list;
diff --git a/mh/etc/components b/mh/etc/components
index 512352e..e754508 100644
--- a/mh/etc/components
+++ b/mh/etc/components
@@ -1,6 +1,6 @@
 ;; Default components file for GNU MH.
 ;; Lines beginning with ; are ignored.  Rest of lines is copied verbatim.
-To:
-cc:
-Subject:
+To: 
+cc: 
+Subject: 
 --------


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Wed Mar 30 08:50:03 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q4uqZ-0002RA-2y
	for mharc-commit-mailutils@gnu.org; Wed, 30 Mar 2011 08:50:03 -0400
Received: from [140.186.70.92] (port=37087 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q4uqO-0002QY-Rm
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 08:50:02 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q4uqC-0006QY-N3
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 08:49:52 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:34745)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q4uqC-0006QO-FR
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 08:49:40 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q4uqC-0002bk-2G
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 12:49:40 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q4uqA-0001Jm-FT
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 12:49:39 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5acfb2a37b1bb49474d3bbb0137f22604b508310
X-Git-Newrev: adca074d616ac562095a92e01f2b181e6d3593c8
Message-Id: <E1Q4uqA-0001Jm-FT@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 30 Mar 2011 12:49:38 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-361-gadca074
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Mar 2011 12:50:02 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=adca074d616ac562095a92e01f2b181e6d3593c8

The branch, master has been updated
       via  adca074d616ac562095a92e01f2b181e6d3593c8 (commit)
       via  827cb66a4c639139c3f11c7af26aa5149f25a7e0 (commit)
      from  5acfb2a37b1bb49474d3bbb0137f22604b508310 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit adca074d616ac562095a92e01f2b181e6d3593c8
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Wed Mar 30 00:49:43 2011 +0300

    Implement IPv6 support.
    
    * am/ipv6.m4: New file.
    * examples/sa.c: New file.
    * include/mailutils/cidr.h: New file.
    * include/mailutils/sockaddr.h: New file.
    * libmailutils/cidr/Makefile.am: New file.
    * libmailutils/cidr/fromsa.c: New file.
    * libmailutils/cidr/fromstr.c: New file.
    * libmailutils/cidr/match.c: New file.
    * libmailutils/cidr/tosa.c: New file.
    * libmailutils/cidr/tostr.c: New file.
    * libmailutils/sockaddr/Makefile.am: New file.
    * libmailutils/sockaddr/copy.c: New file.
    * libmailutils/sockaddr/create.c: New file.
    * libmailutils/sockaddr/free.c: New file.
    * libmailutils/sockaddr/fromnode.c: New file.
    * libmailutils/sockaddr/insert.c: New file.
    * libmailutils/sockaddr/ipaddr.c: New file.
    * libmailutils/sockaddr/str.c: New file.
    * libmailutils/sockaddr/unlink.c: New file.
    * libmailutils/sockaddr/url.c: New file.
    * libmailutils/tests/cidr.c: New file.
    
    * configure.ac: Call MU_ENABLE_IPV6.
    Build libmailutils/sockaddr and libmailutils/cidr.
    * examples/.gitignore: Add mblconv and sa
    * examples/Makefile.am: (noinst_PROGRAMS): Add sa.
    * examples/aclck.c: Use new ACL API.
    * examples/echosrv.c: Use new mserv API.
    * include/mailutils/Makefile.am (pkginclude_HEADERS): Add cidr.h
    and sockaddr.h
    
    * include/mailutils/acl.h (mu_acl_append, mu_acl_prepend)
    (mu_acl_insert): Change signatures.
    * include/mailutils/debug.h (mu_sockaddr_to_str): Remove proto.
    * include/mailutils/mailutils.h: Include cidr.h and sockaddr.h
    * include/mailutils/server.h (mu_ip_server_create): Change signature.
    (mu_ip_server_get_sockaddr): Likewise.
    (mu_m_server_set_default_address)
    (mu_m_server_get_default_address): Remove.
    * include/mailutils/stream.h (mu_tcp_stream_create_from_sa): New proto.
    * include/mailutils/types.hin (mu_cidr, mu_sockaddr): New structs.
    
    * include/mailutils/url.h (MU_URL_IPV6): New flag.
    (MU_URL_PARSE_DSLASH_OPTIONAL): New parse flag.
    
    * libmailutils/Makefile.am: Descend into cidr and sockaddr. Link in
    libcidr and libsockaddr.
    * libmailutils/diag/debug.c (mu_debug_log_begin): Flush mu_strerr.
    * libmailutils/diag/errors (MU_ERR_NONAME)
    (MU_ERR_BADFLAGS,MU_ERR_SOCKTYPE)
    (MU_ERR_FAMILY,MU_ERR_SERVICE): New errors.
    
    * libmailutils/server/acl.c: Rewrite API using mu_cidr.
    * libmailutils/server/ipsrv.c: Rewrite AI using mu_sockaddr.
    * libmailutils/server/msrv.c: Likewise.
    * libmailutils/stream/tcp.c: Likewise.
    
    * libmailutils/tests/.gitignore: Add cidr.
    * libmailutils/tests/Makefile.am (noinst_PROGRAMS): Add cidr.
    * libmailutils/tests/url-parse.c: Support command line options
    to tune the parsing.
    * libmailutils/tests/url.at: Pass options to url-parse.
    * libmailutils/url/create.c (getkn): Return meaningful error code.
    (_mu_url_ctx_parse_host): Accept IPv6 addresses. Set the MU_URL_IPV6
    flag if one is given.
    (_mu_url_ctx_parse): Unless MU_URL_PARSE_DSLASH_OPTIONAL flag is
    given, request :// after scheme part.
    (mu_url_create): Add MU_URL_PARSE_DSLASH_OPTIONAL flag.
    
    * libmu_cfg/acl.c: Use new ACL API.
    * mu/acl.c: Likewise.
    
    * libproto/mailer/smtp.c (smtp_open): Use mu_tcp_stream_create_from_sa
    * libproto/pop/mbox.c (pop_open): Likewise.
    * mu/imap.c (com_connect): Likewise.
    * mu/pop.c (com_connect): Likewise.
    * testsuite/smtpsend.c (main): Likewise.

commit 827cb66a4c639139c3f11c7af26aa5149f25a7e0
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Wed Mar 30 09:40:41 2011 +0300

    Minor fix
    
    * mh/tests/comp.at: Remove trailing whitespace before comparisons

-----------------------------------------------------------------------

Summary of changes:
 am/ipv6.m4                                         |   56 +++
 configure.ac                                       |    9 +
 examples/.gitignore                                |    2 +
 examples/Makefile.am                               |    1 +
 examples/aclck.c                                   |   89 +----
 examples/echosrv.c                                 |   69 +++--
 examples/sa.c                                      |   93 +++++
 include/mailutils/Makefile.am                      |    2 +
 include/mailutils/acl.h                            |    8 +-
 include/mailutils/cidr.h                           |   61 ++++
 include/mailutils/debug.h                          |    3 -
 include/mailutils/mailutils.h                      |    2 +
 include/mailutils/server.h                         |   12 +-
 include/mailutils/sockaddr.h                       |   78 +++++
 include/mailutils/stream.h                         |    4 +
 include/mailutils/types.hin                        |    3 +
 include/mailutils/url.h                            |    9 +-
 libmailutils/Makefile.am                           |    4 +-
 libmailutils/{mailer => cidr}/Makefile.am          |   13 +-
 libmailutils/cidr/fromsa.c                         |  101 ++++++
 libmailutils/cidr/fromstr.c                        |  128 +++++++
 libmailutils/{base/getmaxfd.c => cidr/match.c}     |   30 +-
 libmailutils/cidr/tosa.c                           |   78 +++++
 libmailutils/cidr/tostr.c                          |  159 +++++++++
 libmailutils/diag/debug.c                          |    1 +
 libmailutils/diag/errors                           |    8 +
 libmailutils/server/acl.c                          |  366 +++++---------------
 libmailutils/server/ipsrv.c                        |   83 ++---
 libmailutils/server/msrv.c                         |  348 ++++++-------------
 libmailutils/{property => sockaddr}/Makefile.am    |   21 +-
 libmailutils/{url/urlstr.c => sockaddr/copy.c}     |   21 +-
 .../{base/getmaxfd.c => sockaddr/create.c}         |   35 ++-
 libmailutils/{base/getmaxfd.c => sockaddr/free.c}  |   40 ++-
 libmailutils/sockaddr/fromnode.c                   |  253 ++++++++++++++
 .../{base/getmaxfd.c => sockaddr/insert.c}         |   54 ++-
 libmailutils/sockaddr/ipaddr.c                     |   88 +++++
 libmailutils/sockaddr/str.c                        |  109 ++++++
 .../{base/getmaxfd.c => sockaddr/unlink.c}         |   35 +-
 libmailutils/sockaddr/url.c                        |  130 +++++++
 libmailutils/stream/tcp.c                          |  178 +++++-----
 libmailutils/tests/.gitignore                      |    1 +
 libmailutils/tests/Makefile.am                     |    1 +
 libmailutils/tests/cidr.c                          |   77 ++++
 libmailutils/tests/url-parse.c                     |   49 +++-
 libmailutils/tests/url.at                          |   14 +-
 libmailutils/url/create.c                          |   57 +++-
 libmu_cfg/acl.c                                    |  135 ++------
 libproto/mailer/smtp.c                             |   25 +-
 libproto/pop/mbox.c                                |   27 +-
 mh/tests/comp.at                                   |   26 +-
 mu/acl.c                                           |   40 +--
 mu/imap.c                                          |   25 +-
 mu/pop.c                                           |   47 ++-
 testsuite/smtpsend.c                               |   25 +-
 54 files changed, 2242 insertions(+), 1091 deletions(-)
 create mode 100644 am/ipv6.m4
 create mode 100644 examples/sa.c
 create mode 100644 include/mailutils/cidr.h
 create mode 100644 include/mailutils/sockaddr.h
 copy libmailutils/{mailer => cidr}/Makefile.am (83%)
 create mode 100644 libmailutils/cidr/fromsa.c
 create mode 100644 libmailutils/cidr/fromstr.c
 copy libmailutils/{base/getmaxfd.c => cidr/match.c} (70%)
 create mode 100644 libmailutils/cidr/tosa.c
 create mode 100644 libmailutils/cidr/tostr.c
 copy libmailutils/{property => sockaddr}/Makefile.am (79%)
 copy libmailutils/{url/urlstr.c => sockaddr/copy.c} (74%)
 copy libmailutils/{base/getmaxfd.c => sockaddr/create.c} (65%)
 copy libmailutils/{base/getmaxfd.c => sockaddr/free.c} (66%)
 create mode 100644 libmailutils/sockaddr/fromnode.c
 copy libmailutils/{base/getmaxfd.c => sockaddr/insert.c} (53%)
 create mode 100644 libmailutils/sockaddr/ipaddr.c
 create mode 100644 libmailutils/sockaddr/str.c
 copy libmailutils/{base/getmaxfd.c => sockaddr/unlink.c} (70%)
 create mode 100644 libmailutils/sockaddr/url.c
 create mode 100644 libmailutils/tests/cidr.c

diff --git a/am/ipv6.m4 b/am/ipv6.m4
new file mode 100644
index 0000000..2357314
--- /dev/null
+++ b/am/ipv6.m4
@@ -0,0 +1,56 @@
+dnl This file is part of GNU Mailutils.  -*- autoconf -*-
+dnl Copyright (C) 2011 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
+dnl the Free Software Foundation; either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl GNU Mailutils is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+
+AC_DEFUN([MU_ENABLE_IPV6],
+   [AC_ARG_ENABLE(ipv6,                     
+     [AC_HELP_STRING([--enable-ipv6], [enable IPv6 support])],
+     [status_ipv6=$enableval],
+     [status_ipv6=maybe])
+     
+    if test $status_ipv6 != no; then
+      working_ipv6=no
+      AC_EGREP_CPP(MAILUTILS_AF_INET6_DEFINED,[
+#include <sys/socket.h>
+#if defined(AF_INET6)
+MAILUTILS_AF_INET6_DEFINED
+#endif
+],[working_ipv6=yes])
+
+      AC_CHECK_TYPE([struct sockaddr_storage],
+                    [working_ipv6=yes], [working_ipv6=no],
+		    [#include <sys/socket.h>])
+      AC_CHECK_TYPE([struct sockaddr_in6],
+                    [working_ipv6=yes], [working_ipv6=no],
+		    [#include <sys/types.h>
+                     #include <netinet/in.h>])
+      AC_CHECK_TYPE([struct addrinfo],
+                    [working_ipv6=yes], [working_ipv6=no],
+		    [#include <netdb.h>])
+      AC_CHECK_FUNC([getnameinfo],
+                    [working_ipv6=yes], [working_ipv6=no],
+		    [#include <netdb.h>])
+
+      if test $working_ipv6 = no; then
+	if test $status_ipv6 = yes; then
+	  AC_MSG_ERROR([IPv6 support is required but not available])
+	fi
+      fi
+      status_ipv6=$working_ipv6
+      if test $status_ipv6 = yes; then
+	AC_DEFINE_UNQUOTED([MAILUTILS_IPV6],1,
+	                   [Define to 1 if IPv6 support is enabled])
+      fi
+    fi])
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index e03a4c3..2edb494 100644
--- a/configure.ac
+++ b/configure.ac
@@ -541,6 +541,10 @@ AH_BOTTOM([
 ])
 
 
+# IPv6 support
+MU_ENABLE_IPV6
+
+
 ## FriBidi support
 
 AC_CHECK_FUNCS(wcwidth)
@@ -1285,6 +1289,8 @@ LDAP support .................. $status_ldap
 Radius support ................ $status_radius
 Support for virtual domains ... $status_virtual_domains
 
+IPv6 support .................. $status_ipv6
+
 Interfaces:
 
 Guile ......................... $status_guile
@@ -1332,6 +1338,7 @@ status_mh=$mu_cv_enable_mh
 status_maildir=$mu_cv_enable_maildir
 status_smtp=$mu_cv_enable_smtp
 status_sendmail=$mu_cv_enable_sendmail
+status_ipv6=$status_ipv6
 ])
 
 dnl Output Makefiles
@@ -1382,6 +1389,8 @@ AC_CONFIG_FILES([
  libmailutils/auth/Makefile
  libmailutils/base/Makefile
  libmailutils/address/Makefile
+ libmailutils/sockaddr/Makefile
+ libmailutils/cidr/Makefile
  libmailutils/cfg/Makefile
  libmailutils/diag/Makefile
  libmailutils/filter/Makefile
diff --git a/examples/.gitignore b/examples/.gitignore
index af4156b..890812a 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -11,6 +11,7 @@ iconv
 listop
 lsf
 mailcap
+mblconv
 mimetest
 msg-send
 mta
@@ -20,5 +21,6 @@ muemail
 murun
 musocio
 nntpclient
+sa
 sfrom
 url-parse
diff --git a/examples/Makefile.am b/examples/Makefile.am
index e22a8d3..9df91ea 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -43,6 +43,7 @@ noinst_PROGRAMS = \
  murun\
  musocio\
  $(NNTPCLIENT)\
+ sa\
  sfrom
 
 EXTRA_PROGRAMS = nntpclient
diff --git a/examples/aclck.c b/examples/aclck.c
index 57f5c03..033c444 100644
--- a/examples/aclck.c
+++ b/examples/aclck.c
@@ -28,35 +28,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-struct sockaddr *target_sa;
-int target_salen;
+struct mu_sockaddr *target_sa;
 mu_acl_t acl;
 
-struct sockaddr *
-parse_address (int *psalen, char *str)
-{
-  struct sockaddr_in in;
-  struct sockaddr *sa;
-  
-  in.sin_family = AF_INET;
-  if (inet_aton (str, &in.sin_addr) == 0)
-    {
-      mu_error ("Invalid IPv4: %s", str);
-      exit (1);
-    }
-  in.sin_port = 0;
-  *psalen = sizeof (in);
-  sa = malloc (*psalen);
-  if (!sa)
-    {
-      mu_error ("%s", mu_strerror (errno));
-      exit (1);
-    }
-  
-  memcpy (sa, &in, sizeof (in));
-  return sa;
-}
-
 void
 read_rules (FILE *fp)
 {
@@ -76,12 +50,9 @@ read_rules (FILE *fp)
   ws.ws_comment = "#";
   while (fgets (buf, sizeof buf, fp))
     {
-      unsigned long netmask;
-      int salen;
-      struct sockaddr *sa;
+      struct mu_cidr cidr;
       mu_acl_action_t action;
       void *data = NULL;
-      char *p;
       
       int len = strlen (buf);
       if (len == 0)
@@ -109,47 +80,19 @@ read_rules (FILE *fp)
 	  continue;
 	}
 
-      p = strchr (ws.ws_wordv[1], '/');
-      if (p)
+      if (strcmp (ws.ws_wordv[1], "any") == 0)
+	memset (&cidr, 0, sizeof (cidr));
+      else
 	{
-	  char *q;
-	  unsigned netlen;
-	  
-	  *p++ = 0;
-	  netlen = strtoul (p, &q, 10);
-	  if (*q == 0)
-	    {
-	      if (netlen == 0)
-		netmask = 0;
-	      else
-		{
-		  netmask = 0xfffffffful >> (32 - netlen);
-		  netmask <<= (32 - netlen);
-		  netmask = htonl (netmask);
-		}
-	    }
-	  else if (*q == '.')
+	  rc = mu_cidr_from_string (&cidr, ws.ws_wordv[1]);
+	  if (rc)
 	    {
-	      struct in_addr addr;
-	      
-	      if (inet_aton (p, &addr) == 0)
-		{
-		  mu_error ("%d: invalid netmask", line);
-		  continue;
-		}
-	      netmask = addr.s_addr;
-	    }
-	  else
-	    {
-	      mu_error ("%d: invalid netmask", line);
+	      mu_error ("%d: invalid source CIDR: %s",
+			line, mu_strerror (rc));
 	      continue;
 	    }
 	}
-      else
-	netmask = 0xfffffffful;
-      
-      sa = parse_address (&salen, ws.ws_wordv[1]);
-      
+
       /* accept addr
 	 deny addr
 	 log addr [rest ...]
@@ -174,7 +117,7 @@ read_rules (FILE *fp)
 	  data = strdup (ws.ws_wordv[2]);
 	}
 
-      rc = mu_acl_append (acl, action, data, sa, salen, netmask);
+      rc = mu_acl_append (acl, action, data, &cidr);
       if (rc)
 	mu_error ("%d: cannot append acl entry: %s", line,
 		  mu_strerror (rc));
@@ -203,7 +146,12 @@ main (int argc, char **argv)
 	  break;
 
 	case 'a':
-	  target_sa = parse_address (&target_salen, optarg);
+	  rc = mu_sockaddr_from_node (&target_sa, optarg, NULL, NULL);
+	  if (rc)
+	    {
+	      mu_error ("mu_sockaddr_from_node: %s", mu_strerror (rc));
+	      exit (1);
+	    }
 	  break;
 
 	case 'f':
@@ -225,7 +173,8 @@ main (int argc, char **argv)
   argc -= optind;
 
   read_rules (file ? file : stdin);
-  rc = mu_acl_check_sockaddr (acl, target_sa, target_salen, &result);
+  rc = mu_acl_check_sockaddr (acl, target_sa->addr, target_sa->addrlen,
+			      &result);
   if (rc)
     {
       mu_error ("mu_acl_check_sockaddr failed: %s", mu_strerror (rc));
diff --git a/examples/echosrv.c b/examples/echosrv.c
index fb68e7a..fffde73 100644
--- a/examples/echosrv.c
+++ b/examples/echosrv.c
@@ -39,13 +39,9 @@ echo_conn (int fd, struct sockaddr *s, int len,
 	   void *server_data, void *call_data,
 	   mu_ip_server_t srv)
 {
-  struct sockaddr_in srv_addr, *s_in = (struct sockaddr_in *)s;
-  int addrlen = sizeof srv_addr;
   pid_t pid;
   char buf[512];
   FILE *in, *out;
-  
-  mu_ip_server_get_sockaddr (srv, (struct sockaddr *)&srv_addr, &addrlen);
 
   pid = fork ();
   if (pid == -1)
@@ -56,10 +52,20 @@ echo_conn (int fd, struct sockaddr *s, int len,
 
   if (pid)
     {
-      mu_diag_output (MU_DIAG_INFO, "%lu: opened connection %s:%d => %s:%d",
+      struct mu_sockaddr *clt_addr;
+      int rc = mu_sockaddr_create (&clt_addr, s, len);
+      if (rc)
+	{
+	  mu_error ("mu_sockaddr_create failed: %s", mu_strerror (rc));
+	  return 0;
+	}
+  
+      mu_diag_output (MU_DIAG_INFO, "%lu: opened connection %s => %s",
 		      (unsigned long) pid,
-		      inet_ntoa (srv_addr.sin_addr), ntohs (srv_addr.sin_port),
-		      inet_ntoa (s_in->sin_addr), ntohs (s_in->sin_port));
+		      mu_ip_server_addrstr (srv),
+		      mu_sockaddr_str (clt_addr));
+
+      mu_sockaddr_free (clt_addr);
       return 0;
     }
 
@@ -108,34 +114,45 @@ tcp_conn_free (void *conn_data, void *server_data)
 void
 create_server (char *arg)
 {
-  char *p, *q;
-  struct sockaddr_in s;
+  struct mu_sockaddr *s;
   mu_ip_server_t tcpsrv;
-  unsigned n;
-  
-  p = strchr (arg, ':');
-  if (!*p)
+  int rc;
+  mu_url_t url, url_hint;
+  struct mu_sockaddr_hints hints;
+
+  if (arg[0] == '/')
+    url_hint = NULL;
+  else
     {
-      mu_error ("invalid specification: %s\n", arg);
-      exit (1);
+      rc = mu_url_create (&url_hint, "inet://");
+      if (rc)
+	{
+	  mu_error ("cannot create URL hints: %s", mu_strerror (rc));
+	  exit (1);
+	}
     }
-  *p++ = 0;
-  s.sin_family = AF_INET;
-  if (inet_aton (arg, &s.sin_addr) == 0)
+  rc = mu_url_create_hint (&url, arg, MU_URL_PARSE_DEFAULT, url_hint);
+  mu_url_destroy (&url_hint);
+  if (rc)
     {
-      mu_error ("invalid IP address: %s\n", arg);
+      mu_error ("cannot parse URL `%s': %s", arg, mu_strerror (rc));
       exit (1);
     }
-  n = strtoul (p, &q, 0);
-  if (*q)
+
+  memset (&hints, sizeof(hints), 0);
+  hints.flags = MU_AH_PASSIVE;
+  hints.socktype = SOCK_STREAM;
+  hints.protocol = IPPROTO_TCP;
+  rc = mu_sockaddr_from_url (&s, url, &hints); 
+  mu_url_destroy (&url);
+
+  if (rc)
     {
-      mu_error ("invalid port number: %s\n", p);
+      mu_error ("cannot create sockaddr: %s", mu_strerror (rc));
       exit (1);
-    }      
-  s.sin_port = htons (n);
+    }
 
-  MU_ASSERT (mu_ip_server_create (&tcpsrv, (struct sockaddr*) &s, sizeof s,
-				  MU_IP_TCP));
+  MU_ASSERT (mu_ip_server_create (&tcpsrv, s, MU_IP_TCP));
   MU_ASSERT (mu_ip_server_open (tcpsrv));
   MU_ASSERT (mu_ip_server_set_conn (tcpsrv, echo_conn));
   MU_ASSERT (mu_server_add_connection (server,
diff --git a/examples/sa.c b/examples/sa.c
new file mode 100644
index 0000000..7cc7e93
--- /dev/null
+++ b/examples/sa.c
@@ -0,0 +1,93 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 1999, 2000, 2001, 2002, 2005, 2007, 2010, 2011 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
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   GNU Mailutils is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <mailutils/mailutils.h>
+
+int
+main (int argc, char **argv)
+{
+  struct mu_sockaddr_hints hints;
+  struct mu_sockaddr *sa, *ap;
+  int rc, i;
+  char *node = NULL, *serv = NULL;
+  char *urlstr;
+  
+  mu_set_program_name (argv[0]);
+
+  memset (&hints, 0, sizeof (hints));
+  hints.family = AF_UNSPEC;
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], "passive") == 0)
+	hints.flags |= MU_AH_PASSIVE;
+      else if (strcmp (argv[i], "detect") == 0)
+	hints.flags |= MU_AH_DETECT_FAMILY;
+      else if (strncmp (argv[i], "node=", 5) == 0)
+	node = argv[i] + 5;
+      else if (strncmp (argv[i], "serv=", 5) == 0)
+	serv = argv[i] + 5;
+      else if (strncmp (argv[i], "url=", 4) == 0)
+	urlstr = argv[i] + 4;
+      else if (strncmp (argv[i], "proto=", 6) == 0)
+	hints.protocol = atoi(argv[i] + 6);
+      else if (strncmp (argv[i], "family=", 7) == 0)
+	hints.family = atoi (argv[i] + 7);
+      else if (strncmp (argv[i], "socktype=", 9) == 0)
+	hints.socktype = atoi (argv[i] + 9);
+      else
+	{
+	  mu_error ("unknown argument: %s", argv[i]);
+	  exit (1);
+	}
+    }
+
+  if (urlstr)
+    {
+      mu_url_t url;
+      
+      if (node || serv)
+	{
+	  mu_error ("both url and host/serv are given");
+	  exit (1);
+	}
+
+      rc = mu_url_create (&url, urlstr);
+      if (rc)
+	{
+	  mu_error ("cannot create url: %s", mu_strerror (rc));
+	  exit (2);
+	}
+      rc = mu_sockaddr_from_url (&sa, url, &hints);
+    }
+  else
+    rc = mu_sockaddr_from_node (&sa, node, serv, &hints);
+  if (rc)
+    {
+      mu_error ("cannot create sockaddr: %s", mu_strerror (rc));
+      exit (2);
+    }
+
+  for (ap = sa; ap; ap = ap->next)
+    printf ("%s\n", mu_sockaddr_str (ap));
+
+  mu_sockaddr_free (sa);
+  exit (0);
+}
+
diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am
index daa46e9..1e21894 100644
--- a/include/mailutils/Makefile.am
+++ b/include/mailutils/Makefile.am
@@ -36,6 +36,7 @@ pkginclude_HEADERS = \
  body.h\
  cctype.h\
  cfg.h\
+ cidr.h\
  cstr.h\
  daemon.h\
  debug.h\
@@ -89,6 +90,7 @@ pkginclude_HEADERS = \
  server.h\
  sieve.h\
  smtp.h\
+ sockaddr.h\
  stdstream.h\
  stream.h\
  syslog.h\
diff --git a/include/mailutils/acl.h b/include/mailutils/acl.h
index b898463..167acc8 100644
--- a/include/mailutils/acl.h
+++ b/include/mailutils/acl.h
@@ -47,13 +47,11 @@ int mu_acl_destroy (mu_acl_t *acl);
 int mu_acl_count (mu_acl_t acl, size_t *pcount);
 int mu_acl_get_iterator (mu_acl_t acl, mu_iterator_t *pitr);
 int mu_acl_append (mu_acl_t acl, mu_acl_action_t act, void *data,
-		   struct sockaddr *sa, int salen,
-		   unsigned long netmask);
+		   struct mu_cidr *);
 int mu_acl_prepend (mu_acl_t acl, mu_acl_action_t act, void *data,
-		    struct sockaddr *sa, int salen, unsigned long netmask);
+		    struct mu_cidr *);
 int mu_acl_insert (mu_acl_t acl, size_t pos, int before, 
-		   mu_acl_action_t act, void *data,
-		   struct sockaddr *sa, int salen, unsigned long netmask);
+		   mu_acl_action_t act, void *data, struct mu_cidr *);
 
 int mu_acl_check_ipv4 (mu_acl_t acl, unsigned int addr, mu_acl_result_t *pres);
 int mu_acl_check_inaddr (mu_acl_t acl, const struct in_addr *inp,
diff --git a/include/mailutils/cidr.h b/include/mailutils/cidr.h
new file mode 100644
index 0000000..c54bf62
--- /dev/null
+++ b/include/mailutils/cidr.h
@@ -0,0 +1,61 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library.  If not, see 
+   <http://www.gnu.org/licenses/>. */
+
+#ifndef _MAILUTILS_CIDR_H
+#define _MAILUTILS_CIDR_H
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <mailutils/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MU_INADDR_BYTES 16
+
+struct mu_cidr
+{
+  int family;
+  int len;
+  unsigned char address[MU_INADDR_BYTES];
+  unsigned char netmask[MU_INADDR_BYTES];
+};
+
+#define MU_CIDR_MAXBUFSIZE 81
+  
+int mu_cidr_from_sockaddr (struct mu_cidr *cp, const struct sockaddr *sa);
+int mu_cidr_from_string (struct mu_cidr *cp, const char *str);
+
+#define MU_CIDR_FMT_ADDRONLY 0x01
+  
+int mu_cidr_to_string (struct mu_cidr *cidr, int flags, char *buf, size_t size,
+		       size_t *pret);
+int mu_cidr_format (struct mu_cidr *, int flags, char **pbuf);
+int mu_cidr_to_sockaddr (struct mu_cidr *, struct sockaddr **sa);
+
+int mu_cidr_match (struct mu_cidr *a, struct mu_cidr *b);
+
+int _mu_inaddr_to_bytes (int af, void *buf, unsigned char *bytes);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _MAILUTILS_CIDR_H */
+	
+  
diff --git a/include/mailutils/debug.h b/include/mailutils/debug.h
index 5072d51..a619661 100644
--- a/include/mailutils/debug.h
+++ b/include/mailutils/debug.h
@@ -54,9 +54,6 @@ extern int mu_debug_line_info;
 
 
 struct sockaddr;
-void mu_sockaddr_to_str (const struct sockaddr *sa, int salen,
-			 char *bufptr, size_t buflen,
-			 size_t *plen);
 char *mu_sockaddr_to_astr (const struct sockaddr *sa, int salen);
 
 
diff --git a/include/mailutils/mailutils.h b/include/mailutils/mailutils.h
index 8d9e04b..08a2fc0 100644
--- a/include/mailutils/mailutils.h
+++ b/include/mailutils/mailutils.h
@@ -67,5 +67,7 @@
 #include <mailutils/log.h>
 #include <mailutils/stdstream.h>
 #include <mailutils/prog.h>
+#include <mailutils/sockaddr.h>
+#include <mailutils/cidr.h>
 
 /* EOF */
diff --git a/include/mailutils/server.h b/include/mailutils/server.h
index bf8d10e..c5da97e 100644
--- a/include/mailutils/server.h
+++ b/include/mailutils/server.h
@@ -54,8 +54,8 @@ typedef void (*mu_ip_server_free_fp) (void *data);
 #define MU_IP_TCP 0
 #define MU_IP_UDP 1
 
-int mu_ip_server_create (mu_ip_server_t *psrv, struct sockaddr *addr,
-			 int len, int type);
+int mu_ip_server_create (mu_ip_server_t *psrv, struct mu_sockaddr *addr,
+			 int type);
 int mu_ip_server_destroy (mu_ip_server_t *psrv);
 int mu_ip_server_get_type (mu_ip_server_t srv, int *ptype);
 int mu_ip_server_set_ident (mu_ip_server_t srv, const char *ident);
@@ -69,8 +69,8 @@ int mu_ip_server_shutdown (mu_ip_server_t srv);
 int mu_ip_server_accept (mu_ip_server_t srv, void *call_data);
 int mu_ip_server_loop (mu_ip_server_t srv, void *call_data);
 int mu_ip_server_get_fd (mu_ip_server_t srv);
-int mu_ip_server_get_sockaddr (mu_ip_server_t srv, struct sockaddr *s,
-			       int *size);
+int mu_ip_server_get_sockaddr (mu_ip_server_t srv, struct mu_sockaddr **psa);
+const char *mu_ip_server_addrstr (mu_ip_server_t srv);
 
 int mu_tcp_server_set_backlog (mu_ip_server_t srv, int backlog);
 int mu_udp_server_set_bufsize (mu_ip_server_t srv, size_t size);
@@ -99,8 +99,6 @@ void mu_m_server_set_max_children (mu_m_server_t srv, size_t num);
 int mu_m_server_set_pidfile (mu_m_server_t srv, const char *pidfile);
 int mu_m_server_set_foreground (mu_m_server_t srv, int enable);
 void mu_m_server_set_default_port (mu_m_server_t srv, int port);
-void mu_m_server_set_default_address (mu_m_server_t srv, struct sockaddr *sa,
-				      int salen);
 void mu_m_server_set_timeout (mu_m_server_t srv, time_t t);
 void mu_m_server_set_mode (mu_m_server_t srv, int mode);
 void mu_m_server_set_sigset (mu_m_server_t srv, sigset_t *sigset);
@@ -112,8 +110,6 @@ time_t mu_m_server_timeout (mu_m_server_t srv);
 const char * mu_m_server_pidfile (mu_m_server_t srv);
 void mu_m_server_get_sigset (mu_m_server_t srv, sigset_t *sigset);
 int mu_m_server_get_srvlist (mu_m_server_t srv, mu_list_t *plist);
-int mu_m_server_get_default_address (mu_m_server_t srv, struct sockaddr *sa,
-				     int *salen);
 
 void mu_m_server_configured_count (mu_m_server_t msrv, size_t count);
 
diff --git a/include/mailutils/sockaddr.h b/include/mailutils/sockaddr.h
new file mode 100644
index 0000000..5a98f7a
--- /dev/null
+++ b/include/mailutils/sockaddr.h
@@ -0,0 +1,78 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library.  If not, see 
+   <http://www.gnu.org/licenses/>. */
+
+#ifndef _MAILUTILS_SOCKADDR_H
+#define _MAILUTILS_SOCKADDR_H
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <mailutils/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct mu_sockaddr
+{
+  struct mu_sockaddr *prev, *next;
+  struct sockaddr *addr;            /* Address */
+  socklen_t        addrlen;         /* Size of addr */
+  char *str;                        /* string representation of addr,
+				       filled up by mu_sockaddr_str */
+};
+
+#define MU_AH_PASSIVE       0x01
+#define MU_AH_DETECT_FAMILY 0x02
+  
+struct mu_sockaddr_hints
+{
+  int flags;
+  int family;
+  int socktype;
+  int protocol;
+  unsigned short port;
+};
+
+int mu_sockaddr_create (struct mu_sockaddr **res,
+			struct sockaddr *addr, socklen_t len);
+int mu_sockaddr_copy (struct mu_sockaddr **pnew, struct mu_sockaddr *old);
+void mu_sockaddr_free (struct mu_sockaddr *addr);
+struct mu_sockaddr *mu_sockaddr_unlink (struct mu_sockaddr *addr);
+void mu_sockaddr_free_list (struct mu_sockaddr *addr);
+struct mu_sockaddr *mu_sockaddr_insert (struct mu_sockaddr *anchor,
+					struct mu_sockaddr *addr,
+					int before);
+const char *mu_sockaddr_str (struct mu_sockaddr *addr);
+
+int mu_sockaddr_format (char **pbuf, const struct sockaddr *sa,
+			socklen_t salen);
+
+int mu_sockaddr_from_node (struct mu_sockaddr **retval, const char *node,
+			   const char *serv, struct mu_sockaddr_hints *hints); 
+int mu_sockaddr_from_url (struct mu_sockaddr **retval, mu_url_t url,
+			  struct mu_sockaddr_hints *hints);
+
+int mu_str_is_ipv4 (const char *addr);
+int mu_str_is_ipv6 (const char *addr);
+int mu_str_is_ipaddr (const char *addr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _MAILUTILS_SOCKADDR_H */
+	
diff --git a/include/mailutils/stream.h b/include/mailutils/stream.h
index b253f4e..8bea907 100644
--- a/include/mailutils/stream.h
+++ b/include/mailutils/stream.h
@@ -315,6 +315,10 @@ int mu_streamref_create_abridged (mu_stream_t *pref, mu_stream_t str,
 				  mu_off_t start, mu_off_t end);
 int mu_streamref_create (mu_stream_t *pref, mu_stream_t str);
 
+int mu_tcp_stream_create_from_sa (mu_stream_t *pstream,
+				  struct mu_sockaddr *remote_addr,
+				  struct mu_sockaddr *source_addr, int flags);
+
 int mu_tcp_stream_create_with_source_ip (mu_stream_t *stream,
 					 const char *host, unsigned port,
 					 unsigned long source_ip,
diff --git a/include/mailutils/types.hin b/include/mailutils/types.hin
index e89b799..bf81756 100644
--- a/include/mailutils/types.hin
+++ b/include/mailutils/types.hin
@@ -75,6 +75,9 @@ struct _mu_assoc;
 struct _mu_acl;  
 struct _mu_server;
 struct _mu_tcp_server;
+
+struct mu_sockaddr; /* defined in mailutils/sockaddr.h */  
+struct mu_cidr;     /* defined in mailutils/cidr.h */  
   
 typedef _MU_OFF_TYPE_ mu_off_t;
 
diff --git a/include/mailutils/url.h b/include/mailutils/url.h
index 031e568..c33dadc 100644
--- a/include/mailutils/url.h
+++ b/include/mailutils/url.h
@@ -34,6 +34,7 @@ extern "C" {
 #define MU_URL_PATH   0x0040 /* Has path */
 #define MU_URL_PARAM  0x0080 /* Has parameters */
 #define MU_URL_QUERY  0x0100 /* Has query */
+#define MU_URL_IPV6   0x0200 /* Host part is bracketed (IPv6) */
   
 #define MU_URL_CRED (MU_URL_USER | MU_URL_SECRET | MU_URL_AUTH)  
   /* Has some of authentication credentials */
@@ -53,12 +54,14 @@ extern "C" {
 #define MU_URL_PARSE_PORTSRV      0x0004  /* Use getservbyname to determine
 					     port number */
 #define MU_URL_PARSE_PORTWC       0x0008  /* Allow wildcard (*) as a port
-					    number (for tickets) */
+					     number (for tickets) */
 #define MU_URL_PARSE_PIPE         0x0010  /* Translate "| ..." to
-					    "prog://..." */
+					     "prog://..." */
 #define MU_URL_PARSE_SLASH        0x0020  /* Translate "/..." to
 					     "file:///..." */
-
+#define MU_URL_PARSE_DSLASH_OPTIONAL 0x0040 /* Double-slash after scheme:
+					       part is optional */
+  
 #define MU_URL_PARSE_DEFAULT \
   (MU_URL_PARSE_HEXCODE|MU_URL_PARSE_HIDEPASS|MU_URL_PARSE_PORTSRV|\
    MU_URL_PARSE_PIPE|MU_URL_PARSE_SLASH)
diff --git a/libmailutils/Makefile.am b/libmailutils/Makefile.am
index ed1aeb0..5aef338 100644
--- a/libmailutils/Makefile.am
+++ b/libmailutils/Makefile.am
@@ -16,7 +16,7 @@
 # Public License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-SUBDIRS = auth base address cfg diag filter mailbox mailer mime\
+SUBDIRS = auth base address sockaddr cidr cfg diag filter mailbox mailer mime\
  server string stream stdstream property url . tests 
 
 lib_LTLIBRARIES = libmailutils.la
@@ -28,6 +28,8 @@ libmailutils_la_LIBADD = \
  auth/libauth.la\
  base/libbase.la\
  address/libaddress.la\
+ sockaddr/libsockaddr.la\
+ cidr/libcidr.la\
  cfg/libcfg.la\
  diag/libdiag.la\
  filter/libfilter.la\
diff --git a/libmailutils/mailer/Makefile.am b/libmailutils/cidr/Makefile.am
similarity index 83%
copy from libmailutils/mailer/Makefile.am
copy to libmailutils/cidr/Makefile.am
index 7a098cc..408806f 100644
--- a/libmailutils/mailer/Makefile.am
+++ b/libmailutils/cidr/Makefile.am
@@ -1,5 +1,5 @@
 # GNU Mailutils -- a suite of utilities for electronic mail
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011 Free Software Foundation, Inc.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,10 +15,13 @@
 # Public License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-noinst_LTLIBRARIES = libmailer.la
+noinst_LTLIBRARIES = libcidr.la
 
-libmailer_la_SOURCES = \
- mailer.c\
- progmailer.c
+libcidr_la_SOURCES = \
+ fromsa.c\
+ fromstr.c\
+ match.c\
+ tosa.c\
+ tostr.c
 
 INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/cidr/fromsa.c b/libmailutils/cidr/fromsa.c
new file mode 100644
index 0000000..a2fda66
--- /dev/null
+++ b/libmailutils/cidr/fromsa.c
@@ -0,0 +1,101 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library.  If not, see 
+   <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <string.h>
+#include <stdlib.h>
+#include <mailutils/cidr.h>
+#include <mailutils/errno.h>
+
+static void
+uint32_to_bytes (unsigned char *bytes, uint32_t u)
+{
+  int i;
+  
+  for (i = 0; i < 4; i++)
+    {
+      bytes[i] = u & 0xff;
+      u >>= 8;
+    }
+}
+
+int
+_mu_inaddr_to_bytes (int af, void *buf, unsigned char *bytes)
+{
+  uint32_t u;
+  
+  switch (af)
+    {
+    case AF_INET:
+      memcpy (&u, buf, sizeof u);
+      uint32_to_bytes (bytes, u);
+      return 4;
+
+#ifdef MAILUTILS_IPV6
+    case AF_INET6:
+      memcpy (bytes, buf, 16);
+      return 16;
+#endif
+    }
+  return 0;
+}
+
+int
+_mu_sockaddr_to_bytes (unsigned char *bytes, struct sockaddr const *sa)
+{
+  switch (sa->sa_family)
+    {
+    case AF_INET:
+      uint32_to_bytes (bytes, ((struct sockaddr_in*)sa)->sin_addr.s_addr);
+      return 4;
+
+#ifdef MAILUTILS_IPV6
+    case AF_INET6:
+      memcpy (bytes, &((struct sockaddr_in6*)sa)->sin6_addr, 16);
+      return 16;
+#endif
+    }
+  return 0;
+}
+
+int
+mu_cidr_from_sockaddr (struct mu_cidr *cidr, const struct sockaddr *sa)
+{
+  unsigned char address[MU_INADDR_BYTES];
+  int len;
+  int i;
+  
+  len = _mu_sockaddr_to_bytes (address, sa);
+  if (len == 0)
+    return MU_ERR_FAMILY;
+  cidr->family = sa->sa_family;
+  cidr->len = len;
+  memcpy (cidr->address, address, sizeof (cidr->address));
+  for (i = 0; i < MU_INADDR_BYTES; i++)
+    cidr->netmask[i] = 0xff;
+  return 0;
+}
+
+      
diff --git a/libmailutils/cidr/fromstr.c b/libmailutils/cidr/fromstr.c
new file mode 100644
index 0000000..4e7a56f
--- /dev/null
+++ b/libmailutils/cidr/fromstr.c
@@ -0,0 +1,128 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library.  If not, see 
+   <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <string.h>
+#include <stdlib.h>
+#include <arpa/inet.h>
+#include <mailutils/cidr.h>
+#include <mailutils/errno.h>
+#include <mailutils/sockaddr.h>
+
+static void
+masklen_to_netmask (unsigned char *buf, size_t len, size_t masklen)
+{
+  int i, cnt;
+
+  cnt = masklen / 8;
+  for (i = 0; i < cnt; i++)
+    buf[i] = 0xff;
+  if (i == MU_INADDR_BYTES)
+    return;
+  cnt = 8 - masklen % 8;
+  buf[i++] = (0xff >> cnt) << cnt;
+  for (; i < MU_INADDR_BYTES; i++)
+    buf[i] = 0;
+}
+
+int
+mu_cidr_from_string (struct mu_cidr *pcidr, const char *str)
+{
+  int rc;
+  char ipbuf[41];
+  struct mu_cidr cidr;
+  char *p;
+  size_t len;
+  union
+  {
+    struct in_addr in;
+#ifdef MAILUTILS_IPV6
+    struct in6_addr in6;
+#endif
+  } inaddr;
+  
+  p = strchr (str, '/');
+  if (p)
+    len = p - str;
+  else
+    len = strlen (str);
+
+  if (len > sizeof (ipbuf))
+    return MU_ERR_BUFSPACE;
+  
+  memcpy (ipbuf, str, len);
+  ipbuf[len] = 0;
+
+  if (mu_str_is_ipv4 (ipbuf))
+    cidr.family = AF_INET;
+#ifdef MAILUTILS_IPV6
+  else if (mu_str_is_ipv6 (ipbuf))
+    cidr.family = AF_INET6;
+#endif
+  else
+    return MU_ERR_FAMILY;
+
+  rc = inet_pton (cidr.family, ipbuf, &inaddr);
+  if (rc == -1)
+    return MU_ERR_FAMILY;
+  else if (rc == 0)
+    return MU_ERR_NONAME;
+  else if (rc != 1)
+    return MU_ERR_FAILURE;
+
+  cidr.len = _mu_inaddr_to_bytes (cidr.family, &inaddr, cidr.address);
+  if (cidr.len == 0)
+    return MU_ERR_FAMILY;
+
+  if (p)
+    {
+      char *end;
+      unsigned long masklen;
+      
+      p++;
+
+      masklen = strtoul (p, &end, 10);
+      if (*end == 0)
+	masklen_to_netmask (cidr.netmask, cidr.len, masklen);
+      else if ((cidr.family == AF_INET && mu_str_is_ipv4 (p))
+#ifdef MAILUTILS_IPV6
+	       || (cidr.family == AF_INET6 && mu_str_is_ipv6 (ipbuf))
+#endif
+	       )
+	{
+	  rc = inet_pton (cidr.family, p, &inaddr);
+	  if (rc == -1)
+	    return MU_ERR_FAMILY;
+	  else if (rc == 0)
+	    return MU_ERR_NONAME;
+	  else if (rc != 1)
+	    return MU_ERR_FAILURE;
+
+	  _mu_inaddr_to_bytes (cidr.family, &inaddr, cidr.netmask);
+	}
+      else
+	return MU_ERR_FAMILY;
+    }
+  else
+    masklen_to_netmask (cidr.netmask, cidr.len, cidr.len * 8);
+
+  memcpy (pcidr, &cidr, sizeof (*pcidr));
+  return 0;
+}
+
diff --git a/libmailutils/base/getmaxfd.c b/libmailutils/cidr/match.c
similarity index 70%
copy from libmailutils/base/getmaxfd.c
copy to libmailutils/cidr/match.c
index b905ac8..dff9194 100644
--- a/libmailutils/base/getmaxfd.c
+++ b/libmailutils/cidr/match.c
@@ -18,23 +18,21 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-
-#include <unistd.h>
-#include <limits.h>
-
-#if defined (HAVE_SYSCONF) && defined (_SC_OPEN_MAX)
-# define __getmaxfd() sysconf (_SC_OPEN_MAX)
-#elif defined (HAVE_GETDTABLESIZE)
-# define __getmaxfd() getdtablesize ()
-#elif defined OPEN_MAX
-# define __getmaxfd() OPEN_MAX
-#else
-# define __getmaxfd() 256
-#endif
+#include <mailutils/cidr.h>
+#include <mailutils/errno.h>
 
 int
-mu_getmaxfd ()
+mu_cidr_match (struct mu_cidr *a, struct mu_cidr *b)
 {
-  return __getmaxfd ();
+  int i;
+
+  if (a->family != b->family)
+    return 1;
+  for (i = 0; i < a->len; i++)
+    {
+      if (a->address[i] != (b->address[i] & a->netmask[i]))
+	return 1;
+    }
+  return 0;
 }
-
+  
diff --git a/libmailutils/cidr/tosa.c b/libmailutils/cidr/tosa.c
new file mode 100644
index 0000000..c14a995
--- /dev/null
+++ b/libmailutils/cidr/tosa.c
@@ -0,0 +1,78 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library.  If not, see 
+   <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <string.h>
+#include <stdlib.h>
+#include <mailutils/cidr.h>
+#include <mailutils/errno.h>
+
+int
+mu_cidr_to_sockaddr (struct mu_cidr *cidr, struct sockaddr **psa)
+{
+  union
+  {
+    struct sockaddr sa;
+    struct sockaddr_in s_in;
+#ifdef MAILUTILS_IPV6
+    struct sockaddr_in6 s_in6;
+#endif
+  } addr;
+  struct sockaddr *sa;
+  int socklen;
+  int i;
+  
+  memset (&addr, 0, sizeof (addr));
+  addr.sa.sa_family = cidr->family;
+  switch (cidr->family)
+    {
+    case AF_INET:
+      socklen = sizeof (addr.s_in);
+      for (i = 0; i < cidr->len; i++)
+	{
+	  addr.s_in.sin_addr.s_addr <<= 8;
+	  addr.s_in.sin_addr.s_addr |= cidr->address[i];
+	}
+      break;
+
+#ifdef MAILUTILS_IPV6
+    case AF_INET6:
+      socklen = sizeof (addr.s_in6);
+      memcpy (&addr.s_in6.sin6_addr, cidr->address, 16);
+      break;
+#endif
+
+    default:
+      return MU_ERR_FAMILY;
+    }
+
+  sa = malloc (socklen);
+  if (!sa)
+    return ENOMEM;
+  memcpy (sa, &addr, socklen);
+  *psa = sa;
+  return 0;
+}
+
diff --git a/libmailutils/cidr/tostr.c b/libmailutils/cidr/tostr.c
new file mode 100644
index 0000000..3d1ee5f
--- /dev/null
+++ b/libmailutils/cidr/tostr.c
@@ -0,0 +1,159 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library.  If not, see 
+   <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <string.h>
+#include <stdlib.h>
+#include <mailutils/cidr.h>
+#include <mailutils/errno.h>
+
+static int
+to_xdig (unsigned char b)
+{
+  if (b >= 0xa)
+    return 'A' + b - 0xa;
+  else
+    return '0' + b;
+}
+
+static size_t
+format_ipv6_bytes (const unsigned char *bytes, int len, 
+		   char *buf, size_t size)
+{
+  size_t total = 0;
+  int i;
+  
+  for (i = 0; i < len; i += 2)
+    {
+      if (i)
+	{
+	  if (total++ < size)
+	    *buf++ = ':';
+	}
+      if (total++ < size)
+	*buf++ = to_xdig (*bytes >> 4);
+      if (total++ < size)
+	*buf++ = to_xdig (*bytes & 0xf);
+      bytes++;
+      if (total++ < size)
+	*buf++ = to_xdig (*bytes >> 4);
+      if (total++ < size)
+	*buf++ = to_xdig (*bytes & 0xf);
+      bytes++;
+    }
+  return total;
+}
+
+static size_t
+format_ipv4_bytes (const unsigned char *bytes, int len, 
+		   char *buf, size_t size)
+{
+  int i;
+  size_t total = 0;
+  
+  for (i = 0; i < len; i++)
+    {
+      unsigned char b = *bytes++;
+      char nbuf[3];
+      int j;
+      
+      if (i)
+	{
+	  if (total++ < size)
+	    *buf++ = '.';
+	}
+
+      j = 0;
+      do
+	{
+	  nbuf[j++] = b % 10 + '0';
+	  b /= 10;
+	}
+      while (b);
+
+      for (; j; j--)
+	{
+	  if (total++ < size)
+	    *buf++ = nbuf[j - 1];
+	}
+    }
+  return total;
+}
+
+int
+mu_cidr_to_string (struct mu_cidr *cidr, int flags,
+		   char *buf, size_t size, size_t *pret)
+{
+  size_t (*fmt) (const unsigned char *bytes, int len, char *buf, size_t size);
+  size_t n, total = 0;
+  
+  if (size == 0)
+    return MU_ERR_BUFSPACE;
+  size--;
+  switch (cidr->family)
+    {
+    case AF_INET:
+      fmt = format_ipv4_bytes;
+      break;
+      
+#ifdef MAILUTILS_IPV6
+    case AF_INET6:
+      fmt = format_ipv6_bytes;
+      break;
+#endif
+
+    default:
+      return MU_ERR_FAMILY;
+    }
+
+  n = fmt (cidr->address, cidr->len, buf, size);
+  if (buf)
+    buf += n;
+  total += n;
+
+  if (!(flags & MU_CIDR_FMT_ADDRONLY))
+    {
+      if (total++ < size)
+	*buf++ = '/';
+      n = fmt (cidr->netmask, cidr->len, buf, size - total);
+      if (buf)
+	buf += n;
+      total += n;
+    }
+  
+  if (buf)
+    *buf++ = 0;
+  if (pret)
+    *pret = total;
+  return 0;
+}
+
+int
+mu_cidr_format (struct mu_cidr *cidr, int flags, char **pbuf)
+{
+  char buf[MU_CIDR_MAXBUFSIZE];
+  int rc = mu_cidr_to_string (cidr, flags, buf, sizeof (buf), NULL);
+  if (rc)
+    return rc;
+  *pbuf = strdup (buf);
+  if (!*buf)
+    return ENOMEM;
+  return 0;
+}
+
diff --git a/libmailutils/diag/debug.c b/libmailutils/diag/debug.c
index 124311b..aa10e41 100644
--- a/libmailutils/diag/debug.c
+++ b/libmailutils/diag/debug.c
@@ -689,6 +689,7 @@ mu_debug_log_begin (const char *fmt, ...)
   va_list ap;
 
   mu_diag_init ();
+  mu_stream_flush (mu_strerr);
   va_start (ap, fmt);
   mu_stream_printf (mu_strerr, "\033s<%d>", MU_LOG_DEBUG);
   mu_stream_vprintf (mu_strerr, fmt, ap);
diff --git a/libmailutils/diag/errors b/libmailutils/diag/errors
index 869e414..03f71b7 100644
--- a/libmailutils/diag/errors
+++ b/libmailutils/diag/errors
@@ -1,3 +1,4 @@
+
 # Error messages for GNU Mailutils
 # Copyright (C) 2005, 2006, 2007, 2010, 2011 Free Software Foundation,
 # Inc.
@@ -98,3 +99,10 @@ MU_ERR_URL_MISS_PARTS       _("URL missing required parts")
 MU_ERR_URL_EXTRA_PARTS      _("URL has parts not allowed by its scheme")
 
 MU_ERR_INFO_UNAVAILABLE	    _("Information is not yet available")
+
+# The following are mapped to the corresponding EAI_ errors
+MU_ERR_NONAME	            _("Name or service not known")
+MU_ERR_BADFLAGS	            _("Bad value for flags")
+MU_ERR_SOCKTYPE             _("Socket type not supported")
+MU_ERR_FAMILY               _("Address family not supported")
+MU_ERR_SERVICE              _("Requested service not supported")
diff --git a/libmailutils/server/acl.c b/libmailutils/server/acl.c
index 0b7a507..ba1a4b8 100644
--- a/libmailutils/server/acl.c
+++ b/libmailutils/server/acl.c
@@ -40,14 +40,20 @@
 #include <mailutils/kwd.h>
 #include <mailutils/io.h>
 #include <mailutils/util.h>
+#include <mailutils/sockaddr.h>
+#include <mailutils/cidr.h>
+#include <mailutils/stream.h>
+#include <mailutils/stdstream.h>
+
+#ifndef MU_INADDR_BYTES
+#define MU_INADDR_BYTES 16
+#endif
 
 struct _mu_acl_entry
 {
   mu_acl_action_t action;
   void *arg;
-  unsigned netmask;
-  int salen;
-  struct sockaddr sa[1];
+  struct mu_cidr cidr;
 };
 
 struct _mu_acl
@@ -64,52 +70,19 @@ _destroy_acl_entry (void *item)
   /* FIXME: free arg? */
 }
 
-static size_t
-mu_acl_entry_size (int salen)
-{
-  return sizeof (struct _mu_acl_entry) + salen - sizeof (struct sockaddr);
-}
-
-static int
-prepare_sa (struct sockaddr *sa)
-{
-  switch (sa->sa_family)
-    {
-    case AF_INET:
-      {
-	struct sockaddr_in *s_in = (struct sockaddr_in *)sa;
-	s_in->sin_addr.s_addr = ntohl (s_in->sin_addr.s_addr);
-	break;
-      }
-      
-    case AF_UNIX:
-      break;
-
-    default:
-      return 1;
-    }
-  return 0;
-}
-
 int
 mu_acl_entry_create (struct _mu_acl_entry **pent,
 		     mu_acl_action_t action, void *data,
-		     struct sockaddr *sa, int salen, unsigned long netmask)
+		     struct mu_cidr *cidr)
 {
-  struct _mu_acl_entry *p = malloc (mu_acl_entry_size (salen));
+  struct _mu_acl_entry *p = malloc (sizeof (*p));
   if (!p)
     return EINVAL;
 
   p->action = action;
   p->arg = data;
-  p->netmask = ntohl (netmask);
-  p->salen = salen;
-  memcpy (p->sa, sa, salen);
-  if (prepare_sa (p->sa))
-    {
-      free (p);
-      return EINVAL;
-    }
+  memcpy (&p->cidr, cidr, sizeof (p->cidr));
+
   *pent = p;
   return 0;
 }
@@ -165,15 +138,14 @@ mu_acl_get_iterator (mu_acl_t acl, mu_iterator_t *pitr)
 
 int
 mu_acl_append (mu_acl_t acl, mu_acl_action_t act,
-	       void *data, struct sockaddr *sa, int salen,
-	       unsigned long netmask)
+	       void *data, struct mu_cidr *cidr)
 {
   int rc;
   struct _mu_acl_entry *ent;
   
   if (!acl)
     return EINVAL;
-  rc = mu_acl_entry_create (&ent, act, data, sa, salen, netmask);
+  rc = mu_acl_entry_create (&ent, act, data, cidr);
   if (rc)
     {
       mu_debug (MU_DEBCAT_ACL, MU_DEBUG_ERROR, 
@@ -193,14 +165,14 @@ mu_acl_append (mu_acl_t acl, mu_acl_action_t act,
 
 int
 mu_acl_prepend (mu_acl_t acl, mu_acl_action_t act, void *data,
-		struct sockaddr *sa, int salen, unsigned long netmask)
+		struct mu_cidr *cidr)
 {
   int rc;
   struct _mu_acl_entry *ent;
   
   if (!acl)
     return EINVAL;
-  rc = mu_acl_entry_create (&ent, act, data, sa, salen, netmask);
+  rc = mu_acl_entry_create (&ent, act, data, cidr);
   if (rc)
     {
       mu_debug (MU_DEBCAT_ACL, MU_DEBUG_ERROR,
@@ -219,8 +191,7 @@ mu_acl_prepend (mu_acl_t acl, mu_acl_action_t act, void *data,
 
 int
 mu_acl_insert (mu_acl_t acl, size_t pos, int before,
-	       mu_acl_action_t act, void *data,
-	       struct sockaddr *sa, int salen, unsigned long netmask)
+	       mu_acl_action_t act, void *data, struct mu_cidr *cidr)
 {
   int rc;
   void *ptr;
@@ -236,7 +207,7 @@ mu_acl_insert (mu_acl_t acl, size_t pos, int before,
                 ("No such entry %lu", (unsigned long) pos));
       return rc;
     }
-  rc = mu_acl_entry_create (&ent, act, data, sa, salen, netmask);
+  rc = mu_acl_entry_create (&ent, act, data, cidr);
   if (!ent)
     {
       mu_debug (MU_DEBCAT_ACL, MU_DEBUG_ERROR, 
@@ -279,124 +250,19 @@ mu_acl_string_to_action (const char *str, mu_acl_action_t *pres)
   return rc;
 }
 
-#define MU_S_UN_NAME(sa, salen) \
-  ((salen < mu_offsetof (struct sockaddr_un,sun_path)) ? "" : (sa)->sun_path)
-
-static void
-debug_sockaddr (struct sockaddr *sa, int salen)
-{
-  switch (sa->sa_family)
-    {
-    case AF_INET:
-      {
-	struct sockaddr_in s_in = *(struct sockaddr_in *)sa;
-	s_in.sin_addr.s_addr = htonl (s_in.sin_addr.s_addr);
-	mu_debug_log_cont ("{AF_INET %s:%d}",
-			   inet_ntoa (s_in.sin_addr), ntohs (s_in.sin_port));
-	break;
-      }
-
-    case AF_UNIX:
-      {
-	struct sockaddr_un *s_un = (struct sockaddr_un *)sa;
-	if (MU_S_UN_NAME(s_un, salen)[0] == 0)
-	  mu_debug_log_cont ("{AF_UNIX}");
-	else
-	  mu_debug_log_cont ("{AF_UNIX %s}", s_un->sun_path);
-	break;
-      }
-
-    default:
-      mu_debug_log_cont ("{Unsupported family: %d}", sa->sa_family);
-    }
-}
-
-size_t
-mu_stpcpy (char **pbuf, size_t *psize, const char *src)
-{
-  size_t slen = strlen (src);
-  if (pbuf == NULL || *pbuf == NULL)
-    return slen;
-  else
-    {
-      char *buf = *pbuf;
-      size_t size = *psize;
-      if (size > slen)
-	size = slen;
-      memcpy (buf, src, size);
-      *psize -= size;
-      *pbuf += size;
-      if (*psize)
-	**pbuf = 0;
-      else
-	(*pbuf)[-1] = 0;
-      return size;
-    }
-}
-
-void
-mu_sockaddr_to_str (const struct sockaddr *sa, int salen,
-		    char *bufptr, size_t buflen,
-		    size_t *plen)
+struct run_closure
 {
-  char *nbuf;
-  size_t len = 0;
-  switch (sa->sa_family)
-    {
-    case AF_INET:
-      {
-	struct sockaddr_in s_in = *(struct sockaddr_in *)sa;
-	len += mu_stpcpy (&bufptr, &buflen, inet_ntoa (s_in.sin_addr));
-	len += mu_stpcpy (&bufptr, &buflen, ":");
-	if (mu_asprintf (&nbuf, "%hu", ntohs (s_in.sin_port)) == 0)
-	  {
-	    len += mu_stpcpy (&bufptr, &buflen, nbuf);
-	    free (nbuf);
-	  }
-	break;
-      }
-
-    case AF_UNIX:
-      {
-	struct sockaddr_un *s_un = (struct sockaddr_un *)sa;
-	if (MU_S_UN_NAME(s_un, salen)[0] == 0)
-	  len += mu_stpcpy (&bufptr, &buflen, "anonymous socket");
-	else
-	  {
-	    len += mu_stpcpy (&bufptr, &buflen, "socket ");
-	    len += mu_stpcpy (&bufptr, &buflen, s_un->sun_path);
-	  }
-	break;
-      }
-
-    default:
-      len += mu_stpcpy (&bufptr, &buflen, "{Unsupported family");
-      if (mu_asprintf (&nbuf, ": %d", sa->sa_family) == 0)
-	{
-	  len += mu_stpcpy (&bufptr, &buflen, nbuf);
-	  free (nbuf);
-	}
-      len += mu_stpcpy (&bufptr, &buflen, "}");
-    }
-  if (plen)
-    *plen = len + 1;
-}
+  unsigned idx;
+  struct mu_cidr addr;
 
-char *
-mu_sockaddr_to_astr (const struct sockaddr *sa, int salen)
-{
-  size_t size;
-  char *p;
-  
-  mu_sockaddr_to_str (sa, salen, NULL, 0, &size);
-  p = malloc (size);
-  if (p)
-    mu_sockaddr_to_str (sa, salen, p, size, NULL);
-  return p;
-}
+  char ipstr[40];
+  char *addrstr;
+  char *numbuf;
+  mu_acl_result_t *result;
+};
 
 int
-_acl_match (struct _mu_acl_entry *ent, struct sockaddr *sa, int salen)
+_acl_match (struct _mu_acl_entry *ent, struct run_closure *rp)
 {
 #define RESMATCH(word)                                   \
   if (mu_debug_level_p (MU_DEBCAT_ACL, MU_DEBUG_TRACE9))     \
@@ -404,76 +270,26 @@ _acl_match (struct _mu_acl_entry *ent, struct sockaddr *sa, int salen)
 							      
   if (mu_debug_level_p (MU_DEBCAT_ACL, MU_DEBUG_TRACE9))
     {
-      struct in_addr a;
-      
-      mu_debug_log_begin ("Does ");
-      debug_sockaddr (sa, salen);
-      mu_debug_log_cont (" match ");
-      debug_sockaddr (ent->sa, salen);
-      a.s_addr = ent->netmask;
-      a.s_addr = htonl (a.s_addr);
-      mu_debug_log_cont (" netmask %s? ", inet_ntoa (a));
+      char *s;
+
+      if (ent->cidr.len == 0)
+	s = strdup ("any");
+      mu_cidr_format (&ent->cidr, 0, &s);
+      if (!rp->addrstr)
+	mu_cidr_format (&rp->addr, MU_CIDR_FMT_ADDRONLY, &rp->addrstr);
+      mu_debug_log_begin ("Does %s match %s? ", s, rp->addrstr);
+      free (s);
     }
 
-  if (ent->sa->sa_family != sa->sa_family)
+  if (ent->cidr.len > 0 && mu_cidr_match (&ent->cidr, &rp->addr))
     {
       RESMATCH ("no");
       return 1;
     }
-
-  switch (ent->sa->sa_family)
-    {
-    case AF_INET:
-      {
-	struct sockaddr_in *sin_ent = (struct sockaddr_in *)ent->sa;
-	struct sockaddr_in *sin_item = (struct sockaddr_in *)sa;
-	
-	if (sin_ent->sin_addr.s_addr !=
-	    (sin_item->sin_addr.s_addr & ent->netmask))
-	  {
-	    RESMATCH ("no (address differs)");
-	    return 1;
-	  }
-
-	if (sin_ent->sin_port && sin_item->sin_port
-	    && sin_ent->sin_port != sin_item->sin_port)
-	  {
-	    RESMATCH ("no (port differs)");
-	    return 1;
-	  }
-	break;
-      }
-	  
-    case AF_UNIX:
-      {
-	struct sockaddr_un *sun_ent = (struct sockaddr_un *)ent->sa;
-	struct sockaddr_un *sun_item = (struct sockaddr_un *)sa;
-
-	if (MU_S_UN_NAME (sun_ent, ent->salen)[0]
-	    && MU_S_UN_NAME (sun_item, salen)[0]
-	    && strcmp (sun_ent->sun_path, sun_item->sun_path))
-	  {
-	    RESMATCH ("no");
-	    return 1;
-	  }
-	break;
-      }
-    }
-  
   RESMATCH ("yes");
   return 0;
 }
 
-struct run_closure
-{
-  unsigned idx;
-  struct sockaddr *sa;
-  char *numbuf;
-  char *portbuf;
-  int salen;
-  mu_acl_result_t *result;
-};
-
 #define SEQ(s, n, l) \
   (((l) == (sizeof(s) - 1)) && memcmp (s, n, l) == 0)
 
@@ -489,40 +305,24 @@ acl_getvar (const char *name, size_t nlen, void *data)
       return rp->numbuf;
     }
   
-  switch (rp->sa->sa_family)
+  if (SEQ ("address", name, nlen))
     {
-    case AF_INET:
-      {
-	struct sockaddr_in *s_in = (struct sockaddr_in *)rp->sa;
-
-	if (SEQ ("address", name, nlen))
-	  {
-	    struct in_addr addr = s_in->sin_addr;
-	    addr.s_addr = htonl (addr.s_addr);
-	    return inet_ntoa (addr);
-	  }
+      if (!rp->addrstr)
+	mu_cidr_format (&rp->addr, MU_CIDR_FMT_ADDRONLY, &rp->addrstr);
+      return rp->addrstr;
+    }
 
-	if (SEQ ("port", name, nlen))
-	  {
-	    if (!rp->portbuf &&
-		mu_asprintf (&rp->portbuf, "%hu", ntohs (s_in->sin_port)))
-	      return NULL;
-	    return rp->portbuf;
-	  }
-	break;
-	
-      case AF_UNIX:
-	if (SEQ ("address", name, nlen))
-	  {
-	    struct sockaddr_un *s_un = (struct sockaddr_un *)rp->sa;
-	    if (rp->salen == sizeof (s_un->sun_family))
-	      return NULL;
-	    else
-	      return s_un->sun_path;
-	  }
-      }
-      break;
+#if 0
+  /* FIXME?: */
+  if (SEQ ("port", name, nlen))
+    {
+      if (!rp->portbuf &&
+	  mu_asprintf (&rp->portbuf, "%hu", ntohs (s_in->sin_port)))
+	return NULL;
+      return rp->portbuf;
     }
+#endif
+
   return NULL;
 }
 
@@ -535,12 +335,18 @@ expand_arg (const char *cmdline, struct run_closure *rp, char **s)
   
   mu_debug (MU_DEBCAT_ACL, MU_DEBUG_TRACE, ("Expanding \"%s\"", cmdline));
   env[0] = "family";
-  switch (rp->sa->sa_family)
+  switch (rp->addr.family)
     {
     case AF_INET:
       env[1] = "AF_INET";
       break;
 
+#ifdef MAILUTILS_IPV6
+    case AF_INET6:
+      env[1] = "AF_INET6";
+      break;
+#endif
+      
     case AF_UNIX:
       env[1] = "AF_UNIX";
       break;
@@ -654,7 +460,7 @@ _run_entry (void *item, void *data)
       mu_debug_log_begin ("%d:%s: ", rp->idx, s);
     }
   
-  if (_acl_match (ent, rp->sa, rp->salen) == 0)
+  if (_acl_match (ent, rp) == 0)
     {
       switch (ent->action)
 	{
@@ -678,8 +484,10 @@ _run_entry (void *item, void *data)
 	      }
 	    else
 	      {
-	        debug_sockaddr (rp->sa, rp->salen);
-	        mu_debug_log_nl ();
+		if (!rp->addrstr)
+		  mu_cidr_format (&rp->addr, MU_CIDR_FMT_ADDRONLY,
+				  &rp->addrstr);
+		mu_diag_output (MU_DIAG_INFO, "%s", rp->addrstr);
 	      }
 	  }
 	  break;
@@ -712,7 +520,7 @@ _run_entry (void *item, void *data)
     }
   
   if (mu_debug_level_p (MU_DEBCAT_ACL, MU_DEBUG_TRACE9))
-     mu_debug_log_nl ();
+    mu_stream_flush (mu_strerr);
   
   return status;
 }
@@ -721,40 +529,39 @@ int
 mu_acl_check_sockaddr (mu_acl_t acl, const struct sockaddr *sa, int salen,
 		       mu_acl_result_t *pres)
 {
+  int rc;
   struct run_closure r;
   
   if (!acl)
     return EINVAL;
 
-  r.sa = malloc (salen);
-  if (!r.sa)
-    return ENOMEM;
-  memcpy (r.sa, sa, salen);
-  if (prepare_sa (r.sa))
+  memset (&r, 0, sizeof (r));
+  if (sa->sa_family == AF_UNIX)
     {
-      free (r.sa);
-      return EINVAL;
+      *pres = mu_acl_result_accept;
+      return 0;
     }
-  r.salen = salen;
+  rc = mu_cidr_from_sockaddr (&r.addr, sa);
+  if (rc)
+    return rc;
   
   if (mu_debug_level_p (MU_DEBCAT_ACL, MU_DEBUG_TRACE9))
     {
-      mu_debug_log_begin ("Checking sockaddr ");
-      debug_sockaddr (r.sa, r.salen);
+      mu_cidr_format (&r.addr, MU_CIDR_FMT_ADDRONLY, &r.addrstr);
+      mu_debug_log_begin ("Checking sockaddr %s", r.addrstr);
       mu_debug_log_nl ();
     }
 
   r.idx = 0;
   r.result = pres;
   *r.result = mu_acl_result_undefined;
-  r.numbuf = r.portbuf = NULL;
+  r.numbuf = NULL;
   mu_list_do (acl->aclist, _run_entry, &r);
   free (r.numbuf);
-  free (r.portbuf);
-  free (r.sa);
+  free (r.addrstr);
   return 0;
 }
-	       
+
 int
 mu_acl_check_inaddr (mu_acl_t acl, const struct in_addr *inp,
 		     mu_acl_result_t *pres)
@@ -780,10 +587,17 @@ mu_acl_check_ipv4 (mu_acl_t acl, unsigned int addr, mu_acl_result_t *pres)
 int
 mu_acl_check_fd (mu_acl_t acl, int fd, mu_acl_result_t *pres)
 {
-  struct sockaddr_in cs;
-  socklen_t len = sizeof cs;
+  union
+  {
+    struct sockaddr sa;
+    struct sockaddr_in in;
+#ifdef MAILUTILS_IPV6
+    struct sockaddr_in6 in6;
+#endif
+  } addr;
+  socklen_t len = sizeof addr;
 
-  if (getpeername (fd, (struct sockaddr *) &cs, &len) < 0)
+  if (getpeername (fd, &addr.sa, &len) < 0)
     {
       mu_debug (MU_DEBCAT_ACL, MU_DEBUG_ERROR, 
 		("Cannot obtain IP address of client: %s",
@@ -791,6 +605,6 @@ mu_acl_check_fd (mu_acl_t acl, int fd, mu_acl_result_t *pres)
       return MU_ERR_FAILURE;
     }
 
-  return mu_acl_check_sockaddr (acl, (struct sockaddr *) &cs, len, pres);
+  return mu_acl_check_sockaddr (acl, &addr.sa, len, pres);
 }
 
diff --git a/libmailutils/server/ipsrv.c b/libmailutils/server/ipsrv.c
index a802908..73b2e36 100644
--- a/libmailutils/server/ipsrv.c
+++ b/libmailutils/server/ipsrv.c
@@ -34,13 +34,13 @@
 #include <mailutils/diag.h>
 #include <mailutils/errno.h>
 #include <mailutils/nls.h>
+#include <mailutils/sockaddr.h>
 
 
 struct _mu_ip_server
 {
   char *ident;
-  struct sockaddr *addr;
-  int addrlen;
+  struct mu_sockaddr *addr;
   int fd;
   int type;
   mu_acl_t acl;
@@ -66,8 +66,7 @@ struct _mu_ip_server
 #define IDENTSTR(s) ((s)->ident ? (s)->ident : "default")
 
 int
-mu_ip_server_create (mu_ip_server_t *psrv, struct sockaddr *addr,
-		     int addrlen, int type)
+mu_ip_server_create (mu_ip_server_t *psrv, struct mu_sockaddr *addr, int type)
 {
   struct _mu_ip_server *srv;
 
@@ -84,14 +83,7 @@ mu_ip_server_create (mu_ip_server_t *psrv, struct sockaddr *addr,
   srv = calloc (1, sizeof *srv);
   if (!srv)
     return ENOMEM;
-  srv->addr = calloc (1, addrlen);
-  if (!srv->addr)
-    {
-      free (srv);
-      return ENOMEM;
-    }
-  memcpy (srv->addr, addr, addrlen);
-  srv->addrlen = addrlen;
+  srv->addr = addr;
   srv->type = type;
   srv->fd = -1;
   switch (type)
@@ -120,7 +112,7 @@ mu_ip_server_destroy (mu_ip_server_t *psrv)
   if (srv->f_free)
     srv->f_free (srv->data);
   close (srv->fd);
-  free (srv->addr);
+  mu_sockaddr_free (srv->addr);
   free (srv->ident);
   if (srv->type == MU_IP_UDP && srv->v.udp_data.buf)
     free (srv->v.udp_data.buf);
@@ -234,6 +226,11 @@ mu_address_family_to_domain (int family)
     case AF_INET:
       return PF_INET;
 
+#ifdef MAILUTILS_IPV6
+    case AF_INET6:
+      return PF_INET6;
+#endif
+      
     default:
       abort ();
     }
@@ -247,14 +244,11 @@ mu_ip_server_open (mu_ip_server_t srv)
   if (!srv || srv->fd != -1)
     return EINVAL;
 
-  if (mu_debug_level_p (MU_DEBCAT_SERVER, MU_DEBUG_TRACE0))
-    {
-      char *p = mu_sockaddr_to_astr (srv->addr, srv->addrlen);
-      mu_debug_log ("opening server \"%s\" %s", IDENTSTR (srv), p);
-      free (p);
-    }
+  mu_debug (MU_DEBCAT_SERVER, MU_DEBUG_TRACE0,
+	    ("opening server \"%s\" %s", IDENTSTR (srv),
+	     mu_sockaddr_str (srv->addr)));
 
-  fd = socket (mu_address_family_to_domain (srv->addr->sa_family),
+  fd = socket (mu_address_family_to_domain (srv->addr->addr->sa_family),
 	       ((srv->type == MU_IP_UDP) ? SOCK_DGRAM : SOCK_STREAM), 0);
   if (fd == -1)
     {
@@ -263,7 +257,7 @@ mu_ip_server_open (mu_ip_server_t srv)
       return errno;
     }
   
-  switch (srv->addr->sa_family)
+  switch (srv->addr->addr->sa_family)
     {
     case AF_UNIX:
       {
@@ -299,7 +293,7 @@ mu_ip_server_open (mu_ip_server_t srv)
       }
       break;
 
-    case AF_INET:
+    default:
       {
 	int t;
 	
@@ -308,7 +302,7 @@ mu_ip_server_open (mu_ip_server_t srv)
       }
     }
   
-  if (bind (fd, srv->addr, srv->addrlen) == -1)
+  if (bind (fd, srv->addr->addr, srv->addr->addrlen) == -1)
     {
       mu_debug (MU_DEBCAT_SERVER, MU_DEBUG_ERROR,
 		("%s: bind: %s", IDENTSTR (srv), mu_strerror (errno)));
@@ -336,12 +330,9 @@ mu_ip_server_shutdown (mu_ip_server_t srv)
 {
   if (!srv || srv->fd != -1)
     return EINVAL;
-  if (mu_debug_level_p (MU_DEBCAT_SERVER, MU_DEBUG_TRACE0))
-    {
-      char *p = mu_sockaddr_to_astr (srv->addr, srv->addrlen);
-      mu_debug_log ("closing server \"%s\" %s", IDENTSTR (srv), p);
-      free (p);
-    }
+  mu_debug (MU_DEBCAT_SERVER, MU_DEBUG_TRACE0,
+	    ("closing server \"%s\" %s", IDENTSTR (srv),
+	     mu_sockaddr_str (srv->addr)));
   close (srv->fd);
   return 0;
 }
@@ -356,6 +347,9 @@ mu_ip_tcp_accept (mu_ip_server_t srv, void *call_data)
     struct sockaddr sa;
     struct sockaddr_in s_in;
     struct sockaddr_un s_un;
+#ifdef MAILUTILS_IPV6
+    struct sockaddr_in6 s_in6;
+#endif
   } client;
   
   socklen_t size = sizeof (client);
@@ -407,6 +401,9 @@ mu_ip_udp_accept (mu_ip_server_t srv, void *call_data)
     struct sockaddr sa;
     struct sockaddr_in s_in;
     struct sockaddr_un s_un;
+#ifdef MAILUTILS_IPV6
+    struct sockaddr_in6 s_in6;
+#endif
   } client;
   fd_set rdset;
   
@@ -463,7 +460,7 @@ mu_ip_udp_accept (mu_ip_server_t srv, void *call_data)
 		   IDENTSTR (srv), strerror (rc)));
       if (res == mu_acl_result_deny)
 	{
-	  char *p = mu_sockaddr_to_astr (srv->addr, srv->addrlen);
+	  char *p = mu_sockaddr_to_astr (&client.sa, salen);
 	  mu_diag_output (MU_DIAG_INFO, "Denying connection from %s", p);
 	  free (p);
 	  return 0;
@@ -528,22 +525,16 @@ mu_udp_server_get_rdata (mu_ip_server_t srv, char **pbuf, size_t *pbufsize)
 }
 
 int
-mu_ip_server_get_sockaddr (mu_ip_server_t srv, struct sockaddr *s, int *size)
+mu_ip_server_get_sockaddr (mu_ip_server_t srv, struct mu_sockaddr **psa)
 {
-  int len;
-  
-  if (!srv || !s)
+  if (!srv || !psa)
     return EINVAL;
-  if (s == 0)
-    len = srv->addrlen;
-  else
-    {
-      len = srv->addrlen;
-      if (*size < len)
-	return MU_ERR_BUFSPACE;
-      memcpy (s, srv->addr, len);
-    }
-  *size = len;
-  return 0;
+  return mu_sockaddr_copy (psa, srv->addr);
 }
-  
+
+const char *
+mu_ip_server_addrstr (mu_ip_server_t srv)
+{
+  return mu_sockaddr_str (srv->addr);
+}
+
diff --git a/libmailutils/server/msrv.c b/libmailutils/server/msrv.c
index 5c46e9d..d5ceb8a 100644
--- a/libmailutils/server/msrv.c
+++ b/libmailutils/server/msrv.c
@@ -41,6 +41,8 @@
 #include <mailutils/nls.h>
 #include <mailutils/daemon.h>
 #include <mailutils/acl.h>
+#include <mailutils/sockaddr.h>
+#include <mailutils/url.h>
 
 typedef RETSIGTYPE (*mu_sig_handler_t) (int);
 
@@ -65,19 +67,6 @@ set_signal (int sig, mu_sig_handler_t handler)
 # define NSIG 64
 #endif
 
-union m_sockaddr
-{
-  struct sockaddr s_sa;
-  struct sockaddr_in s_in;
-  struct sockaddr_un s_un;
-};
-
-struct m_default_address
-{
-  union m_sockaddr s;
-  int len;
-};
-
 struct _mu_m_server
 {
   char *ident;                   /* Server identifier, for logging purposes.*/
@@ -98,7 +87,7 @@ struct _mu_m_server
   size_t num_children;           /* Current number of running sub-processes. */
   pid_t *child_pid;
   char *pidfile;                 /* Name of a PID-file. */
-  struct m_default_address defaddr;  /* Default address. */
+  struct mu_sockaddr_hints hints; /* Default address hints. */
   time_t timeout;                /* Default idle timeout. */
   mu_acl_t acl;                  /* Global access control list. */
 
@@ -112,7 +101,7 @@ struct _mu_m_server
 struct m_srv_config        /* Configuration data for a single TCP server. */
 {
   mu_m_server_t msrv;      /* Parent m-server. */  
-  mu_ip_server_t tcpsrv;  /* TCP server these data are for. */
+  mu_ip_server_t tcpsrv;   /* TCP server these data are for. */
   mu_acl_t acl;            /* Access control list for this server. */ 
   int single_process;      /* Should it run as a single process? */
   int transcript;          /* Enable session transcript. */
@@ -395,33 +384,20 @@ mu_m_server_pidfile (mu_m_server_t srv)
 }
 
 void
-mu_m_server_set_default_address (mu_m_server_t srv, struct sockaddr *sa,
-				 int salen)
+mu_m_server_set_hints (mu_m_server_t srv, struct mu_sockaddr_hints *hints)
 {
-  if (salen > sizeof srv->defaddr.s)
-    {
-      mu_error (_("unhandled sockaddr size"));
-      abort ();
-    }
-  memcpy (&srv->defaddr.s.s_sa, sa, salen);
-  srv->defaddr.len = salen;
+  if (!hints)
+    memset (&srv->hints, 0, sizeof (srv->hints));
+  else
+    memcpy (&srv->hints, hints, sizeof (srv->hints));
 }
 
 int
-mu_m_server_get_default_address (mu_m_server_t srv, struct sockaddr *sa,
-				 int *salen)
+mu_m_server_get_hints (mu_m_server_t srv, struct mu_sockaddr_hints *hints)
 {
-  int len;
-  
-  if (!sa)
+  if (!hints)
     return EINVAL;
-  len = srv->defaddr.len;
-  if (sa)
-    {
-      if (*salen < len)
-	return MU_ERR_BUFSPACE;
-      memcpy (sa, &srv->defaddr.s.s_sa, len);
-    }
+  memcpy (hints, &srv->hints, sizeof (hints));
   return 0;
 }
 
@@ -429,11 +405,7 @@ mu_m_server_get_default_address (mu_m_server_t srv, struct sockaddr *sa,
 void
 mu_m_server_set_default_port (mu_m_server_t srv, int num)
 {
-  struct sockaddr_in s_in;
-  s_in.sin_family = AF_INET;
-  s_in.sin_addr.s_addr = htonl (INADDR_ANY);
-  s_in.sin_port = htons (num);
-  mu_m_server_set_default_address (srv, (struct sockaddr*) &s_in, sizeof s_in);
+  srv->hints.port = num;
 }
 
 void
@@ -473,12 +445,12 @@ static int m_srv_conn (int fd, struct sockaddr *sa, int salen,
 		       mu_ip_server_t srv);
 
 static struct m_srv_config *
-add_server (mu_m_server_t msrv, struct sockaddr *s, int slen, int type)
+add_server (mu_m_server_t msrv, struct mu_sockaddr *s, int type)
 {
   mu_ip_server_t tcpsrv;
   struct m_srv_config *pconf;
 
-  MU_ASSERT (mu_ip_server_create (&tcpsrv, s, slen, type)); /* FIXME: type */
+  MU_ASSERT (mu_ip_server_create (&tcpsrv, s, type)); /* FIXME: type */
   MU_ASSERT (mu_ip_server_set_conn (tcpsrv, m_srv_conn));
   pconf = calloc (1, sizeof (*pconf));
   if (!pconf)
@@ -513,8 +485,21 @@ mu_m_server_begin (mu_m_server_t msrv)
     alloc_children (msrv);
 
   mu_list_count (msrv->srvlist, &count);
-  if (count == 0 && msrv->defaddr.len)
-    add_server (msrv, &msrv->defaddr.s.s_sa, msrv->defaddr.len, msrv->deftype);
+  if (count == 0)
+    {
+      struct mu_sockaddr *ta;
+
+      msrv->hints.flags = MU_AH_PASSIVE;
+      rc = mu_sockaddr_from_node (&ta, NULL, NULL, &msrv->hints);
+      if (rc == 0)
+	while (ta)
+	  {
+	    struct mu_sockaddr *next = ta->next;
+	    ta->next = ta->prev = NULL;
+	    add_server (msrv, ta, msrv->deftype);
+	    ta = next;
+	  }
+    }
   
   if (!msrv->foreground)
     {
@@ -599,23 +584,13 @@ tcp_conn_free (void *conn_data, void *server_data)
 static int
 _open_conn (void *item, void *data)
 {
-  union
-  {
-    struct sockaddr sa;
-    char pad[512];
-  }
-  addr;
-  int addrlen = sizeof addr;
-  char *p;
   mu_ip_server_t tcpsrv = item;
   mu_m_server_t msrv = data;
   int rc = mu_ip_server_open (tcpsrv);
   if (rc)
     {
-      mu_ip_server_get_sockaddr (tcpsrv, &addr.sa, &addrlen);
-      p = mu_sockaddr_to_astr (&addr.sa, addrlen);
-      mu_error (_("cannot open connection on %s: %s"), p, mu_strerror (rc));
-      free (p);
+      mu_error (_("cannot open connection on %s: %s"),
+		mu_ip_server_addrstr (tcpsrv), mu_strerror (rc));
       return 0;
     }
   rc = mu_server_add_connection (msrv->server,
@@ -624,10 +599,8 @@ _open_conn (void *item, void *data)
 				 tcp_conn_handler, tcp_conn_free);
   if (rc)
     {
-      mu_ip_server_get_sockaddr (tcpsrv, &addr.sa, &addrlen);
-      p = mu_sockaddr_to_astr (&addr.sa, addrlen);
-      mu_error (_("cannot add connection %s: %s"), p, mu_strerror (rc));
-      free (p);
+      mu_error (_("cannot add connection %s: %s"),
+		mu_ip_server_addrstr (tcpsrv), mu_strerror (rc));
       mu_ip_server_shutdown (tcpsrv);
       mu_ip_server_destroy (&tcpsrv);
     }
@@ -756,199 +729,55 @@ m_srv_conn (int fd, struct sockaddr *sa, int salen,
 }
 
 
-
-unsigned short
-get_port (const char *p)
-{
-  if (p)
-    {
-      char *q;
-      unsigned long n = strtoul (p, &q, 0);
-      if (*q == 0)
-	{
-	  if (n > USHRT_MAX)
-	    {
-	      mu_error (_("invalid port number: %s"), p);
-	      return 1;
-	    }
-	  
-	  return htons (n);
-	}
-      else
-	{
-	  struct servent *sp = getservbyname (p, "tcp");
-	  if (!sp)
-	    return 0;
-	  return sp->s_port;
-	}
-    }
-  return 0;
-}
-
-static int
-get_family (const char **pstr, sa_family_t *pfamily)
-{
-  static struct family_tab
-  {
-    int len;
-    char *pfx;
-    int family;
-  } ftab[] = {
-#define S(s,f) { sizeof (#s":") - 1, #s":", f }
-    S (file, AF_UNIX),
-    S (unix, AF_UNIX),
-    S (local, AF_UNIX),
-    S (socket, AF_UNIX),
-    S (inet, AF_INET),
-    S (tcp, AF_INET),
-#undef S
-    { 0 }
-  };
-  struct family_tab *fp;
-  
-  const char *str = *pstr;
-  int len = strlen (str);
-  for (fp = ftab; fp->len; fp++)
-    {
-      if (len > fp->len && memcmp (str, fp->pfx, fp->len) == 0)
-	{
-	  str += fp->len;
-	  if (str[0] == '/' && str[1] == '/')
-	    str += 2;
-	  *pstr = str;
-	  *pfamily = fp->family;
-	  return 0;
-	}
-    }
-  return 1;
-}
-
-static int
-is_ip_addr (const char *arg)
-{
-  int     dot_count;
-  int     digit_count;
-
-  dot_count = 0;
-  digit_count = 0;
-  for (; *arg != 0 && *arg != ':'; arg++)
-    {
-      if (*arg == '.')
-	{
-	  if (++dot_count > 3)
-	    break;
-	  digit_count = 0;
-	}
-      else if (!(mu_isdigit (*arg) && ++digit_count <= 3))
-	return 0;
-    }
-  return dot_count == 3;
-}  
-
 int
-_mu_m_server_parse_url (const char *arg, union m_sockaddr *s,
-			int *psalen, struct sockaddr *defsa)
+mu_m_server_parse_url (mu_m_server_t msrv, const char *arg,
+		       struct mu_sockaddr **psa)
 {
-  char *p;
-  unsigned short n;
-  int len;
-      
-  if (is_ip_addr (arg))
-    s->s_sa.sa_family = AF_INET;
-  else if (get_family (&arg, &s->s_sa.sa_family))
+  int rc;
+  mu_url_t url, url_hint;
+
+  if (arg[0] == '/')
+    url_hint = NULL;
+  else
     {
-      mu_error (_("invalid family"));
-      return EINVAL;
+      rc = mu_url_create (&url_hint, "inet://");
+      if (rc)
+	return rc;
     }
-      
-  switch (s->s_sa.sa_family)
+  rc = mu_url_create_hint (&url, arg, MU_URL_PARSE_DEFAULT, url_hint);
+  mu_url_destroy (&url_hint);
+  if (rc)
     {
-    case AF_INET:
-      *psalen = sizeof (s->s_in);
-      if ((n = get_port (arg)))
-	{
-	  s->s_in.sin_addr.s_addr = htonl (INADDR_ANY);
-	  s->s_in.sin_port = htons (n);	  
-	}
-      else
-	{
-	  p = strchr (arg, ':');
-	  if (p)
-	    *p++ = 0;
-	  if (inet_aton (arg, &s->s_in.sin_addr) == 0)
-	    {
-	      struct hostent *hp = gethostbyname (arg);
-	      if (hp)
-		s->s_in.sin_addr.s_addr = *(unsigned long *)hp->h_addr;
-	      else
-		{
-		  mu_error (_("invalid IP address: %s"), arg);
-		  return EINVAL;
-		}
-	    }
-	  if (p)
-	    {
-	      n = get_port (p);
-	      if (!n)
-		{
-		  mu_error (_("invalid port number: %s"), p);
-		  return EINVAL;
-		}
-	      s->s_in.sin_port = n;
-	    }
-	  else if (defsa && defsa->sa_family == AF_INET)
-	    s->s_in.sin_port = ((struct sockaddr_in*)defsa)->sin_port;
-	  else
-	    {
-	      mu_error (_("missing port number"));
-	      return EINVAL;
-	    }
-	}
-      break;
-
-    case AF_UNIX:
-      *psalen = sizeof (s->s_un);
-      len = strlen (arg);
-      if (len > sizeof s->s_un.sun_path - 1)
-	{
-	  mu_error (_("%s: file name too long"), arg);
-	  return EINVAL;
-	}
-      strcpy (s->s_un.sun_path, arg);
-      break;
+      mu_error (_("cannot parse URL `%s': %s"), arg, mu_strerror (rc));
+      return rc;
     }
-  return 0;
-}
-
-int
-mu_m_server_parse_url (mu_m_server_t msrv, char *arg,
-		       struct sockaddr *sa, int *psalen)
-{
-  int rc;
-  union m_sockaddr s;
-  int salen;
 
-  rc = _mu_m_server_parse_url (arg, &s, &salen, &msrv->defaddr.s.s_sa);
+  msrv->hints.flags = MU_AH_PASSIVE;
+  rc = mu_sockaddr_from_url (psa, url, &msrv->hints);
   if (rc)
-    return rc;
-  if (sa)
-    {
-      if (*psalen < salen)
-	return MU_ERR_BUFSPACE;
-      memcpy (sa, &s.s_sa, salen);
-    }
-  *psalen = salen;
-  return 0;
+    mu_error (_("cannot create sockaddr for URL `%s': %s"), arg,
+	      mu_strerror (rc));
+  mu_url_destroy (&url);
+  return rc;
 }
 
 static int
 server_block_begin (const char *arg, mu_m_server_t msrv, void **pdata)
 {
-  union m_sockaddr s;
-  int salen;
-  if (_mu_m_server_parse_url (arg, &s, &salen, &msrv->defaddr.s.s_sa))
+  struct mu_sockaddr *s;
+  if (mu_m_server_parse_url (msrv, arg, &s))
     return 1;
-  *pdata = add_server (msrv, &s.s_sa, salen, msrv->deftype);
+  if (s->next)
+    {
+      /* FIXME: (1) Find a way to handle all addresses.
+	        (2) Print which address is being used.
+      */
+      mu_diag_output (MU_DIAG_WARNING,
+		      _("%s resolves to several addresses, "
+			"only the first is used"), arg);
+      mu_sockaddr_free (s->next);
+    }
+  *pdata = add_server (msrv, s, msrv->deftype);
   return 0;
 }
 
@@ -1002,21 +831,46 @@ _cb_daemon_mode (void *data, mu_config_value_t *val)
   return 0;
 }
 
+unsigned short
+get_port (const char *p)
+{
+  if (p)
+    {
+      char *q;
+      unsigned long n = strtoul (p, &q, 0);
+      if (*q == 0)
+	{
+	  if (n > USHRT_MAX)
+	    {
+	      mu_error (_("invalid port number: %s"), p);
+	      return 1;
+	    }
+	  
+	  return htons (n);
+	}
+      else
+	{
+	  struct servent *sp = getservbyname (p, "tcp");
+	  if (!sp)
+	    return 0;
+	  return sp->s_port;
+	}
+    }
+  return 0;
+}
+
 static int
 _cb_port (void *data, mu_config_value_t *val)
 {
-  struct m_default_address *ap = data;
+  struct mu_sockaddr_hints *hp = data;
   unsigned short num;
-
+  
   if (mu_cfg_assert_value_type (val, MU_CFG_STRING))
     return 1;
   num = get_port (val->v.string);
   if (!num)
     return 1;
-  ap->s.s_in.sin_family = AF_INET;
-  ap->s.s_in.sin_addr.s_addr = htonl (INADDR_ANY);
-  ap->s.s_in.sin_port = num;
-  ap->len = sizeof ap->s.s_in;
+  hp->port = num;
   return 0;
 }
 
@@ -1036,7 +890,7 @@ static struct mu_cfg_param dot_server_cfg_param[] = {
     N_("Store PID of the master process in this file."),
     N_("file") },
   { "port", mu_cfg_callback,
-    NULL, mu_offsetof (struct _mu_m_server,defaddr), _cb_port,
+    NULL, mu_offsetof (struct _mu_m_server, hints), _cb_port,
     N_("Default port number.") },
   { "timeout", mu_cfg_time,
     NULL, mu_offsetof (struct _mu_m_server,timeout), NULL,
diff --git a/libmailutils/property/Makefile.am b/libmailutils/sockaddr/Makefile.am
similarity index 79%
copy from libmailutils/property/Makefile.am
copy to libmailutils/sockaddr/Makefile.am
index 60d10bc..dcfb184 100644
--- a/libmailutils/property/Makefile.am
+++ b/libmailutils/sockaddr/Makefile.am
@@ -1,5 +1,5 @@
 # GNU Mailutils -- a suite of utilities for electronic mail
-# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011 Free Software Foundation, Inc.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,16 +15,17 @@
 # Public License along with this library.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-noinst_LTLIBRARIES = libproperty.la
+noinst_LTLIBRARIES = libsockaddr.la
 
-libproperty_la_SOURCES = \
- assocprop.c\
+libsockaddr_la_SOURCES = \
+ copy.c\
  create.c\
- mhprop.c\
- propclr.c\
- propget.c\
- propitr.c\
- propinv.c\
- propset.c
+ free.c\
+ fromnode.c\
+ insert.c\
+ ipaddr.c\
+ str.c\
+ unlink.c\
+ url.c
 
 INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/url/urlstr.c b/libmailutils/sockaddr/copy.c
similarity index 74%
copy from libmailutils/url/urlstr.c
copy to libmailutils/sockaddr/copy.c
index f2faa81..5e28e78 100644
--- a/libmailutils/url/urlstr.c
+++ b/libmailutils/sockaddr/copy.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011 Free Software Foundation, Inc.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -18,14 +18,19 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
 #include <stdlib.h>
-#include <mailutils/types.h>
-#include <mailutils/sys/url.h>
+#include <mailutils/sockaddr.h>
 
-const char *
-mu_url_to_string (const mu_url_t url)
+int
+mu_sockaddr_copy (struct mu_sockaddr **pnew, struct mu_sockaddr *old)
 {
-  if (url == NULL || url->name == NULL)
-    return "";
-  return url->name;
+  if (!old)
+    {
+      *pnew = NULL;
+      return 0;
+    }
+  return mu_sockaddr_create (pnew, old->addr, old->addrlen);
 }
+
+
diff --git a/libmailutils/base/getmaxfd.c b/libmailutils/sockaddr/create.c
similarity index 65%
copy from libmailutils/base/getmaxfd.c
copy to libmailutils/sockaddr/create.c
index b905ac8..5b49471 100644
--- a/libmailutils/base/getmaxfd.c
+++ b/libmailutils/sockaddr/create.c
@@ -19,22 +19,29 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
-#include <limits.h>
-
-#if defined (HAVE_SYSCONF) && defined (_SC_OPEN_MAX)
-# define __getmaxfd() sysconf (_SC_OPEN_MAX)
-#elif defined (HAVE_GETDTABLESIZE)
-# define __getmaxfd() getdtablesize ()
-#elif defined OPEN_MAX
-# define __getmaxfd() OPEN_MAX
-#else
-# define __getmaxfd() 256
-#endif
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <mailutils/sockaddr.h>
 
 int
-mu_getmaxfd ()
+mu_sockaddr_create (struct mu_sockaddr **res,
+		    struct sockaddr *addr, socklen_t len)
 {
-  return __getmaxfd ();
+  struct mu_sockaddr *sa;
+
+  sa = calloc (1, sizeof (*sa));
+  if (!sa)
+    return ENOMEM;
+  sa->addr = malloc (len);
+  if (!sa->addr)
+    {
+      free (sa);
+      return ENOMEM;
+    }
+  memcpy (sa->addr, addr, len);
+  sa->addrlen = len;
+  *res = sa;
+  return 0;
 }
 
diff --git a/libmailutils/base/getmaxfd.c b/libmailutils/sockaddr/free.c
similarity index 66%
copy from libmailutils/base/getmaxfd.c
copy to libmailutils/sockaddr/free.c
index b905ac8..2a31ec3 100644
--- a/libmailutils/base/getmaxfd.c
+++ b/libmailutils/sockaddr/free.c
@@ -19,22 +19,32 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
-#include <limits.h>
-
-#if defined (HAVE_SYSCONF) && defined (_SC_OPEN_MAX)
-# define __getmaxfd() sysconf (_SC_OPEN_MAX)
-#elif defined (HAVE_GETDTABLESIZE)
-# define __getmaxfd() getdtablesize ()
-#elif defined OPEN_MAX
-# define __getmaxfd() OPEN_MAX
-#else
-# define __getmaxfd() 256
-#endif
+#include <stdlib.h>
+#include <mailutils/sockaddr.h>
 
-int
-mu_getmaxfd ()
+void
+mu_sockaddr_free (struct mu_sockaddr *addr)
 {
-  return __getmaxfd ();
+  if (!addr)
+    return;
+  free (addr->addr);
+  free (addr->str);
 }
 
+void
+mu_sockaddr_free_list (struct mu_sockaddr *addr)
+{
+  if (!addr)
+    return;
+  if (addr->prev)
+    addr->prev->next = NULL;
+  while (addr)
+    {
+      struct mu_sockaddr *next = addr->next;
+      mu_sockaddr_free (addr);
+      addr = next;
+    }
+}
+
+
+    
diff --git a/libmailutils/sockaddr/fromnode.c b/libmailutils/sockaddr/fromnode.c
new file mode 100644
index 0000000..d79b952
--- /dev/null
+++ b/libmailutils/sockaddr/fromnode.c
@@ -0,0 +1,253 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library.  If not, see 
+   <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <mailutils/sockaddr.h>
+#include <mailutils/url.h>
+#include <mailutils/io.h>
+#include <mailutils/errno.h>
+#include <mailutils/error.h>
+#include <mailutils/nls.h>
+
+static struct mu_sockaddr *
+match_sa (struct mu_sockaddr *list, struct sockaddr *sa, socklen_t len)
+{
+  for (; list; list = list->next)
+    if (len == list->addrlen && memcmp (list->addr, sa, len) == 0)
+      break;
+  return list;
+}
+
+int
+mu_sockaddr_from_node (struct mu_sockaddr **retval, const char *node,
+		       const char *serv, struct mu_sockaddr_hints *mh)
+{
+  int rc;
+
+  if (!mh)
+    {
+      static struct mu_sockaddr_hints nullhints = { 0, AF_UNSPEC };
+      mh = &nullhints;
+    }
+
+  if (mh->family == AF_UNIX)
+    {
+      size_t slen;
+      struct sockaddr_un s_un;
+
+      if (!node)
+	return MU_ERR_NONAME;
+      slen = strlen (node);
+      if (slen >= sizeof s_un.sun_path)
+	return MU_ERR_BUFSPACE;
+
+      s_un.sun_family = AF_UNIX;
+      strcpy(s_un.sun_path, node);
+      return mu_sockaddr_create (retval, (struct sockaddr*) &s_un,
+				 sizeof (s_un));
+    }
+  else 
+#ifdef MAILUTILS_IPV6
+    {
+      struct addrinfo hints;
+      struct addrinfo *res, *ap;
+      char portbuf[64];
+      struct mu_sockaddr *tail = NULL;
+      
+      memset (&hints, 0, sizeof (hints));
+      hints.ai_family = mh->family;
+      hints.ai_socktype = mh->socktype;
+      hints.ai_protocol = mh->protocol;
+
+      if (!node)
+	{
+	  if (mh->flags & MU_AH_PASSIVE)
+	    hints.ai_flags |= AI_PASSIVE;
+	  else
+	    return MU_ERR_NONAME;
+	}
+      if (!serv && mh->port)
+	{
+	  snprintf (portbuf, sizeof portbuf, "%hu", mh->port);
+	  serv = portbuf;
+	}
+	
+      rc = getaddrinfo (node, serv, &hints, &res);
+
+      switch (rc)
+	{
+	case 0:
+	  break;
+
+	case EAI_FAIL:
+	  return MU_ERR_GETHOSTBYNAME;
+	  
+	case EAI_FAMILY:
+	  return MU_ERR_FAMILY;
+
+	case EAI_NONAME:
+	  return MU_ERR_NONAME;
+	  
+	case EAI_SERVICE:
+	  return MU_ERR_SERVICE;
+
+	case EAI_SYSTEM:
+	  mu_error (_("%s:%s: cannot parse address: %s"),
+		    node, serv, mu_strerror (errno));
+	  return errno;
+			
+	case EAI_BADFLAGS:
+	  return MU_ERR_BADFLAGS;
+	  
+	case EAI_SOCKTYPE:
+	  return MU_ERR_SOCKTYPE;
+			
+	case EAI_MEMORY:
+	  return ENOMEM;
+			
+	default:
+	  mu_error ("%s:%s: %s", node, serv, gai_strerror (rc));
+	  return MU_ERR_FAILURE;
+	}
+
+      *retval = NULL;
+      for (ap = res; ap; ap = ap->ai_next)
+	if (mh->family == AF_UNSPEC || ap->ai_addr->sa_family == mh->family)
+	  {
+	    struct mu_sockaddr *sa;
+
+	    if (match_sa (*retval, ap->ai_addr, ap->ai_addrlen))
+	      continue;
+	    rc = mu_sockaddr_create (&sa, ap->ai_addr, ap->ai_addrlen);
+	    if (rc)
+	      {
+		mu_sockaddr_free_list (*retval);
+		freeaddrinfo (res);
+		return rc;
+	      }
+	    if (tail)
+	      mu_sockaddr_insert (tail, sa, 0);
+	    else
+	      *retval = sa;
+	    tail = sa;
+	  }
+      freeaddrinfo (res);
+    }
+#else
+  if (mh->family == AF_INET)
+    {
+      short port;
+      struct hostent *hp;
+      struct mu_sockaddr *tail = NULL;
+      char **p;
+
+      if (serv)
+	{
+	  char *end;
+	  unsigned long n = strtoul (serv, &end, 10);
+
+	  if (*end)
+	    {
+	      struct servent *sp;
+	      const char *proto;
+
+	      if (mh->protocol)
+		{
+		  struct protoent *pp = getprotobynumber (mh->protocol);
+		  if (!pp)
+		    return EINVAL;
+		  proto = pp->p_name;
+		}
+	      else
+		proto = NULL;
+	      
+	      sp = getservbyname (serv, proto);
+	      if (!sp)
+		return MU_ERR_SERVICE;
+	      port = sp->s_port;
+	    }
+	  else if (n == 0 || (port = n) != n)
+	    return MU_ERR_PARSE; /* FIXME: need MU_ERR_RANGE? */
+	}
+      else if (mh->port)
+	port = htons (mh->port);
+      else
+	return MU_ERR_NONAME;
+
+      if (!node)
+	{
+	  struct sockaddr_in s_in;
+
+	  if (!(mh->flags & MU_AH_PASSIVE))
+	    return MU_ERR_NONAME;
+
+	  s_in.sin_family = AF_INET;
+	  s_in.sin_addr.s_addr = INADDR_ANY;
+	  s_in.sin_port = port;
+	  return mu_sockaddr_create (retval, (struct sockaddr*)&s_in,
+				     sizeof (s_in));
+	}
+      
+      hp = gethostbyname (node);
+      if (!hp)
+	return MU_ERR_GETHOSTBYNAME;
+
+      if (hp->h_addrtype != AF_INET || hp->h_length != 4)
+	return MU_ERR_FAMILY;
+
+      for (p = hp->h_addr_list; *p; p++)
+	{
+	  struct mu_sockaddr *sa;
+	  struct sockaddr_in s_in;
+
+	  s_in.sin_family = AF_INET;
+	  memcpy(&s_in.sin_addr, *p, 4);
+	  s_in.sin_port = port;
+	    
+	  rc = mu_sockaddr_create (&sa, (struct sockaddr*)&s_in,
+				   sizeof (s_in));
+	  if (rc)
+	    {
+	      mu_sockaddr_free_list (*retval);
+	      return rc;
+	    }
+	  if (tail)
+	    mu_sockaddr_insert (tail, sa, 0);
+	  else
+	    *retval = sa;
+	  tail = sa;
+	}
+    }
+  else
+    return MU_ERR_FAMILY;
+#endif
+  return 0;
+}
diff --git a/libmailutils/base/getmaxfd.c b/libmailutils/sockaddr/insert.c
similarity index 53%
copy from libmailutils/base/getmaxfd.c
copy to libmailutils/sockaddr/insert.c
index b905ac8..dbac151 100644
--- a/libmailutils/base/getmaxfd.c
+++ b/libmailutils/sockaddr/insert.c
@@ -19,22 +19,46 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
-#include <limits.h>
-
-#if defined (HAVE_SYSCONF) && defined (_SC_OPEN_MAX)
-# define __getmaxfd() sysconf (_SC_OPEN_MAX)
-#elif defined (HAVE_GETDTABLESIZE)
-# define __getmaxfd() getdtablesize ()
-#elif defined OPEN_MAX
-# define __getmaxfd() OPEN_MAX
-#else
-# define __getmaxfd() 256
-#endif
+#include <stdlib.h>
+#include <mailutils/sockaddr.h>
 
-int
-mu_getmaxfd ()
+static void
+set_next (struct mu_sockaddr *sp, struct mu_sockaddr *tgt)
 {
-  return __getmaxfd ();
+  for (; sp->next; sp = sp->next)
+    ;
+  sp->next = tgt;
+  if (tgt)
+    tgt->prev = sp;
 }
 
+struct mu_sockaddr *
+mu_sockaddr_insert (struct mu_sockaddr *anchor, struct mu_sockaddr *addr,
+		    int before)
+{
+  struct mu_sockaddr *ret = anchor;
+
+  if (!anchor)
+    {
+      addr->prev = NULL;
+      set_next (addr, NULL);
+      return addr;
+    }
+  
+  if (before)
+    {
+      if (anchor->prev)
+	anchor = anchor->prev;
+      else
+	{
+	  addr->prev = NULL;
+	  set_next (addr, anchor);
+	  return addr;
+	}
+    }
+
+  set_next (addr, anchor->next);
+  anchor->next = addr;
+  addr->prev = anchor;
+  return ret;
+}
diff --git a/libmailutils/sockaddr/ipaddr.c b/libmailutils/sockaddr/ipaddr.c
new file mode 100644
index 0000000..6b14b4c
--- /dev/null
+++ b/libmailutils/sockaddr/ipaddr.c
@@ -0,0 +1,88 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library.  If not, see 
+   <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <string.h>
+#include <mailutils/sockaddr.h>
+#include <mailutils/cctype.h>
+
+int 
+mu_str_is_ipv4 (const char *addr)
+{
+  int dot_count = 0;
+  int digit_count = 0;
+
+  for (; *addr; addr++)
+    {
+      if (!mu_isascii (*addr))
+	return 0;
+      if (*addr == '.')
+	{
+	  if (++dot_count > 3)
+	    break;
+	  digit_count = 0;
+	}
+      else if (!(mu_isdigit (*addr) && ++digit_count <= 3))
+	return 0;
+    }
+
+  return (dot_count == 3);
+}
+
+int 
+mu_str_is_ipv6 (const char *addr)
+{
+  int col_count = 0; /* Number of colons */
+  int dcol = 0;      /* Did we encounter a double-colon? */
+  int dig_count = 0; /* Number of digits in the last group */
+	
+  for (; *addr; addr++)
+    {
+      if (!mu_isascii (*addr))
+	return 0;
+      else if (mu_isxdigit (*addr))
+	{
+	  if (++dig_count > 4)
+	    return 0;
+	}
+      else if (*addr == ':')
+	{
+	  if (col_count && dig_count == 0 && ++dcol > 1)
+	    return 0;
+	  if (++col_count > 7)
+	    return 0;
+	  dig_count = 0;
+	}
+      else
+	return 0;
+    }
+  
+  return (col_count == 7 || dcol);
+}
+
+int
+mu_str_is_ipaddr (const char *addr)
+{
+  if (strchr (addr, '.'))
+    return mu_str_is_ipv4(addr);
+  else if (strchr (addr, ':'))
+    return mu_str_is_ipv6(addr);
+  return 0;
+}
diff --git a/libmailutils/sockaddr/str.c b/libmailutils/sockaddr/str.c
new file mode 100644
index 0000000..949f21e
--- /dev/null
+++ b/libmailutils/sockaddr/str.c
@@ -0,0 +1,109 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library.  If not, see 
+   <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
+#include <mailutils/sockaddr.h>
+#include <mailutils/errno.h>
+#include <mailutils/io.h>
+
+static char *default_sockaddr_text = "[not enogh memory]";
+
+#define S_UN_NAME(sa, salen) \
+	((salen < mu_offsetof(struct sockaddr_un,sun_path)) ?	\
+	  "" : (sa)->sun_path)
+
+int
+mu_sockaddr_format (char **pbuf, const struct sockaddr *sa, socklen_t salen)
+{
+  int rc = MU_ERR_FAILURE;
+  
+  switch (sa->sa_family)
+    {
+#ifdef MAILUTILS_IPV6
+    case AF_INET:
+    case AF_INET6:
+      {
+	char host[NI_MAXHOST];
+	char srv[NI_MAXSERV];
+	if (getnameinfo (sa, salen,
+			 host, sizeof (host), srv, sizeof (srv),
+			 NI_NUMERICHOST|NI_NUMERICSERV) == 0)
+	  {
+	    if (sa->sa_family == AF_INET6)
+	      rc = mu_asprintf (pbuf, "inet6://[%s]:%s", host, srv);
+	    else
+	      rc = mu_asprintf (pbuf, "inet://%s:%s", host, srv);
+	  }
+	else
+	  rc = mu_asprintf (pbuf, "%s://[getnameinfo failed]",
+			    sa->sa_family == AF_INET ?
+			    "inet" : "inet6");
+	break;
+      }
+#else
+    case AF_INET:
+      {
+	struct sockaddr_in *s_in = (struct sockaddr_in *)sa;
+	rc = mu_asprintf (pbuf, "inet://%s:%hu",
+			  inet_ntoa (s_in->sin_addr), s_in->sin_port);
+	break;
+      }
+#endif
+      
+    case AF_UNIX:
+      {
+	struct sockaddr_un *s_un = (struct sockaddr_un *)sa;
+	if (S_UN_NAME (s_un, salen)[0] == 0)
+	  rc = mu_asprintf (pbuf, "unix://[anonymous socket]");
+	else
+	  rc = mu_asprintf (pbuf, "unix://%s", s_un->sun_path);
+	break;
+      }
+
+    default:
+      rc = mu_asprintf (pbuf, "family:%d", sa->sa_family);
+    }
+  return rc;
+}
+
+char *
+mu_sockaddr_to_astr (const struct sockaddr *sa, int salen)
+{
+  char *buf = NULL;
+  mu_sockaddr_format (&buf, sa, salen);
+  return buf;
+}
+
+const char *
+mu_sockaddr_str (struct mu_sockaddr *sa)
+{
+	if (!sa->str && mu_sockaddr_format (&sa->str, sa->addr, sa->addrlen))
+	  return default_sockaddr_text;
+	return sa->str;
+}
+
+
diff --git a/libmailutils/base/getmaxfd.c b/libmailutils/sockaddr/unlink.c
similarity index 70%
copy from libmailutils/base/getmaxfd.c
copy to libmailutils/sockaddr/unlink.c
index b905ac8..65808f5 100644
--- a/libmailutils/base/getmaxfd.c
+++ b/libmailutils/sockaddr/unlink.c
@@ -19,22 +19,27 @@
 # include <config.h>
 #endif
 
-#include <unistd.h>
-#include <limits.h>
-
-#if defined (HAVE_SYSCONF) && defined (_SC_OPEN_MAX)
-# define __getmaxfd() sysconf (_SC_OPEN_MAX)
-#elif defined (HAVE_GETDTABLESIZE)
-# define __getmaxfd() getdtablesize ()
-#elif defined OPEN_MAX
-# define __getmaxfd() OPEN_MAX
-#else
-# define __getmaxfd() 256
-#endif
+#include <stdlib.h>
+#include <mailutils/sockaddr.h>
 
-int
-mu_getmaxfd ()
+struct mu_sockaddr *
+mu_sockaddr_unlink (struct mu_sockaddr *addr)
 {
-  return __getmaxfd ();
+  struct mu_sockaddr *p;
+
+  if (!addr)
+    return NULL;
+
+  p = addr->prev;
+  if (p)
+    p->next = addr->next;
+  
+  p = addr->next;
+  if (p)
+    p->prev = addr->prev;
+
+  addr->prev = addr->next = NULL;
+  
+  return p;
 }
 
diff --git a/libmailutils/sockaddr/url.c b/libmailutils/sockaddr/url.c
new file mode 100644
index 0000000..0eaf870
--- /dev/null
+++ b/libmailutils/sockaddr/url.c
@@ -0,0 +1,130 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library.  If not, see 
+   <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <mailutils/sockaddr.h>
+#include <mailutils/url.h>
+#include <mailutils/io.h>
+#include <mailutils/errno.h>
+#include <mailutils/nls.h>
+#include <mailutils/kwd.h>
+
+static struct mu_kwd famtab[] = {
+  { "unix", AF_UNIX },
+  { "local", AF_UNIX },
+  { "inet4", AF_INET },
+#ifdef MAILUTILS_IPV6
+  { "inet6", AF_INET6 },
+  { "inet",  AF_UNSPEC },
+#else
+  { "inet",  AF_INET },
+#endif
+  { NULL }
+};
+
+int
+mu_sockaddr_from_url (struct mu_sockaddr **retval, mu_url_t url,
+		      struct mu_sockaddr_hints *mh)
+{
+  int rc;
+  const char *scheme;
+  const char *node = NULL, *serv = NULL;
+  struct mu_sockaddr_hints hints;
+  
+  if (mh)
+    memcpy (&hints, mh, sizeof (hints));
+  else
+    {
+      memset (&hints, sizeof(hints), 0);
+      hints.family = AF_UNSPEC;
+      hints.socktype = SOCK_STREAM;
+      hints.protocol = IPPROTO_TCP;
+    }
+
+  if (hints.family == AF_UNSPEC)
+    {
+      rc = mu_url_sget_scheme (url, &scheme);
+      if (rc)
+	return rc;
+
+      if (mu_kwd_xlat_name (famtab, scheme, &hints.family))
+	{
+	  if (hints.flags & MU_AH_DETECT_FAMILY)
+	    {
+	      int flags = 0;
+	      
+	      mu_url_get_flags (url, &flags);
+#ifdef MAILUTILS_IPV6
+	      if (flags & MU_URL_IPV6)
+		hints.family = AF_INET6;
+	      else
+#endif
+		if (flags & (MU_URL_HOST|MU_URL_PORT))
+		  hints.family = AF_INET;
+	      else if (flags & MU_URL_PATH)
+		hints.family = AF_UNIX;
+	      else
+		return MU_ERR_FAMILY;
+	    }
+	  else
+	    return MU_ERR_FAMILY;
+	}
+    }
+  
+  if (hints.family == AF_UNIX)
+    {
+      rc = mu_url_sget_path (url, &node);
+      if (rc)
+	{
+	  if (rc == MU_ERR_NOENT)
+	    {
+	      rc = mu_url_sget_host (url, &node);
+	      if (rc == MU_ERR_NOENT)
+		return MU_ERR_NONAME;
+	    }
+	  if (rc)
+	    return rc;
+	}
+    }
+  else
+    {
+#ifdef MAILUTILS_IPV6
+      if (hints.family == AF_UNSPEC)
+	hints.family = mu_url_has_flag (url, MU_URL_IPV6) ? AF_INET6 : AF_INET;
+#endif
+      rc = mu_url_sget_host (url, &node);
+      if (rc && rc != MU_ERR_NOENT)
+	return MU_ERR_NONAME;
+      rc = mu_url_sget_portstr (url, &serv);
+      if (rc && rc != MU_ERR_NOENT)
+	return MU_ERR_NONAME;
+    }
+  return mu_sockaddr_from_node (retval, node, serv, &hints);
+}
diff --git a/libmailutils/stream/tcp.c b/libmailutils/stream/tcp.c
index 40b3712..f383f1b 100644
--- a/libmailutils/stream/tcp.c
+++ b/libmailutils/stream/tcp.c
@@ -39,7 +39,7 @@
 #include <mailutils/errno.h>
 #include <mailutils/stream.h>
 #include <mailutils/util.h>
-
+#include <mailutils/sockaddr.h>
 #include <mailutils/sys/stream.h>
 
 #define TCP_STATE_INIT 		1
@@ -52,18 +52,11 @@ struct _tcp_instance
 {
   struct _mu_stream stream;
   int 		fd;
-  char 		*host;
-  unsigned short port;
   int		state;
-  unsigned long	address;
-  unsigned long source_addr;
+  struct mu_sockaddr *remote_addr;
+  struct mu_sockaddr *source_addr;
 };
 
-/* On solaris inet_addr() return -1.  */
-#ifndef INADDR_NONE
-# define INADDR_NONE (unsigned long)-1
-#endif
-
 static int
 _tcp_close (mu_stream_t stream)
 {
@@ -83,28 +76,12 @@ _tcp_close (mu_stream_t stream)
 }
 
 static int
-resolve_hostname (const char *host, unsigned long *ip)
-{
-  unsigned long address = inet_addr (host);
-  if (address == INADDR_NONE)
-    {
-      struct hostent *phe = gethostbyname (host);
-      if (!phe)
-	return MU_ERR_GETHOSTBYNAME;
-      address = *(((unsigned long **) phe->h_addr_list)[0]);
-    }
-  *ip = address;
-  return 0;
-}
-
-static int
 _tcp_open (mu_stream_t stream)
 {
   struct _tcp_instance *tcp = (struct _tcp_instance *)stream;
   int flgs, ret;
   socklen_t namelen;
   struct sockaddr_in peer_addr;
-  struct sockaddr_in soc_addr;
   int flags;
 
   mu_stream_get_flags (stream, &flags);
@@ -114,7 +91,8 @@ _tcp_open (mu_stream_t stream)
     case TCP_STATE_INIT:
       if (tcp->fd == -1)
 	{
-	  if ((tcp->fd = socket (PF_INET, SOCK_STREAM, 0)) == -1)
+	  tcp->fd = socket (tcp->remote_addr->addr->sa_family, SOCK_STREAM, 0);
+	  if (tcp->fd == -1)
 	    return errno;
 	}
       if (flags & MU_STREAM_NONBLOCK)
@@ -124,13 +102,10 @@ _tcp_open (mu_stream_t stream)
 	  fcntl (tcp->fd, F_SETFL, flgs);
 	  mu_stream_set_flags (stream, MU_STREAM_NONBLOCK);
 	}
-      if (tcp->source_addr != INADDR_ANY)
+      if (tcp->source_addr)
 	{
-	  struct sockaddr_in s;
-	  s.sin_family = AF_INET;
-	  s.sin_addr.s_addr = tcp->source_addr;
-	  s.sin_port = 0;
-	  if (bind (tcp->fd, (struct sockaddr*) &s, sizeof(s)) < 0)
+	  if (bind (tcp->fd, tcp->source_addr->addr,
+		    tcp->source_addr->addrlen) < 0)
 	    {
 	      int e = errno;
 	      close (tcp->fd);
@@ -142,27 +117,11 @@ _tcp_open (mu_stream_t stream)
       tcp->state = TCP_STATE_RESOLVING;
       
     case TCP_STATE_RESOLVING:
-      if (!(tcp->host != NULL && tcp->port > 0))
-	{
-	  _tcp_close (stream);
-	  return EINVAL;
-	}
-      
-      if ((ret = resolve_hostname (tcp->host, &tcp->address)))
-	{
-	  _tcp_close (stream);
-	  return ret;
-	}
       tcp->state = TCP_STATE_RESOLVE;
       
     case TCP_STATE_RESOLVE:
-      memset (&soc_addr, 0, sizeof (soc_addr));
-      soc_addr.sin_family = AF_INET;
-      soc_addr.sin_port = htons (tcp->port);
-      soc_addr.sin_addr.s_addr = tcp->address;
-
-      if ((connect (tcp->fd,
-		    (struct sockaddr *) &soc_addr, sizeof (soc_addr))) == -1)
+      if (connect (tcp->fd, tcp->remote_addr->addr,
+		   tcp->remote_addr->addrlen) == -1)
 	{
 	  ret = errno;
 	  if (ret == EINPROGRESS || ret == EAGAIN)
@@ -254,10 +213,8 @@ _tcp_done (mu_stream_t stream)
 {
   struct _tcp_instance *tcp = (struct _tcp_instance *)stream;
 
-  if (tcp->host)
-    free (tcp->host);
-  if (tcp->fd != -1)
-    close (tcp->fd);
+  mu_sockaddr_free (tcp->remote_addr);
+  mu_sockaddr_free (tcp->source_addr);
 }
 
 int
@@ -315,33 +272,21 @@ _create_tcp_stream (int flags)
 }
 
 int
-mu_tcp_stream_create_with_source_ip (mu_stream_t *pstream,
-				     const char *host, unsigned port,
-				     unsigned long source_ip,
-				     int flags)
+mu_tcp_stream_create_from_sa (mu_stream_t *pstream,
+			      struct mu_sockaddr *remote_addr,
+			      struct mu_sockaddr *source_addr, int flags)
 {
   int rc;
   mu_stream_t stream;
   struct _tcp_instance *tcp;
 
-  if (host == NULL)
-    return MU_ERR_TCP_NO_HOST;
-
-  if (port > USHRT_MAX)
-    return MU_ERR_TCP_NO_PORT;
-
   tcp = _create_tcp_stream (flags | MU_STREAM_RDWR);
   if (!tcp)
     return ENOMEM;
-  tcp->host = strdup (host);
-  if (!tcp->host)
-    {
-      free (tcp);
-      return ENOMEM;
-    }
-  tcp->port = port;
-  tcp->state = TCP_STATE_INIT;
-  tcp->source_addr = source_ip;
+
+  tcp->remote_addr = remote_addr;
+  tcp->source_addr = source_addr;
+  
   stream = (mu_stream_t) tcp;
   rc = mu_stream_open (stream);
   if (rc == 0 || rc == EAGAIN || rc == EINPROGRESS)
@@ -351,24 +296,93 @@ mu_tcp_stream_create_with_source_ip (mu_stream_t *pstream,
   return rc;
 }
 
+
+int
+mu_tcp_stream_create_with_source_ip (mu_stream_t *pstream,
+				     const char *host, unsigned port,
+				     unsigned long source_ip,
+				     int flags)
+{
+  int rc;
+  struct mu_sockaddr *remote_addr, *source_addr = NULL;
+  struct mu_sockaddr_hints hints;
+  
+  memset (&hints, 0, sizeof hints);
+  hints.family = AF_INET;
+  hints.socktype = SOCK_STREAM;
+  hints.protocol = IPPROTO_TCP;
+  hints.port = port;
+  rc = mu_sockaddr_from_node (&remote_addr, host, NULL, &hints);
+  if (rc)
+    return rc;
+
+  if (source_ip)
+    {
+      struct sockaddr_in s;
+      s.sin_family = AF_INET;
+      s.sin_addr.s_addr = source_ip;
+      s.sin_port = 0;
+      rc = mu_sockaddr_create (&source_addr, (struct sockaddr*)&s,
+			       sizeof (s));
+      if (rc)
+	{
+	  mu_sockaddr_free (remote_addr);
+	  return 0;
+	}
+    }
+
+  rc = mu_tcp_stream_create_from_sa (pstream, remote_addr, source_addr, flags);
+  if (rc)
+    {
+      mu_sockaddr_free (remote_addr);
+      mu_sockaddr_free (source_addr);
+    }
+  return rc;
+}
+
 int
 mu_tcp_stream_create_with_source_host (mu_stream_t *stream,
 				       const char *host, unsigned port,
 				       const char *source_host,
 				       int flags)
 {
-  unsigned long source_addr;
-  int ret = resolve_hostname (source_host, &source_addr);
-  if (ret == 0)
-    ret = mu_tcp_stream_create_with_source_ip (stream, host, port,
-					       source_addr, flags);
-  return ret;
+  int rc;
+  struct mu_sockaddr *remote_addr, *source_addr = NULL;
+  struct mu_sockaddr_hints hints;
+  
+  memset (&hints, 0, sizeof hints);
+  hints.family = AF_INET;
+  hints.socktype = SOCK_STREAM;
+  hints.port = port;
+  rc = mu_sockaddr_from_node (&remote_addr, host, NULL, &hints);
+  if (rc)
+    return rc;
+
+  if (source_host)
+    {
+      hints.flags = MU_AH_PASSIVE;
+      hints.port = 0;
+      rc = mu_sockaddr_from_node (&source_addr, source_host, NULL, &hints);
+      if (rc)
+	{
+	  mu_sockaddr_free (remote_addr);
+	  return 0;
+	}
+    }
+
+  rc = mu_tcp_stream_create_from_sa (stream, remote_addr, source_addr, flags);
+  if (rc)
+    {
+      mu_sockaddr_free (remote_addr);
+      mu_sockaddr_free (source_addr);
+    }
+  return rc;
 }
        
 int
 mu_tcp_stream_create (mu_stream_t *stream, const char *host, unsigned port,
 		      int flags)
 {
-  return mu_tcp_stream_create_with_source_ip (stream, host, port,
-					      INADDR_ANY, flags);
+  return mu_tcp_stream_create_with_source_host (stream, host, port,
+						NULL, flags);
 }
diff --git a/libmailutils/tests/.gitignore b/libmailutils/tests/.gitignore
index d205efe..d01d4ad 100644
--- a/libmailutils/tests/.gitignore
+++ b/libmailutils/tests/.gitignore
@@ -1,5 +1,6 @@
 atconfig
 atlocal
+cidr
 package.m4
 testsuite
 testsuite.dir
diff --git a/libmailutils/tests/Makefile.am b/libmailutils/tests/Makefile.am
index 68618a1..5c00873 100644
--- a/libmailutils/tests/Makefile.am
+++ b/libmailutils/tests/Makefile.am
@@ -41,6 +41,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
 noinst_PROGRAMS = \
  addr\
+ cidr\
  debugspec\
  decode2047\
  encode2047\
diff --git a/libmailutils/tests/cidr.c b/libmailutils/tests/cidr.c
new file mode 100644
index 0000000..797fb24
--- /dev/null
+++ b/libmailutils/tests/cidr.c
@@ -0,0 +1,77 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 2011 Free Software Foundation, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library.  If not, see 
+   <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <mailutils/mailutils.h>
+
+static void
+print_bytes (unsigned char *b, size_t l)
+{
+  for (; l; l--, b++)
+    printf (" %02x", *b);
+  printf ("\n");
+}
+
+int
+main (int argc, char **argv)
+{
+  mu_set_program_name (argv[0]);
+  if (argc < 2)
+    {
+      mu_error ("usage: %s CIDR [CIDR...]", argv[0]);
+      return 1;
+    }
+
+  while (--argc)
+    {
+      char *arg = *++argv;
+      struct mu_cidr cidr;
+      int rc;
+      char *str;
+      
+      rc = mu_cidr_from_string (&cidr, arg);
+      if (rc)
+	{
+	  mu_error ("%s: %s", arg, mu_strerror (rc));
+	  continue;
+	}
+
+      printf ("%s:\n", arg);
+      printf ("family = %d\n", cidr.family);
+      printf ("len = %d\n", cidr.len);
+      printf ("address =");
+      print_bytes (cidr.address, cidr.len);
+      printf ("netmask =");
+      print_bytes (cidr.netmask, cidr.len);
+      rc = mu_cidr_format (&cidr, 0, &str);
+      if (rc)
+	{
+	  mu_error ("cannot covert to string: %s", mu_strerror (rc));
+	  return 2;
+	}
+
+      printf ("string = %s\n", str);
+      free (str);
+    }
+  return 0;
+}
+	
+	  
diff --git a/libmailutils/tests/url-parse.c b/libmailutils/tests/url-parse.c
index 86c9173..48dd40f 100644
--- a/libmailutils/tests/url-parse.c
+++ b/libmailutils/tests/url-parse.c
@@ -25,6 +25,7 @@
 #include <mailutils/errno.h>
 #include <mailutils/url.h>
 #include <mailutils/secret.h>
+#include <mailutils/kwd.h>
 
 #define CAT2(a,b) a ## b
 
@@ -73,12 +74,52 @@ print_query (mu_url_t url)
     printf ("query[%lu] <%s>\n", (unsigned long) i, qargv[i]);
 }
 
+struct mu_kwd parse_kwtab[] = {
+  { "hexcode", MU_URL_PARSE_HEXCODE },
+  { "hidepass", MU_URL_PARSE_HIDEPASS },
+  { "portsrv", MU_URL_PARSE_PORTSRV },
+  { "portwc", MU_URL_PARSE_PORTWC },
+  { "pipe",  MU_URL_PARSE_PIPE },
+  { "slash", MU_URL_PARSE_SLASH },
+  { "dslash_optional", MU_URL_PARSE_DSLASH_OPTIONAL },
+  { "default", MU_URL_PARSE_DEFAULT },
+  { "all", MU_URL_PARSE_ALL },
+  { NULL }
+};
+
+
 int
-main ()
+main (int argc, char **argv)
 {
   char str[1024];
   unsigned port = 0;
-  mu_url_t u = NULL;
+  mu_url_t u = NULL, uhint = NULL;
+  int i;
+  int parse_flags = 0;
+  int rc;
+  
+  mu_set_program_name (argv[0]);
+  for (i = 1; i < argc; i++)
+    {
+      int flag;
+
+      if (strncmp (argv[i], "hint=", 5) == 0)
+	{
+	  rc = mu_url_create (&uhint, argv[i] + 5);
+	  if (rc)
+	    {
+	      mu_error ("cannot create hints: %s", mu_strerror (rc));
+	      exit (1);
+	    }
+	}
+      else if (mu_kwd_xlat_name_ci (parse_kwtab, argv[i], &flag) == 0)
+	parse_flags |= flag;
+      else
+	{
+	  mu_error ("%s: unknown flag %s", argv[0], argv[i]);
+	  exit (1);
+	}
+    }
 
   while (fgets (str, sizeof (str), stdin) != NULL)
     {
@@ -89,9 +130,9 @@ main ()
       str[strlen (str) - 1] = '\0';     /* chop newline */
       if (strspn (str, " \t") == strlen (str))
         continue;               /* skip empty lines */
-      if ((rc = mu_url_create (&u, str)) != 0)
+      if ((rc = mu_url_create_hint (&u, str, parse_flags, uhint)) != 0)
         {
-          fprintf (stderr, "mu_url_create %s ERROR: [%d] %s",
+          fprintf (stderr, "mu_url_create %s ERROR: [%d] %s\n",
                    str, rc, mu_strerror (rc));
           exit (1);
         }
diff --git a/libmailutils/tests/url.at b/libmailutils/tests/url.at
index 8c392ea..c0669e2 100644
--- a/libmailutils/tests/url.at
+++ b/libmailutils/tests/url.at
@@ -20,10 +20,11 @@ dnl TESTURL([NAME], [KW = `'], [INPUT], [STDOUT = `'],
 dnl         [STDERR = `'], [RUN-IF-FAIL], [RUN-IF-PASS])
 dnl
 
+m4_pushdef([URL_PARSE_OPTIONS])
 m4_pushdef([TESTURL],[
 m4_pushdef([MU_TEST_GROUP],[Url])
 m4_pushdef([MU_TEST_KEYWORDS],[url])
-m4_pushdef([MU_TEST_COMMAND],[url-parse])
+m4_pushdef([MU_TEST_COMMAND],[url-parse URL_PARSE_OPTIONS])
 MU_GENERIC_TEST([$1],[$2 url-m4_translit($3,[ ],[_])],[$3],[],[$4],[$5])
 m4_popdef([MU_TEST_COMMAND])
 m4_popdef([MU_TEST_KEYWORDS])
@@ -32,6 +33,8 @@ m4_popdef([MU_TEST_GROUP])
 
 dnl ------------------------------------------------------------
 
+m4_define([URL_PARSE_OPTIONS],[default dslash_optional])
+
 TESTURL([],[],
 [scheme:],
 [scheme <scheme>
@@ -76,6 +79,10 @@ port 0
 path </absolute/path>
 ])
 
+dnl ------------------------------------------------------------
+
+m4_define([URL_PARSE_OPTIONS],[default])
+
 TESTURL([],[],
 [scheme://%75%73%65%72:%70%61%73%73@%68%6f%73%74],
 [scheme <scheme>
@@ -198,7 +205,7 @@ path </a/path>
 ])
 
 TESTURL([],[],
-[ftp:/a/path],
+[ftp:///a/path],
 [scheme <ftp>
 user <>
 passwd <>
@@ -716,6 +723,7 @@ path <mbox/user@host>
 param[0] <type=pass>
 ]])
 
+m4_pushdef([URL_PARSE_OPTIONS],[default dslash_optional])
 TESTURL([],[],
 [mbox:/var/spool/mail;type=index;param=2;user=gray],
 [[scheme <mbox>
@@ -729,6 +737,7 @@ param[0] <type=index>
 param[1] <param=2>
 param[2] <user=gray>
 ]])
+m4_popdef([URL_PARSE_OPTIONS])
 
 TESTURL([],[],
 [mbox:///var/spool/mail;type=index;param=2;user=gray],
@@ -823,3 +832,4 @@ query[1] <list@dom>
 ]])
 
 m4_popdef([TESTURL])
+m4_popdef([URL_PARSE_OPTIONS])
diff --git a/libmailutils/url/create.c b/libmailutils/url/create.c
index e580640..130b7a2 100644
--- a/libmailutils/url/create.c
+++ b/libmailutils/url/create.c
@@ -59,9 +59,9 @@ getkn (struct mu_url_ctx *ctx, char *delim)
   size_t n;
 
   if (*ctx->cur == 0)
-    return -1;
+    return MU_ERR_PARSE;
   n = strcspn (ctx->cur, delim);
-  if (n > ctx->toksize)
+  if (n + 1 > ctx->toksize)
     {
       char *p = realloc (ctx->tokbuf, n + 1);
       if (!p)
@@ -220,11 +220,28 @@ _mu_url_ctx_parse_host (struct mu_url_ctx *ctx, int has_host)
   int rc;
   mu_url_t url = ctx->url;
   
-  rc = getkn (ctx, ":/;?");
+  rc = getkn (ctx, "[:/;?");
   if (rc)
     return rc;
 
-  if (ctx->toklen)
+  if (*ctx->cur == '[')
+    {
+      /* Possibly IPv6 address */
+      rc = getkn (ctx, "]/;?");
+      if (rc)
+	return rc;
+      if (*ctx->cur == ']')
+	{
+	  ctx->cur++;
+	  rc = str_assign (&url->host, ctx->tokbuf + 1);
+	  if (rc)
+	    return rc;
+	  url->flags |= MU_URL_HOST | MU_URL_IPV6;
+	  has_host = 1;
+	}
+    }
+
+  if (!(url->flags & MU_URL_HOST) && ctx->toklen)
     {
       rc = str_assign (&url->host, ctx->tokbuf);
       if (rc)
@@ -232,22 +249,20 @@ _mu_url_ctx_parse_host (struct mu_url_ctx *ctx, int has_host)
       url->flags |= MU_URL_HOST;
       has_host = 1;
     }
-
+  
   if (*ctx->cur == ':')
     {
-      ctx->cur++;
       has_host = 1;
-
-      rc = getkn (ctx, "/;?");
+      ctx->cur++;
+      rc = getkn (ctx, ":/;?");
       if (rc)
 	return rc;
-      
       rc = str_assign (&url->portstr, ctx->tokbuf);
       if (rc)
 	return rc;
       url->flags |= MU_URL_PORT;
     }
-
+    
   if (*ctx->cur == '/')
     {
       if (has_host)
@@ -269,7 +284,9 @@ _mu_url_ctx_parse_cred (struct mu_url_ctx *ctx)
   int rc, has_cred;
   mu_url_t url = ctx->url;
   const char *save = ctx->cur;
-  
+
+  if (*ctx->cur == 0)
+    return 0;
   rc = getkn (ctx, "@");
   if (rc)
     return rc;
@@ -343,12 +360,18 @@ _mu_url_ctx_parse (struct mu_url_ctx *ctx)
 {
   int rc;
   mu_url_t url = ctx->url;
+  const char *save = ctx->cur;
   
   /* Parse the scheme part */
+  if (*ctx->cur == ':')
+    return _mu_url_ctx_parse_cred (ctx);
+  
   rc = getkn (ctx, ":/");
   if (rc)
     return rc;
-  if (*ctx->cur == ':')
+  if (*ctx->cur == ':'
+      && ((ctx->flags & MU_URL_PARSE_DSLASH_OPTIONAL)
+	  || (ctx->cur[1] == '/' && ctx->cur[2] == '/')))
     {
       rc = str_assign (&url->scheme, ctx->tokbuf);
       if (rc)
@@ -356,7 +379,12 @@ _mu_url_ctx_parse (struct mu_url_ctx *ctx)
       url->flags |= MU_URL_SCHEME;
       ctx->cur++;
     }
-
+  else
+    {
+      ctx->cur = save;
+      return _mu_url_ctx_parse_cred (ctx);
+    }
+  
   if (*ctx->cur == 0)
     return 0;
 
@@ -535,5 +563,6 @@ mu_url_create (mu_url_t *purl, const char *str)
 			     MU_URL_PARSE_HIDEPASS |
 			     MU_URL_PARSE_PORTSRV |
 			     MU_URL_PARSE_PIPE |
-			     MU_URL_PARSE_SLASH, NULL);
+			     MU_URL_PARSE_SLASH |
+			     MU_URL_PARSE_DSLASH_OPTIONAL, NULL);
 }
diff --git a/libmu_cfg/acl.c b/libmu_cfg/acl.c
index cfa9a54..e39b5fb 100644
--- a/libmu_cfg/acl.c
+++ b/libmu_cfg/acl.c
@@ -22,6 +22,7 @@
 #include "mailutils/libcfg.h"
 #include "mailutils/acl.h"
 #include "mailutils/argcv.h"
+#include "mailutils/cidr.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -53,53 +54,13 @@ getword (mu_config_value_t *val, int *pn)
   return v->v.string;
 }
 
-struct netdef
-{
-  struct sockaddr *sa;
-  int len;
-  unsigned long netmask;
-};
-
-#ifndef INADDR_ANY
-# define INADDR_ANY 0
-#endif
-
-int
-parse_address (const char *str, struct netdef *nd)
-{
-  struct sockaddr_in in;
-  
-  in.sin_family = AF_INET;
-  if (strcmp (str, "any") == 0)
-    {
-      in.sin_addr.s_addr = INADDR_ANY;
-      nd->netmask = 0;
-    }
-  else if (inet_aton (str, &in.sin_addr) == 0)
-    {
-      mu_error (_("invalid IPv4: %s"), str);
-      return 1;
-    }
-  in.sin_port = 0;
-  nd->len = sizeof (in);
-  nd->sa = malloc (nd->len);
-  if (!nd->sa)
-    {
-      mu_error ("%s", mu_strerror (errno));
-      return 1;
-    }
-  memcpy (nd->sa, &in, sizeof (in));
-  return 0;
-}
-
 static int
-parsearg (mu_config_value_t *val, struct netdef *pnd, char **prest) 
+parsearg (mu_config_value_t *val, struct mu_cidr *cidr, char **prest) 
 {
   const char *w;
-  char *p;  
-  unsigned long netmask;
   int n = 0;
-
+  int rc;
+  
   if (mu_cfg_assert_value_type (val, MU_CFG_ARRAY))
     return 1;
   
@@ -111,51 +72,19 @@ parsearg (mu_config_value_t *val, struct netdef *pnd, char **prest)
     if (!w)
       return 1;
   }
-  
-  p = strchr (w, '/');
-  if (p)
-    {
-      char *q;
-      unsigned netlen;
 
-      /* FIXME: This modifies a const char! */
-      *p++ = 0;
-      netlen = strtoul (p, &q, 10);
-      if (*q == 0)
-	{
-	  if (netlen == 0)
-	    netmask = 0;
-	  else
-	    {
-	      netmask = 0xfffffffful >> (32 - netlen);
-	      netmask <<= (32 - netlen);
-	      netmask = htonl (netmask);
-	    }
-	}
-      else if (*q == '.')
-	{
-	  struct in_addr addr;
-	      
-	  if (inet_aton (p, &addr) == 0)
-	    {
-	      mu_error (_("invalid netmask"));
-	      return 1;
-	    }
-	  netmask = addr.s_addr;
-	}
-      else
+  if (strcmp (w, "any") == 0)
+    cidr->len = 0;
+  else
+    {
+      rc = mu_cidr_from_string (cidr, w);
+      if (rc)
 	{
-	  mu_error (_("invalid netmask"));
+	  mu_error (_("invalid source CIDR: %s"), mu_strerror (rc));
 	  return 1;
 	}
     }
-  else
-    netmask = 0xfffffffful;
-
-  pnd->netmask = netmask;
-  if (parse_address (w, pnd))
-    return 1;
-
+  
   if (prest)
     {
       if (n == val->v.arg.c)
@@ -204,15 +133,13 @@ cb_allow (void *data, mu_config_value_t *val)
 {
   int rc;
   mu_acl_t acl = *(mu_acl_t*)data;
-  struct netdef ndef;
+  struct mu_cidr cidr;
   
-  if (parsearg (val, &ndef, NULL))
+  if (parsearg (val, &cidr, NULL))
     return 1;
-  rc = mu_acl_append (acl, mu_acl_accept, NULL, ndef.sa, ndef.len,
-		      ndef.netmask);
+  rc = mu_acl_append (acl, mu_acl_accept, NULL, &cidr);
   if (rc)
     mu_error (_("cannot append acl entry: %s"), mu_strerror (rc));
-  free (ndef.sa);
   return rc;
 }
 
@@ -221,15 +148,13 @@ cb_deny (void *data, mu_config_value_t *val)
 {
   int rc;
   mu_acl_t acl = *(mu_acl_t*)data;
-  struct netdef ndef;
+  struct mu_cidr cidr;
   
-  if (parsearg (val, &ndef, NULL))
+  if (parsearg (val, &cidr, NULL))
     return 1;
-  rc = mu_acl_append (acl, mu_acl_deny, NULL, ndef.sa, ndef.len,
-		      ndef.netmask);
+  rc = mu_acl_append (acl, mu_acl_deny, NULL, &cidr);
   if (rc)
     mu_error (_("cannot append acl entry: %s"), mu_strerror (rc));
-  free (ndef.sa);
   return rc;
 }
 
@@ -238,16 +163,14 @@ cb_log (void *data, mu_config_value_t *val)
 {
   int rc;
   mu_acl_t acl = *(mu_acl_t*)data;
-  struct netdef ndef;
+  struct mu_cidr cidr;
   char *rest;
   
-  if (parsearg (val, &ndef, &rest))
+  if (parsearg (val, &cidr, &rest))
     return 1;
-  rc = mu_acl_append (acl, mu_acl_log, rest, ndef.sa, ndef.len,
-		      ndef.netmask);
+  rc = mu_acl_append (acl, mu_acl_log, rest, &cidr);
   if (rc)
     mu_error (_("cannot append acl entry: %s"), mu_strerror (rc));
-  free (ndef.sa);
   return rc;
 }
 
@@ -256,16 +179,14 @@ cb_exec (void *data, mu_config_value_t *val)
 {
   int rc;
   mu_acl_t acl = *(mu_acl_t*)data;
-  struct netdef ndef;
+  struct mu_cidr cidr;
   char *rest;
   
-  if (parsearg (val, &ndef, &rest))
+  if (parsearg (val, &cidr, &rest))
     return 1;
-  rc = mu_acl_append (acl, mu_acl_exec, rest, ndef.sa, ndef.len,
-		      ndef.netmask);
+  rc = mu_acl_append (acl, mu_acl_exec, rest, &cidr);
   if (rc)
     mu_error (_("cannot append acl entry: %s"), mu_strerror (rc));
-  free (ndef.sa);
   return rc;
 }
 
@@ -274,16 +195,14 @@ cb_ifexec (void *data, mu_config_value_t *val)
 {
   int rc;
   mu_acl_t acl = *(mu_acl_t*)data;
-  struct netdef ndef;
+  struct mu_cidr cidr;
   char *rest;
   
-  if (parsearg (val, &ndef, &rest))
+  if (parsearg (val, &cidr, &rest))
     return 1;
-  rc = mu_acl_append (acl, mu_acl_ifexec, rest, ndef.sa, ndef.len,
-		      ndef.netmask);
+  rc = mu_acl_append (acl, mu_acl_ifexec, rest, &cidr);
   if (rc)
     mu_error (_("cannot append acl entry: %s"), mu_strerror (rc));
-  free (ndef.sa);
   return rc;
 }
 
diff --git a/libproto/mailer/smtp.c b/libproto/mailer/smtp.c
index fdda4b6..892a0ce 100644
--- a/libproto/mailer/smtp.c
+++ b/libproto/mailer/smtp.c
@@ -48,6 +48,7 @@
 #include <mailutils/smtp.h>
 #include <mailutils/tls.h>
 #include <mailutils/cstr.h>
+#include <mailutils/sockaddr.h>
 #include <mailutils/sys/mailer.h>
 #include <mailutils/sys/url.h>
 #include <mailutils/sys/registrar.h>
@@ -114,8 +115,7 @@ smtp_mailer_add_auth_mech (struct _smtp_mailer *smtp_mailer, const char *str)
 static int
 smtp_open (mu_mailer_t mailer, int flags)
 {
-  const char *host, *auth;
-  unsigned port;
+  const char *auth;
   struct _smtp_mailer *smtp_mailer = mailer->data;
   int rc;
   size_t parmc = 0;
@@ -138,12 +138,6 @@ smtp_open (mu_mailer_t mailer, int flags)
   mu_smtp_set_param (smtp_mailer->smtp, MU_SMTP_PARAM_URL,
 		     mu_url_to_string (mailer->url));
 
-  rc = mu_url_sget_host (mailer->url, &host);
-  if (rc)
-    return rc;
-  if (mu_url_get_port (mailer->url, &port))
-    port = 25;
-
   if (mu_url_sget_auth (mailer->url, &auth) == 0)
     smtp_mailer_add_auth_mech (smtp_mailer, auth);
   
@@ -166,7 +160,20 @@ smtp_open (mu_mailer_t mailer, int flags)
   
   if (mailer->stream == NULL)
     {
-      rc = mu_tcp_stream_create (&mailer->stream, host, port, mailer->flags);
+      struct mu_sockaddr *sa;
+      struct mu_sockaddr_hints hints;
+
+      memset (&hints, 0, sizeof (hints));
+      hints.flags = MU_AH_DETECT_FAMILY;
+      hints.port = 25;
+      hints.protocol = IPPROTO_TCP;
+      hints.socktype = SOCK_STREAM;
+      rc = mu_sockaddr_from_url (&sa, mailer->url, &hints);
+      if (rc)
+	return rc;
+      
+      rc = mu_tcp_stream_create_from_sa (&mailer->stream, sa, NULL,
+					 mailer->flags);
       if (rc)
 	return rc;
       mu_stream_set_buffer (mailer->stream, mu_buffer_line, 0);
diff --git a/libproto/pop/mbox.c b/libproto/pop/mbox.c
index 67d97a9..79854ae 100644
--- a/libproto/pop/mbox.c
+++ b/libproto/pop/mbox.c
@@ -27,6 +27,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <netdb.h>
 
 #include <mailutils/pop3.h>
 #include <mailutils/attribute.h>
@@ -50,6 +51,7 @@
 #include <mailutils/cstr.h>
 #include <mailutils/cctype.h>
 #include <mailutils/opool.h>
+#include <mailutils/sockaddr.h>
 
 #include <mailutils/sys/folder.h>
 #include <mailutils/sys/mailbox.h>
@@ -109,23 +111,26 @@ pop_open (mu_mailbox_t mbox, int flags)
 {
   struct _pop3_mailbox *mpd = mbox->data;
   int status;
-  const char *host;
-  unsigned port = mpd->pops ? MU_POPS_PORT : MU_POP_PORT;
   mu_stream_t stream;
-  
+  struct mu_sockaddr *sa;
+  struct mu_sockaddr_hints hints;
+
   /* Sanity checks. */
   if (mpd == NULL)
     return EINVAL;
   
-  /* Fetch the pop server name and the port in the mu_url_t.  */
-  status = mu_url_sget_host (mbox->url, &host);
-  if (status != 0)
-    return status;
-  mu_url_get_port (mbox->url, &port);
-
   mbox->flags = flags;
-
-  status = mu_tcp_stream_create (&stream, host, port, mbox->flags);
+  
+  memset (&hints, 0, sizeof (hints));
+  hints.flags = MU_AH_DETECT_FAMILY;
+  hints.port = mpd->pops ? MU_POPS_PORT : MU_POP_PORT;
+  hints.protocol = IPPROTO_TCP;
+  hints.socktype = SOCK_STREAM;
+  status = mu_sockaddr_from_url (&sa, mbox->url, &hints);
+  if (status)
+    return status;
+      
+  status = mu_tcp_stream_create_from_sa (&stream, sa, NULL, mbox->flags);
   if (status)
     return status;
 #ifdef WITH_TLS
diff --git a/mh/tests/comp.at b/mh/tests/comp.at
index a7367c2..30af571 100644
--- a/mh/tests/comp.at
+++ b/mh/tests/comp.at
@@ -18,8 +18,8 @@ m4_pushdef([MH_KEYWORDS],[comp])
 m4_pushdef([compcmd],[comp -editor $abs_top_srcdir/mh/tests/mhed])
 
 MH_CHECK([comp -file],[comp00 comp-file],[
-echo quit | compcmd -file ./infile | remove_curdir
-cat infile
+echo quit | compcmd -file ./infile | remove_curdir | sed 's/ *$//'
+sed 's/ *$//' infile
 ],
 [0],
 [-- Editor invocation: ./infile
@@ -51,8 +51,8 @@ Subject:
 What now?])
 
 MH_CHECK([comp file],[comp02 comp_file],[
-echo 'quit' | compcmd file | remove_curdir
-cat Mail/file 
+echo 'quit' | compcmd file | remove_curdir | sed 's/ *$//'
+sed 's/ *$//' Mail/file 
 ],
 [0], 
 [-- Editor invocation: Mail/file
@@ -78,8 +78,8 @@ Subject: test input
 message body
 ])
 
-echo 'quit' | compcmd -use file | remove_curdir
-cat Mail/file 
+echo 'quit' | compcmd -use file | remove_curdir | sed 's/ *$//'
+sed 's/ *$//' Mail/file 
 ],
 [0], 
 [-- Editor invocation: Mail/file
@@ -108,11 +108,11 @@ Subject: test input
 message body
 ])
 
-echo 'quit' | compcmd +inbox 1 | remove_curdir
+echo 'quit' | compcmd +inbox 1 | remove_curdir | sed 's/ *$//'
 echo Mail/draft
-cat Mail/draft
+sed 's/ *$//' Mail/draft
 echo Message
-cat Mail/inbox/1
+sed 's/ *$//' Mail/inbox/1
 ],
 [0], 
 [-- Editor invocation: Mail/draft
@@ -141,8 +141,8 @@ message body
 
 MH_CHECK([comp -draftfolder],[comp05 comp-draftfolder draftfolder],[
 mkdir Mail/drafts
-echo 'quit' | compcmd -draftfolder drafts | remove_curdir
-cat Mail/drafts/1
+echo 'quit' | compcmd -draftfolder drafts | remove_curdir | sed 's/ *$//'
+sed 's/ *$//' Mail/drafts/1
 ],
 [0],
 [-- Editor invocation: Mail/drafts/1
@@ -170,8 +170,8 @@ message body
 ])
 echo "cur: 1" > Mail/drafts/.mh_sequences
 
-echo 'quit' | compcmd -draftfolder drafts -use| remove_curdir
-cat Mail/drafts/1
+echo 'quit' | compcmd -draftfolder drafts -use| remove_curdir | sed 's/ *$//'
+sed 's/ *$//' Mail/drafts/1
 ],
 [0],
 [-- Editor invocation: Mail/drafts/1
diff --git a/mu/acl.c b/mu/acl.c
index 9e9fd8b..4f796c5 100644
--- a/mu/acl.c
+++ b/mu/acl.c
@@ -41,36 +41,10 @@ static struct argp_option acl_options[] = {
 };
 
 static char *input_file_name;
-static struct sockaddr *target_sa;
-static socklen_t target_salen;
+static struct mu_sockaddr *target_sa;
 static mu_acl_t acl;
 static const char *path = "acl";
 
-static struct sockaddr *
-parse_address (socklen_t *psalen, const char *str)
-{
-  struct sockaddr_in in;
-  struct sockaddr *sa;
-  
-  in.sin_family = AF_INET;
-  if (inet_aton (str, &in.sin_addr) == 0)
-    {
-      mu_error ("Invalid IPv4: %s", str);
-      exit (1);
-    }
-  in.sin_port = 0;
-  *psalen = sizeof (in);
-  sa = malloc (*psalen);
-  if (!sa)
-    {
-      mu_error ("%s", mu_strerror (errno));
-      exit (1);
-    }
-  
-  memcpy (sa, &in, sizeof (in));
-  return sa;
-}
-
 static error_t
 acl_parse_opt (int key, char *arg, struct argp_state *state)
 {
@@ -160,9 +134,17 @@ mutool_acl (int argc, char **argv)
     {
       const char *ap = *argv++;
 
-      target_sa = parse_address (&target_salen, ap);
+      rc = mu_sockaddr_from_node (&target_sa, ap, NULL, NULL);
+      if (rc)
+	{
+	  mu_error ("mu_sockaddr_from_node: %s", mu_strerror (rc));
+	  exit (1);
+	}
+
       mu_printf ("Testing %s:\n", ap);
-      rc = mu_acl_check_sockaddr (acl, target_sa, target_salen, &result);
+      rc = mu_acl_check_sockaddr (acl, target_sa->addr, target_sa->addrlen,
+				  &result);
+      mu_sockaddr_free_list (target_sa);
       if (rc)
 	{
 	  mu_error ("mu_acl_check_sockaddr failed: %s", mu_strerror (rc));
diff --git a/mu/imap.c b/mu/imap.c
index 85a27a3..deea939 100644
--- a/mu/imap.c
+++ b/mu/imap.c
@@ -113,7 +113,6 @@ com_verbose (int argc, char **argv)
 static int connect_argc;
 static char **connect_argv;
 #define host connect_argv[0]
-static int port = MU_IMAP_DEFAULT_PORT;
 
 static char *username;
 
@@ -171,7 +170,6 @@ static int
 com_connect (int argc, char **argv)
 {
   int status;
-  int n = 0;
   int tls = 0;
   int i = 1;
   enum mu_imap_state state;
@@ -194,16 +192,6 @@ com_connect (int argc, char **argv)
   argc -= i;
   argv += i;
   
-  if (argc >= 2)
-    {
-      if (get_port (argv[1], &n))
-	return 0;
-    }
-  else if (tls)
-    n = MU_IMAP_DEFAULT_SSL_PORT;
-  else
-    n = MU_IMAP_DEFAULT_PORT;
-
   state = current_imap_state ();
   
   if (state != MU_IMAP_STATE_INIT)
@@ -213,13 +201,23 @@ com_connect (int argc, char **argv)
   if (status == 0)
     {
       mu_stream_t tcp;
+      struct mu_sockaddr *sa;
+      struct mu_sockaddr_hints hints;
 
       if (QRY_VERBOSE ())
 	{
 	  imap_set_verbose ();
 	  imap_set_verbose_mask ();
 	}
-      status = mu_tcp_stream_create (&tcp, argv[0], n, MU_STREAM_READ);
+
+      memset (&hints, 0, sizeof (hints));
+      hints.flags = MU_AH_DETECT_FAMILY;
+      hints.port = tls ? MU_IMAP_DEFAULT_SSL_PORT : MU_IMAP_DEFAULT_PORT;
+      hints.protocol = IPPROTO_TCP;
+      hints.socktype = SOCK_STREAM;
+      status = mu_sockaddr_from_node (&sa, argv[0], argv[1], &hints);
+      if (status == 0)
+	status = mu_tcp_stream_create_from_sa (&tcp, sa, NULL, 0);
       if (status == 0)
 	{
 #ifdef WITH_TLS
@@ -263,7 +261,6 @@ com_connect (int argc, char **argv)
       for (i = 0; i < argc; i++)
 	connect_argv[i] = xstrdup (argv[i]);
       connect_argv[i] = NULL;
-      port = n;
     
       imap_prompt_env ();
     }
diff --git a/mu/pop.c b/mu/pop.c
index d72091c..de092cd 100644
--- a/mu/pop.c
+++ b/mu/pop.c
@@ -20,6 +20,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <netdb.h>
 #include <mailutils/mailutils.h>
 #include "mu.h"
 #include "argp.h"
@@ -470,12 +474,28 @@ com_disconnect (int argc MU_ARG_UNUSED, char **argv MU_ARG_UNUSED)
 }
 
 static int
+port_from_sa (struct mu_sockaddr *sa)
+{
+  switch (sa->addr->sa_family)
+    {
+    case AF_INET:
+      return ntohs (((struct sockaddr_in *)sa->addr)->sin_port);
+
+#ifdef MAILUTILS_IPV6
+    case AF_INET6:
+      return ntohs (((struct sockaddr_in6 *)sa->addr)->sin6_port);
+#endif
+    }
+  return 0;
+}
+
+static int
 com_connect (int argc, char **argv)
 {
   int status;
-  int n = 0;
   int tls = 0;
   int i = 1;
+  int n;
   
   for (i = 1; i < argc; i++)
     {
@@ -496,16 +516,6 @@ com_connect (int argc, char **argv)
   argc -= i;
   argv += i;
   
-  if (argc >= 2)
-    {
-      if (get_port (argv[1], &n))
-	return 0;
-    }
-  else if (tls)
-    n = MU_POP3_DEFAULT_SSL_PORT;
-  else
-    n = MU_POP3_DEFAULT_PORT;
-  
   if (pop_session_status != pop_session_disconnected)
     com_disconnect (0, NULL);
   
@@ -513,13 +523,26 @@ com_connect (int argc, char **argv)
   if (status == 0)
     {
       mu_stream_t tcp;
+      struct mu_sockaddr *sa;
+      struct mu_sockaddr_hints hints;
 
       if (QRY_VERBOSE ())
 	{
 	  pop_set_verbose ();
 	  pop_set_verbose_mask ();
 	}
-      status = mu_tcp_stream_create (&tcp, argv[0], n, MU_STREAM_READ);
+
+      memset (&hints, 0, sizeof (hints));
+      hints.flags = MU_AH_DETECT_FAMILY;
+      hints.port = tls ? MU_POP3_DEFAULT_SSL_PORT : MU_POP3_DEFAULT_PORT;
+      hints.protocol = IPPROTO_TCP;
+      hints.socktype = SOCK_STREAM;
+      status = mu_sockaddr_from_node (&sa, argv[0], argv[1], &hints);
+      if (status == 0)
+	{
+	  n = port_from_sa (sa);
+	  status = mu_tcp_stream_create_from_sa (&tcp, sa, NULL, 0);
+	}
       if (status == 0)
 	{
 #ifdef WITH_TLS
diff --git a/testsuite/smtpsend.c b/testsuite/smtpsend.c
index e831968..2fe2d9f 100644
--- a/testsuite/smtpsend.c
+++ b/testsuite/smtpsend.c
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <netdb.h>
 #include <mailutils/cctype.h>
 #include <mailutils/mailutils.h>
 #include <mailutils/smtp.h>
@@ -85,7 +86,7 @@ main (int argc, char **argv)
   int i;
   char *host = NULL;
   char *infile = NULL;
-  int port = 25;
+  char *port = NULL;
   int tls = 0;
   int raw = 1;
   int flags = 0;
@@ -96,6 +97,8 @@ main (int argc, char **argv)
   mu_list_t rcpt_list = NULL;
   mu_list_t meth_list = NULL;
   mu_list_t skiphdr_list = NULL;
+  struct mu_sockaddr *sa;
+  struct mu_sockaddr_hints hints;
   
   mu_set_program_name (argv[0]);
   mu_stdstream_setup ();
@@ -111,14 +114,7 @@ main (int argc, char **argv)
   for (i = 1; i < argc; i++)
     {
       if (strncmp (argv[i], "port=", 5) == 0)
-	{
-	  port = atoi (argv[i] + 5);
-	  if (port == 0)
-	    {
-	      mu_error ("invalid port");
-	      return 1;
-	    }
-	}
+	port = argv[i] + 5;
       else if (strncmp (argv[i], "trace=", 6) == 0)
 	{
 	  char *arg = argv[i] + 6;
@@ -194,7 +190,16 @@ main (int argc, char **argv)
     MU_ASSERT (mu_stdio_stream_create (&instr, MU_STDIN_FD, flags));
   
   host = argv[1];
-  MU_ASSERT (mu_tcp_stream_create (&stream, host, port, MU_STREAM_RDWR));
+
+  memset (&hints, 0, sizeof (hints)); 
+  hints.flags = MU_AH_DETECT_FAMILY;
+  hints.port = 25;
+  hints.protocol = IPPROTO_TCP;
+  hints.socktype = SOCK_STREAM;
+  MU_ASSERT (mu_sockaddr_from_node (&sa, host, port, &hints));
+
+  MU_ASSERT (mu_tcp_stream_create_from_sa (&stream, sa, NULL, MU_STREAM_RDWR));
+  
   mu_smtp_set_carrier (smtp, stream);
   mu_stream_unref (stream);
   


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Wed Mar 30 11:08:35 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q4x0d-0003lo-ME
	for mharc-commit-mailutils@gnu.org; Wed, 30 Mar 2011 11:08:35 -0400
Received: from [140.186.70.92] (port=40507 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q4x0U-0003hT-Mk
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 11:08:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q4x0T-0000Ag-34
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 11:08:26 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:47049)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q4x0T-0000Ac-1F
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 11:08:25 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q4x0S-0004Gv-Qw
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 15:08:25 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q4x0P-0002Ca-DK
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 15:08:24 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: adca074d616ac562095a92e01f2b181e6d3593c8
X-Git-Newrev: c722ac44a25551e82eadb03b622e1b23d70d8b40
Message-Id: <E1Q4x0P-0002Ca-DK@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 30 Mar 2011 15:08:21 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-363-gc722ac4
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Mar 2011 15:08:35 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=c722ac44a25551e82eadb03b622e1b23d70d8b40

The branch, master has been updated
       via  c722ac44a25551e82eadb03b622e1b23d70d8b40 (commit)
       via  fca5c9e3f62ade28bffcef684c78d0bbff869667 (commit)
      from  adca074d616ac562095a92e01f2b181e6d3593c8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c722ac44a25551e82eadb03b622e1b23d70d8b40
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Wed Mar 30 17:45:59 2011 +0300

    New configuration options to disable groups of utilities.
    
    * am/enable.m4 (MU_ENABLE_BUILD): Take optional 6th argument.  If
    given, append $1 to it.
    * configure.ac: New options: --enable-build-servers and
    --enable-build-clients.
    Print a list of selected utilities at the end of the run.
    * README: Document new options.

commit fca5c9e3f62ade28bffcef684c78d0bbff869667
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Wed Mar 30 16:30:03 2011 +0300

    Bugfix
    
    * libmailutils/sockaddr/fromnode.c [!MAILUTILS_IPV6] Handle
    AF_UNSPEC same way as AF_INET.
    Do not bail out if service is not given, assume port = 0 instead.
    * mailutils/base/version.c (mu_conf_option): Reflect IPv6 support.

-----------------------------------------------------------------------

Summary of changes:
 README                           |   18 ++++++++++--
 am/enable.m4                     |    3 +-
 configure.ac                     |   55 +++++++++++++++++++++++++++----------
 libmailutils/base/version.c      |    3 ++
 libmailutils/sockaddr/fromnode.c |    6 ++--
 5 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/README b/README
index 247a7ea..8bb2112 100644
--- a/README
+++ b/README
@@ -303,8 +303,20 @@ features:
                           Disables support for authentication using
                           virtual mail domains.
 
-Special options are provided that control whether each particular
-Mailutils program is built. These are:
+Mailutils is shipped with a set of various utilities, which are built
+by default.  These utilities fall into two groups:
+
+a) Server utilities: pop3d, imap4d and comsat.
+b) Client utilities: frm, maidag, mail, sieve, messages, readmsg,
+   dotlock, movemail mimeview, and MH utilities.
+
+The following options disable each group:
+   
+    --disable-build-servers    do not build server utilities
+    --disable-build-clients    do not build client utilities
+    	       
+Each particular program can be disabled using its individual
+`--disable-build' option:
 
     --disable-build-frm        do not build frm
     --disable-build-pop3d      do not build pop3d
@@ -319,7 +331,7 @@ Mailutils program is built. These are:
     --disable-build-dotlock    do not build dotlock
     --disable-build-movemail   do not build movemail
     --disable-build-mimeview   do not build mimeview
-    --disable-build-mh         do not build mh utilities
+    --disable-build-mh         do not build MH utilities
 
 Several environment variables affect the configuration. Currently,
 the only mailutils-specific variable is DEFAULT_CUPS_CONFDIR. It
diff --git a/am/enable.m4 b/am/enable.m4
index 5a2d8d0..6422517 100644
--- a/am/enable.m4
+++ b/am/enable.m4
@@ -53,7 +53,7 @@ AC_DEFUN([MU_ENABLE_SUPPORT], [
 ])
 
 dnl MU_ENABLE_BUILD(feature, [action-if-true], [action-if-false],
-dnl                 [additional-cond], [default-value])
+dnl                 [additional-cond], [default-value], [listvar])
 AC_DEFUN([MU_ENABLE_BUILD], [
 	pushdef([mu_upcase],translit($1,[a-z+-],[A-ZX_]))
 	pushdef([mu_cache_var],[mu_cv_enable_build_]translit($1,[+-],[x_]))
@@ -73,6 +73,7 @@ AC_DEFUN([MU_ENABLE_BUILD], [
 
 	  if test "[$]mu_cache_var" = "yes"; then
 		  ifelse([$2],,:,[$2])
+		  ifelse([$6],,,[$6="$[]$6 $1"])
 	  ifelse([$3],,,else
                  [$3])
 	  fi
diff --git a/configure.ac b/configure.ac
index 2edb494..9dc8855 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1180,20 +1180,36 @@ dnl ***********************************************************************
 dnl Configure particular utilities
 dnl ***********************************************************************
 
-MU_ENABLE_BUILD(frm)
-MU_ENABLE_BUILD(pop3d)
-MU_ENABLE_BUILD(imap4d)
-MU_ENABLE_BUILD(comsat)
-MU_ENABLE_BUILD(maidag)
-MU_ENABLE_BUILD(mail)
-MU_ENABLE_BUILD(sieve)
-MU_ENABLE_BUILD(messages)
-MU_ENABLE_BUILD(readmsg)
-MU_ENABLE_BUILD(dotlock)
-MU_ENABLE_BUILD(movemail)
-MU_ENABLE_BUILD(mimeview)
-
-MU_ENABLE_BUILD(mh,,,["$mu_cv_enable_mh" = yes])
+AC_ARG_ENABLE([build-servers],
+              AC_HELP_STRING([--enable-build-servers],
+                             [build servers]),
+              [mu_build_servers="${enableval}"],
+              [mu_build_servers=yes])
+
+AC_ARG_ENABLE([build-clients],
+              AC_HELP_STRING([--enable-build-clients],
+                             [build client utilities]),
+              [mu_build_clients="${enableval}"],
+              [mu_build_clients=yes])
+
+server_list=
+client_list=
+
+MU_ENABLE_BUILD(pop3d,,,["$mu_build_servers" = yes],,[server_list])
+MU_ENABLE_BUILD(imap4d,,,["$mu_build_servers" = yes],,[server_list])
+MU_ENABLE_BUILD(comsat,,,["$mu_build_servers" = yes],,[server_list])
+
+MU_ENABLE_BUILD(frm,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(maidag,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(mail,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(sieve,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(messages,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(readmsg,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(dotlock,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(movemail,,,["$mu_build_clients" = yes],,[client_list])
+MU_ENABLE_BUILD(mimeview,,,["$mu_build_clients" = yes],,[client_list])
+
+MU_ENABLE_BUILD(mh,,,["$mu_build_clients$mu_cv_enable_mh" = yesyes],,[client_list])
 
 AC_SUBST(MH_BIN_DIR)
 
@@ -1206,7 +1222,9 @@ AC_ARG_WITH([mh-bindir],
                      esac],
                     [MH_BIN_DIR='${exec_prefix}/bin/mu-mh'])
 
-
+test -z "$server_list" && server_list=" [NONE]"
+test -z "$client_list" && client_list=" [NONE]"
+		    
 # Initialize the (autotest) test suite.
 AC_CONFIG_TESTDIR(libmailutils/tests)
 AC_CONFIG_TESTDIR(testsuite)
@@ -1309,6 +1327,11 @@ Mailers:
 SMTP .......................... $status_smtp
 Sendmail ...................... $status_sendmail
 
+Utilities to build:
+
+Servers .......................$server_list
+Clients .......................$client_list
+
 *******************************************************************
 
 Before proceeding, verify if these satisfy your requirements. 
@@ -1339,6 +1362,8 @@ status_maildir=$mu_cv_enable_maildir
 status_smtp=$mu_cv_enable_smtp
 status_sendmail=$mu_cv_enable_sendmail
 status_ipv6=$status_ipv6
+server_list="$server_list"
+client_list="$client_list"
 ])
 
 dnl Output Makefiles
diff --git a/libmailutils/base/version.c b/libmailutils/base/version.c
index 76d202c..2184e05 100644
--- a/libmailutils/base/version.c
+++ b/libmailutils/base/version.c
@@ -37,6 +37,9 @@ static struct mu_conf_option mu_conf_option[] = {
   { "MAILSPOOLDIR=" MU_PATH_MAILDIR, N_("Default mail spool directory") },
   { "SCHEME=" MU_DEFAULT_SCHEME, N_("Default mailbox type") },
   { "LOG_FACILITY=" LOG_FACILITY_STRING, N_("Default syslog facility") },
+#ifdef MAILUTILS_IPV6
+  { "IPV6", N_("IPv6 support") },
+#endif
 #ifdef USE_LIBPAM
   { "USE_LIBPAM", N_("PAM support") },
 #endif
diff --git a/libmailutils/sockaddr/fromnode.c b/libmailutils/sockaddr/fromnode.c
index d79b952..1135a8f 100644
--- a/libmailutils/sockaddr/fromnode.c
+++ b/libmailutils/sockaddr/fromnode.c
@@ -162,7 +162,7 @@ mu_sockaddr_from_node (struct mu_sockaddr **retval, const char *node,
       freeaddrinfo (res);
     }
 #else
-  if (mh->family == AF_INET)
+  if (mh->family == AF_INET || mh->family == AF_UNSPEC)
     {
       short port;
       struct hostent *hp;
@@ -200,8 +200,8 @@ mu_sockaddr_from_node (struct mu_sockaddr **retval, const char *node,
       else if (mh->port)
 	port = htons (mh->port);
       else
-	return MU_ERR_NONAME;
-
+	port = 0;
+      
       if (!node)
 	{
 	  struct sockaddr_in s_in;


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Wed Mar 30 12:49:59 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q4yal-0000Li-K6
	for mharc-commit-mailutils@gnu.org; Wed, 30 Mar 2011 12:49:59 -0400
Received: from [140.186.70.92] (port=34073 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q4yaj-0000LV-B4
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 12:49:58 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q4yah-000187-DE
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 12:49:57 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:34878)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q4yah-00017q-Bc
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 12:49:55 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q4yag-0005Qi-P2
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 16:49:54 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q4yaf-0000Lg-Oy
	for commit-mailutils@gnu.org; Wed, 30 Mar 2011 16:49:54 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c722ac44a25551e82eadb03b622e1b23d70d8b40
X-Git-Newrev: c1a08f800299ea54f09e37b10513ca66ac1758d9
Message-Id: <E1Q4yaf-0000Lg-Oy@vcs-noshell.in.savannah.gnu.org>
Date: Wed, 30 Mar 2011 16:49:54 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-364-gc1a08f8
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Mar 2011 16:49:58 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=c1a08f800299ea54f09e37b10513ca66ac1758d9

The branch, master has been updated
       via  c1a08f800299ea54f09e37b10513ca66ac1758d9 (commit)
      from  c722ac44a25551e82eadb03b622e1b23d70d8b40 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c1a08f800299ea54f09e37b10513ca66ac1758d9
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Wed Mar 30 18:11:44 2011 +0300

    Version 2.99.90

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |    4 ++--
 configure.ac |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 67fa8ea..d6a79c1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU mailutils NEWS -- history of user-visible changes. 2010-10-27
+GNU mailutils NEWS -- history of user-visible changes. 2011-03-30
 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 Free Software Foundation, Inc.
 See the end of file for copying conditions.
@@ -6,7 +6,7 @@ See the end of file for copying conditions.
 Please send mailutils bug reports to <bug-mailutils@gnu.org>.
 
 
-Version 2.9.90 (Git)
+Version 2.99.90 (Git)
 
 This version is highly experimental.  It features a rewrite from
 scratch of the stream subsystem and other vital parts of the
diff --git a/configure.ac b/configure.ac
index 9dc8855..cf13845 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License along
 dnl with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.63)
-AC_INIT([GNU Mailutils], [2.9.90], [bug-mailutils@gnu.org], [mailutils])
+AC_INIT([GNU Mailutils], [2.99.90], [bug-mailutils@gnu.org], [mailutils])
 AC_CONFIG_SRCDIR([libmailutils/mailbox/mailbox.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([gnits 1.11 dist-bzip2 dist-xz std-options silent-rules])


hooks/post-receive
-- 
GNU Mailutils


From MAILER-DAEMON Thu Mar 31 14:41:17 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q5Mo1-0004Wx-OM
	for mharc-commit-mailutils@gnu.org; Thu, 31 Mar 2011 14:41:17 -0400
Received: from [140.186.70.92] (port=46755 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q5Mnz-0004Vy-7J
	for commit-mailutils@gnu.org; Thu, 31 Mar 2011 14:41:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q5Mnx-0005oQ-Cq
	for commit-mailutils@gnu.org; Thu, 31 Mar 2011 14:41:15 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:33507)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q5Mnx-0005nu-94
	for commit-mailutils@gnu.org; Thu, 31 Mar 2011 14:41:13 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q5Mnw-0006gj-NT
	for commit-mailutils@gnu.org; Thu, 31 Mar 2011 18:41:12 +0000
Received: from gray by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Q5Mnv-00068L-Gc
	for commit-mailutils@gnu.org; Thu, 31 Mar 2011 18:41:12 +0000
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c1a08f800299ea54f09e37b10513ca66ac1758d9
X-Git-Newrev: d1e06eeb9401fea5c5e634888377c48ed682e13c
Message-Id: <E1Q5Mnv-00068L-Gc@vcs-noshell.in.savannah.gnu.org>
Date: Thu, 31 Mar 2011 18:41:11 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU Mailutils branch, master,
	updated. release-2.2-366-gd1e06ee
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Mar 2011 18:41:16 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=d1e06eeb9401fea5c5e634888377c48ed682e13c

The branch, master has been updated
       via  d1e06eeb9401fea5c5e634888377c48ed682e13c (commit)
       via  dd07fe07ac35257c75d0f9fb3b8dd02387182a1b (commit)
      from  c1a08f800299ea54f09e37b10513ca66ac1758d9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d1e06eeb9401fea5c5e634888377c48ed682e13c
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Thu Mar 31 21:37:46 2011 +0300

    Bugfixes
    
    * libmailutils/filter/base64.c (_base64_encoder): Fix for the case
    when cmd==mu_filter_lastbuf and isize==0.
    
    * libmailutils/stream/tcp.c (mu_tcp_stream_create_with_source_ip)
    (mu_tcp_stream_create_with_source_host): Don't treat EAGAIN and
    EINPROGRESS as errors.
    * libproto/mailer/smtp.c (smtp_open): Free sockaddr if
    mu_tcp_stream_create_from_sa failed.
    * libproto/pop/mbox.c (pop_open): Likewise.
    * mu/imap.c (com_connect): Likewise.
    * mu/pop.c (com_connect): Likewise.

commit dd07fe07ac35257c75d0f9fb3b8dd02387182a1b
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Thu Mar 31 16:50:15 2011 +0300

    cidr: Implement simplified IPv6 formats
    
    * include/mailutils/cidr.h (MU_CIDR_FMT_SIMPLIFY): New format flag.
    * libmailutils/cidr/tostr.c (format_ipv6_bytes): Take additional
    argument, indicating whether to simplify the output.
    (format_ipv6_bytes_normal)
    (format_ipv6_bytes_simplified): New static functions.
    (mu_cidr_to_string): Select appropriate ipv6 printer depending on
    the MU_CIDR_FMT_SIMPLIFY bit.
    * libmailutils/tests/cidr.c (main): New options -s and -S

-----------------------------------------------------------------------

Summary of changes:
 include/mailutils/cidr.h     |    1 +
 libmailutils/cidr/tostr.c    |   96 ++++++++++++++++++++++++++++++++++++------
 libmailutils/filter/base64.c |   48 +++++++++++++--------
 libmailutils/stream/tcp.c    |    4 +-
 libmailutils/tests/cidr.c    |   19 +++++++-
 libproto/mailer/smtp.c       |    5 ++-
 libproto/pop/mbox.c          |    5 ++-
 mu/imap.c                    |    6 ++-
 mu/pop.c                     |    2 +
 9 files changed, 146 insertions(+), 40 deletions(-)

diff --git a/include/mailutils/cidr.h b/include/mailutils/cidr.h
index c54bf62..4f174de 100644
--- a/include/mailutils/cidr.h
+++ b/include/mailutils/cidr.h
@@ -42,6 +42,7 @@ int mu_cidr_from_sockaddr (struct mu_cidr *cp, const struct sockaddr *sa);
 int mu_cidr_from_string (struct mu_cidr *cp, const char *str);
 
 #define MU_CIDR_FMT_ADDRONLY 0x01
+#define MU_CIDR_FMT_SIMPLIFY 0x02
   
 int mu_cidr_to_string (struct mu_cidr *cidr, int flags, char *buf, size_t size,
 		       size_t *pret);
diff --git a/libmailutils/cidr/tostr.c b/libmailutils/cidr/tostr.c
index 3d1ee5f..0b882ca 100644
--- a/libmailutils/cidr/tostr.c
+++ b/libmailutils/cidr/tostr.c
@@ -34,33 +34,102 @@ to_xdig (unsigned char b)
 
 static size_t
 format_ipv6_bytes (const unsigned char *bytes, int len, 
-		   char *buf, size_t size)
+		   char *buf, size_t size, int simplify)
 {
   size_t total = 0;
   int i;
+  int run_count = 0;
+  char *p;
   
   for (i = 0; i < len; i += 2)
     {
-      if (i)
+      if (bytes[0] == 0 && bytes[1] == 0)
+	{
+	  if (simplify)
+	    run_count++;
+	  else
+	    {
+	      if (i && total++ < size)
+		*buf++ = ':';
+	      if (total++ < size)
+		*buf++ = '0';
+	    }
+	  bytes += 2;
+	}
+      else
+	{
+	  if (run_count)
+	    {
+	      if (run_count == 1)
+		{
+		  if (i && total++ < size)
+		    *buf++ = ':';
+		  if (total++ < size)
+		    *buf++ = '0';
+		}
+	      else
+		{
+		  if (total++ < size)
+		    *buf++ = ':';
+		  simplify = 0;
+		}
+	      run_count = 0;
+	    }
+	  
+	  if (i && total++ < size)
+	    *buf++ = ':';
+
+	  p = buf;
+	  if ((*bytes & 0xf0) && total++ < size)
+	    *buf++ = to_xdig (*bytes >> 4);
+	  if ((buf > p || (*bytes & 0xf)) && total++ < size)
+	    *buf++ = to_xdig (*bytes & 0xf);
+	  bytes++;
+	  if ((buf > p || (*bytes & 0xf0)) && total++ < size)
+	    *buf++ = to_xdig (*bytes >> 4);
+	  if ((buf > p || (*bytes & 0xf)) && total++ < size)
+	    *buf++ = to_xdig (*bytes & 0xf);
+	  bytes++;
+	}
+    }
+
+  if (run_count)
+    {
+      if (run_count == 1)
+	{
+	  if (i && total++ < size)
+	    *buf++ = ':';
+	  if (total++ < size)
+	    *buf++ = '0';
+	}
+      else
 	{
 	  if (total++ < size)
 	    *buf++ = ':';
+	  if (total++ < size)
+	    *buf++ = ':';
 	}
-      if (total++ < size)
-	*buf++ = to_xdig (*bytes >> 4);
-      if (total++ < size)
-	*buf++ = to_xdig (*bytes & 0xf);
-      bytes++;
-      if (total++ < size)
-	*buf++ = to_xdig (*bytes >> 4);
-      if (total++ < size)
-	*buf++ = to_xdig (*bytes & 0xf);
-      bytes++;
     }
+  
   return total;
 }
 
 static size_t
+format_ipv6_bytes_normal (const unsigned char *bytes, int len, 
+			  char *buf, size_t size)
+{
+  return format_ipv6_bytes (bytes, len, buf, size, 0);
+}
+
+static size_t
+format_ipv6_bytes_simplified (const unsigned char *bytes, int len, 
+			      char *buf, size_t size)
+{
+  return format_ipv6_bytes (bytes, len, buf, size, 1);
+}
+
+
+static size_t
 format_ipv4_bytes (const unsigned char *bytes, int len, 
 		   char *buf, size_t size)
 {
@@ -114,7 +183,8 @@ mu_cidr_to_string (struct mu_cidr *cidr, int flags,
       
 #ifdef MAILUTILS_IPV6
     case AF_INET6:
-      fmt = format_ipv6_bytes;
+      fmt = (flags & MU_CIDR_FMT_SIMPLIFY) ?
+	         format_ipv6_bytes_simplified : format_ipv6_bytes_normal;
       break;
 #endif
 
diff --git a/libmailutils/filter/base64.c b/libmailutils/filter/base64.c
index 9873874..d99cdc5 100644
--- a/libmailutils/filter/base64.c
+++ b/libmailutils/filter/base64.c
@@ -286,30 +286,40 @@ _base64_encoder (void *xd,
 
       if (!(consumed + 3 <= isize || pad))
 	break;
-	
-      *optr++ = b64tab[ptr[0] >> 2];
-      nbytes++;
-      lp->cur_len++;
-      consumed++;
-      switch (isize - consumed)
+
+      if (consumed == isize)
 	{
-	default:
-	  consumed++;
-	  y = b64tab[ptr[2] & 0x3f];
-	  c2 = ptr[2] >> 6;
-	case 1:
-	  consumed++;
-	  x = b64tab[((ptr[1] << 2) + c2) & 0x3f];
-	  c1 = (ptr[1] >> 4);
-	case 0:
-	  lp->save[0] = b64tab[((ptr[0] << 4) + c1) & 0x3f];
 	  lp->save[1] = x;
 	  lp->save[2] = y;
-	  lp->idx = 0;
+	  lp->idx = 1;
 	  lp->state = base64_rollback;
 	}
-      
-      ptr += 3;
+      else
+	{
+	  *optr++ = b64tab[ptr[0] >> 2];
+	  nbytes++;
+	  lp->cur_len++;
+	  consumed++;
+	  switch (isize - consumed)
+	    {
+	    default:
+	      consumed++;
+	      y = b64tab[ptr[2] & 0x3f];
+	      c2 = ptr[2] >> 6;
+	    case 1:
+	      consumed++;
+	      x = b64tab[((ptr[1] << 2) + c2) & 0x3f];
+	      c1 = (ptr[1] >> 4);
+	    case 0:
+	      lp->save[0] = b64tab[((ptr[0] << 4) + c1) & 0x3f];
+	      lp->save[1] = x;
+	      lp->save[2] = y;
+	      lp->idx = 0;
+	      lp->state = base64_rollback;
+	    }
+	  
+	  ptr += 3;
+	}
       pad = 0;
     }
 
diff --git a/libmailutils/stream/tcp.c b/libmailutils/stream/tcp.c
index f383f1b..25493f9 100644
--- a/libmailutils/stream/tcp.c
+++ b/libmailutils/stream/tcp.c
@@ -332,7 +332,7 @@ mu_tcp_stream_create_with_source_ip (mu_stream_t *pstream,
     }
 
   rc = mu_tcp_stream_create_from_sa (pstream, remote_addr, source_addr, flags);
-  if (rc)
+  if (rc && !(rc == EAGAIN || rc == EINPROGRESS))
     {
       mu_sockaddr_free (remote_addr);
       mu_sockaddr_free (source_addr);
@@ -371,7 +371,7 @@ mu_tcp_stream_create_with_source_host (mu_stream_t *stream,
     }
 
   rc = mu_tcp_stream_create_from_sa (stream, remote_addr, source_addr, flags);
-  if (rc)
+  if (rc && !(rc == EAGAIN || rc == EINPROGRESS))
     {
       mu_sockaddr_free (remote_addr);
       mu_sockaddr_free (source_addr);
diff --git a/libmailutils/tests/cidr.c b/libmailutils/tests/cidr.c
index 797fb24..6b07fa6 100644
--- a/libmailutils/tests/cidr.c
+++ b/libmailutils/tests/cidr.c
@@ -33,10 +33,12 @@ print_bytes (unsigned char *b, size_t l)
 int
 main (int argc, char **argv)
 {
+  int flags = 0;
+  
   mu_set_program_name (argv[0]);
   if (argc < 2)
     {
-      mu_error ("usage: %s CIDR [CIDR...]", argv[0]);
+      mu_error ("usage: %s [-sS] CIDR [CIDR...]", argv[0]);
       return 1;
     }
 
@@ -46,7 +48,18 @@ main (int argc, char **argv)
       struct mu_cidr cidr;
       int rc;
       char *str;
-      
+
+      if (strcmp (arg, "-s") == 0)
+	{
+	  flags |= MU_CIDR_FMT_SIMPLIFY;
+	  continue;
+	}
+      else if (strcmp (arg, "-S") == 0)
+	{
+	  flags &= ~MU_CIDR_FMT_SIMPLIFY;
+	  continue;
+	}
+	       
       rc = mu_cidr_from_string (&cidr, arg);
       if (rc)
 	{
@@ -61,7 +74,7 @@ main (int argc, char **argv)
       print_bytes (cidr.address, cidr.len);
       printf ("netmask =");
       print_bytes (cidr.netmask, cidr.len);
-      rc = mu_cidr_format (&cidr, 0, &str);
+      rc = mu_cidr_format (&cidr, flags, &str);
       if (rc)
 	{
 	  mu_error ("cannot covert to string: %s", mu_strerror (rc));
diff --git a/libproto/mailer/smtp.c b/libproto/mailer/smtp.c
index 892a0ce..6487b67 100644
--- a/libproto/mailer/smtp.c
+++ b/libproto/mailer/smtp.c
@@ -175,7 +175,10 @@ smtp_open (mu_mailer_t mailer, int flags)
       rc = mu_tcp_stream_create_from_sa (&mailer->stream, sa, NULL,
 					 mailer->flags);
       if (rc)
-	return rc;
+        {
+          mu_sockaddr_free (sa);
+	  return rc;
+	}
       mu_stream_set_buffer (mailer->stream, mu_buffer_line, 0);
     }
   mu_smtp_set_carrier (smtp_mailer->smtp, mailer->stream);
diff --git a/libproto/pop/mbox.c b/libproto/pop/mbox.c
index 79854ae..b3a0203 100644
--- a/libproto/pop/mbox.c
+++ b/libproto/pop/mbox.c
@@ -132,7 +132,10 @@ pop_open (mu_mailbox_t mbox, int flags)
       
   status = mu_tcp_stream_create_from_sa (&stream, sa, NULL, mbox->flags);
   if (status)
-    return status;
+    {
+      mu_sockaddr_free (sa);
+      return status;
+    }
 #ifdef WITH_TLS
   if (mpd->pops)
     {
diff --git a/mu/imap.c b/mu/imap.c
index deea939..4fccd4d 100644
--- a/mu/imap.c
+++ b/mu/imap.c
@@ -217,7 +217,11 @@ com_connect (int argc, char **argv)
       hints.socktype = SOCK_STREAM;
       status = mu_sockaddr_from_node (&sa, argv[0], argv[1], &hints);
       if (status == 0)
-	status = mu_tcp_stream_create_from_sa (&tcp, sa, NULL, 0);
+        {
+	  status = mu_tcp_stream_create_from_sa (&tcp, sa, NULL, 0);
+          if (status)
+            mu_sockaddr_free (sa);
+        }
       if (status == 0)
 	{
 #ifdef WITH_TLS
diff --git a/mu/pop.c b/mu/pop.c
index de092cd..c76f009 100644
--- a/mu/pop.c
+++ b/mu/pop.c
@@ -542,6 +542,8 @@ com_connect (int argc, char **argv)
 	{
 	  n = port_from_sa (sa);
 	  status = mu_tcp_stream_create_from_sa (&tcp, sa, NULL, 0);
+	  if (status)
+	    mu_sockaddr_free (sa);
 	}
       if (status == 0)
 	{


hooks/post-receive
-- 
GNU Mailutils


