Maidag: avoid using auth_by_uid when delivering message.

When delivering message, the library may need to know the email
address of the user on behalf of whom maidag is called. In particular,
that happens when using the vacation extension.  In that case the
library would construct the email by concatenating user name, obtained
as a result of mu_get_auth_by_uid, and current domain name.  Avoid
this by remembering email address the message is being delivered to.

* libmailutils/base/usremail.c (mu_set_user_email): NULL
argument clears email.
(mu_get_user_email): Use EUID instead of UID.
* maidag/deliver.c (do_delivery): Set user email prior to
delivery.
* maidag/maidag.c (default_domain): New variable.
(maidag_cfg_param): New setting "domain".
* maidag/maidag.h (default_domain): New extern.

@@ -47,6 +47,13 @@ mu_set_user_email (const char *candidate)
   char *email = NULL;
   char *email = NULL;
   const char *domain = NULL;
   const char *domain = NULL;
 
 
+  if (!candidate)
+    {
+      free (mu_user_email);
+      mu_user_email = NULL;
+      return 0;
+    }
+  
   if ((err = mu_address_create (&addr, candidate)) != 0)
   if ((err = mu_address_create (&addr, candidate)) != 0)
     return err;
     return err;
 
 
@@ -62,7 +69,6 @@ mu_set_user_email (const char *candidate)
   if ((err = mu_address_aget_email (addr, 1, &email)) != 0)
   if ((err = mu_address_aget_email (addr, 1, &email)) != 0)
     goto cleanup;
     goto cleanup;
 
 
-  if (mu_user_email)
   free (mu_user_email);
   free (mu_user_email);
 
 
   mu_user_email = email;
   mu_user_email = email;
@@ -81,15 +87,17 @@ static char *mu_user_email_domain = 0;
 int
 int
 mu_set_user_email_domain (const char *domain)
 mu_set_user_email_domain (const char *domain)
 {
 {
-  char *d = NULL;
-  
-  if (!domain)
-    return EINVAL;
+  char *d;
   
   
+  if (domain)
+    {
       d = strdup (domain);
       d = strdup (domain);
 
 
       if (!d)
       if (!d)
 	return ENOMEM;
 	return ENOMEM;
+    }
+  else
+    d = NULL;
   
   
   if (mu_user_email_domain)
   if (mu_user_email_domain)
     free (mu_user_email_domain);
     free (mu_user_email_domain);
@@ -154,7 +162,7 @@ mu_get_user_email (const char *name)
 
 
   if (!name)
   if (!name)
     {
     {
-      struct mu_auth_data *auth = mu_get_auth_by_uid (getuid ());
+      struct mu_auth_data *auth = mu_get_auth_by_uid (geteuid ());
       if (!auth)
       if (!auth)
 	{
 	{
 	  errno = EINVAL;
 	  errno = EINVAL;

@@ -271,6 +271,8 @@ do_delivery (mu_url_t url, mu_message_t msg, const char *name, char **errp)
   mu_mailbox_t mbox;
   mu_mailbox_t mbox;
   int status;
   int status;
 
 
+  mu_set_user_email_domain (default_domain);
+  
   if (name && !is_remote_url (url))
   if (name && !is_remote_url (url))
     {
     {
       auth = mu_get_auth_by_name (name);
       auth = mu_get_auth_by_name (name);
@@ -283,6 +285,10 @@ do_delivery (mu_url_t url, mu_message_t msg, const char *name, char **errp)
 	  return EX_NOUSER;
 	  return EX_NOUSER;
 	}
 	}
 
 
+      status = mu_set_user_email (name);
+      if (status)
+	mu_error (_("%s: invalid email: %s"), name, mu_strerror (status));
+      
       if (current_uid)
       if (current_uid)
 	auth->change_uid = 0;
 	auth->change_uid = 0;
 
 
@@ -314,6 +320,8 @@ do_delivery (mu_url_t url, mu_message_t msg, const char *name, char **errp)
 	    return exit_code = EX_TEMPFAIL;
 	    return exit_code = EX_TEMPFAIL;
 	  }
 	  }
     }
     }
+  else
+    mu_set_user_email (NULL);
   
   
   if (!url)
   if (!url)
     {
     {

@@ -29,7 +29,7 @@ char *quotadbname = NULL;  /* Name of mailbox quota database */
 char *quota_query = NULL;  /* SQL query to retrieve mailbox quota */
 char *quota_query = NULL;  /* SQL query to retrieve mailbox quota */
 
 
 char *sender_address = NULL;       
 char *sender_address = NULL;       
-
+char *default_domain;
 mu_script_t script_handler;
 mu_script_t script_handler;
 
 
 mu_list_t script_list;
 mu_list_t script_list;
@@ -450,6 +450,8 @@ struct mu_cfg_param maidag_cfg_param[] = {
   { "forward-file-checks", mu_cfg_callback, NULL, 0, cb_forward_file_checks,
   { "forward-file-checks", mu_cfg_callback, NULL, 0, cb_forward_file_checks,
     N_("Configure safety checks for the forward file."),
     N_("Configure safety checks for the forward file."),
     N_("arg: list") },
     N_("arg: list") },
+  { "domain", mu_cfg_string, &default_domain, 0, NULL,
+    N_("Default email domain") },
 /* LMTP support */
 /* LMTP support */
   { "group", mu_cfg_callback, &lmtp_groups, 0, cb_group,
   { "group", mu_cfg_callback, &lmtp_groups, 0, cb_group,
     N_("In LMTP mode, retain these supplementary groups."),
     N_("In LMTP mode, retain these supplementary groups."),

@@ -128,6 +128,7 @@ extern char *forward_file;
 extern int forward_file_checks;
 extern int forward_file_checks;
 
 
 extern char *sender_address;
 extern char *sender_address;
+extern char *default_domain;
 extern mu_list_t script_list;
 extern mu_list_t script_list;
 extern char *message_id_header;
 extern char *message_id_header;
 extern int sieve_debug_flags; 
 extern int sieve_debug_flags;