diff options
Diffstat (limited to 'imap')
| -rw-r--r-- | imap/ChangeLog | 4 | ||||
| -rw-r--r-- | imap/imapd.dist.in.git | 12 | ||||
| -rw-r--r-- | imap/imaplogin.c | 2 | ||||
| -rw-r--r-- | imap/pop3d.dist.in.git | 9 | ||||
| -rw-r--r-- | imap/pop3login.c | 4 |
5 files changed, 27 insertions, 4 deletions
diff --git a/imap/ChangeLog b/imap/ChangeLog index 95e020f..b555c79 100644 --- a/imap/ChangeLog +++ b/imap/ChangeLog @@ -1,3 +1,7 @@ +2015-06-09 Sam Varshavchik <mrsam@courier-mta.com> + + * imap, pop3: Added AUTH_MKHOMEDIR_SKEL setting. + 4.16.1 2015-04-25 Giovanni Bechis <giovanni@openbsd.org> diff --git a/imap/imapd.dist.in.git b/imap/imapd.dist.in.git index 08ecd69..c9b7704 100644 --- a/imap/imapd.dist.in.git +++ b/imap/imapd.dist.in.git @@ -5,7 +5,7 @@ # Do not alter lines that begin with ##, they are used when upgrading # this configuration. # -# Copyright 1998 - 2008 Double Precision, Inc. See COPYING for +# Copyright 1998 - 2015 Double Precision, Inc. See COPYING for # distribution information. # # This configuration file sets various options for the Courier-IMAP server @@ -353,6 +353,16 @@ IMAP_MOVE_EXPUNGE_TO_TRASH=0 # # IMAP_LOG_DELETIONS=1 +##NAME: AUTH_MKHOMEDIR_SKEL:0 +# +# Uncomment this setting to automatically create a home directory on first +# login. if the AUTH_MKHOMEDIR_SKEL environment variable is set, and the +# home directory does not exist, the home directory gets created, with its +# initial contents copied from AUTH_MKHOMEDIR_SKEL which must be a directory, +# typically /etc/skel. +# +# AUTH_MKHOMEDIR_SKEL=/etc/skel + ##NAME: IMAPDEBUGFILE:0 # # IMAPDEBUGFILE="imaplog.dat" diff --git a/imap/imaplogin.c b/imap/imaplogin.c index c9601f5..84c8f1c 100644 --- a/imap/imaplogin.c +++ b/imap/imaplogin.c @@ -218,7 +218,7 @@ int login_callback(struct authinfo *ainfo, void *dummy) } } - rc=auth_callback_default(ainfo); + rc=auth_callback_default_autocreate(ainfo); if (rc == 0) { diff --git a/imap/pop3d.dist.in.git b/imap/pop3d.dist.in.git index b3ab118..95308a7 100644 --- a/imap/pop3d.dist.in.git +++ b/imap/pop3d.dist.in.git @@ -155,6 +155,15 @@ POP3DSTART=NO # # POP3_LOG_DELETIONS=1 +##NAME: AUTH_MKHOMEDIR_SKEL:0 +# +# Uncomment this setting to automatically create a home directory on first +# login. if the AUTH_MKHOMEDIR_SKEL environment variable is set, and the +# home directory does not exist, the home directory gets created, with its +# initial contents copied from AUTH_MKHOMEDIR_SKEL which must be a directory, +# typically /etc/skel. +# +# AUTH_MKHOMEDIR_SKEL=/etc/skel ##NAME: MAILDIRPATH:0 # diff --git a/imap/pop3login.c b/imap/pop3login.c index 4efb0e9..e6ee33f 100644 --- a/imap/pop3login.c +++ b/imap/pop3login.c @@ -201,7 +201,7 @@ static int login_callback(struct authinfo *ainfo, void *dummy) } } - rc=auth_callback_default(ainfo); + rc=auth_callback_default_autocreate(ainfo); if (rc == 0) { @@ -404,7 +404,7 @@ char *q ; printf("-ERR Temporary problem, please try again later\r\n"); fflush(stdout); exit(1); - } + } else { sleep(5); |