[Dovecot] %d interpolation problem fixed

[William Ross]

On 22 Jan 2006, at 10:00, Timo Sirainen wrote:

> On Wed, 2006-01-18 at 02:33 +0000, William Ross wrote:
>>> dovecot: Jan 17 22:51:42 Info: auth(default): *
>>> vpopmail_verify_plain: now vpop_user = sysadmin, vpop_domain =
>>> spanner.org, request->user = sysadmin at spanner.org, vpw->pw_dir = /
>>> home/vpopmail/domains/spanner.org/sysadmin
>>
>> in the callback method I got this tab-separated auth_reply_stream:
>>
>>> dovecot: Jan 18 00:30:01 Info: auth(default): userdb_callback str:
>>> USER 2      sysadmin uid=7797        gid=2109        home=/home/
>>> vpopmail/domains/spanner.org/sysadmin
>
> I guess this fixes it then:

Yes. That works.

One minor change: at this point it should be auth_request->user.  
perhaps you will want to make that consistent, but here's the revised  
fix anyway:

diff -u -r1.19 userdb-vpopmail.c
--- src/auth/userdb-vpopmail.c	16 Oct 2005 14:34:39 -0000	1.19
+++ src/auth/userdb-vpopmail.c	22 Jan 2006 09:58:37 -0000
@@ -85,7 +85,7 @@
  	}

  	reply = auth_stream_reply_init(auth_request);
-	auth_stream_reply_add(reply, NULL, vpw->pw_name);
+	auth_stream_reply_add(reply, NULL, auth_request->user);
  	auth_stream_reply_add(reply, "uid", dec2str(uid));
  	auth_stream_reply_add(reply, "gid", dec2str(gid));
  	auth_stream_reply_add(reply, "home", vpw->pw_dir);


I've updated the wiki (only the Q&A page) to say that the  
default_mail_env line is no longer required, but with this change it  
also does no harm if it remains.

thank you,

will