dovecot-1.1: vpopmail: Use pw_flags field if vpopmail has it.
dovecot at dovecot.org
dovecot at dovecot.org
Sat Oct 11 13:49:07 EEST 2008
details: http://hg.dovecot.org/dovecot-1.1/rev/dd197fdabbc8
changeset: 7934:dd197fdabbc8
user: Timo Sirainen <tss at iki.fi>
date: Sat Oct 11 13:49:03 2008 +0300
description:
vpopmail: Use pw_flags field if vpopmail has it.
diffstat:
1 file changed, 7 insertions(+), 2 deletions(-)
src/auth/passdb-vpopmail.c | 9 +++++++--
diffs (27 lines):
diff -r fb4287a5d9df -r dd197fdabbc8 src/auth/passdb-vpopmail.c
--- a/src/auth/passdb-vpopmail.c Sat Oct 11 13:39:10 2008 +0300
+++ b/src/auth/passdb-vpopmail.c Sat Oct 11 13:49:03 2008 +0300
@@ -16,6 +16,11 @@
#define VPOPMAIL_DEFAULT_PASS_SCHEME "CRYPT"
+/* pw_flags was added in vpopmail 5.4, olders use pw_gid field */
+#ifndef VQPASSWD_HAS_PW_FLAGS
+# define pw_flags pw_gid
+#endif
+
static char *
vpopmail_password_lookup(struct auth_request *auth_request, bool cleartext,
enum passdb_result *result_r)
@@ -30,9 +35,9 @@ vpopmail_password_lookup(struct auth_req
return NULL;
}
- if (((vpw->pw_gid & NO_IMAP) != 0 &&
+ if (((vpw->pw_flags & NO_IMAP) != 0 &&
strcasecmp(auth_request->service, "IMAP") == 0) ||
- ((vpw->pw_gid & NO_POP) != 0 &&
+ ((vpw->pw_flags & NO_POP) != 0 &&
strcasecmp(auth_request->service, "POP3") == 0)) {
auth_request_log_info(auth_request, "vpopmail",
"%s disabled in vpopmail for this user",
More information about the dovecot-cvs
mailing list