Mercurial > dovecot > original-hg > dovecot-1.2
changeset 4419:c38157eefd1e HEAD
extra_args field was ignored if the passwd-file wasn't also used as a
userdb.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 18 Jun 2006 00:02:36 +0300 |
| parents | fa7ae95c125b |
| children | 1174e508593d |
| files | src/auth/db-passwd-file.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/db-passwd-file.c Sat Jun 17 23:15:10 2006 +0300 +++ b/src/auth/db-passwd-file.c Sun Jun 18 00:02:36 2006 +0300 @@ -101,7 +101,8 @@ /* home */ if (*args != NULL) { - pu->home = p_strdup_empty(pw->pool, *args); + if (pw->db->userdb) + pu->home = p_strdup_empty(pw->pool, *args); args++; } @@ -113,7 +114,7 @@ /* old format, this field is empty and next field may contain MAIL */ args++; - if (*args != NULL && **args != '\0') { + if (*args != NULL && **args != '\0' && pw->db->userdb) { extra_fields = t_strconcat("userdb_mail=", t_strarray_join(args, ":"), NULL); @@ -185,8 +186,7 @@ args = t_strsplit(line, ":"); if (args[1] != NULL) { /* at least username+password */ - passwd_file_add(pw, args[0], args[1], - pw->db->userdb ? args+2 : &no_args); + passwd_file_add(pw, args[0], args[1], args+2); } else { /* only username */ passwd_file_add(pw, args[0], NULL, &no_args);