Here are my diffs so far. I also increased the quota warning limit,
since we have 2GB disk space per user.
Any comments are welcome:
$ diff -d -r qmail-1.03-vanilla/qmail-ldap.h qmail-1.03-mps/qmail-ldap.h
44c44
< #define QUOTA_WARNING_LEVEL 70
---
> #define QUOTA_WARNING_LEVEL 90
96c96
< #define LDAP_MAILALTERNATE "mailAlternateAddress"
---
> #define LDAP_MAILALTERNATE "otherMailbox"
99c99
< #define LDAP_MAILSTORE "mailMessageStore"
---
> #define LDAP_MAILSTORE "mail"
111c111
< #define LDAP_UID "uid"
---
> #define LDAP_UID "mail"
114c114
< #define LDAP_ISACTIVE "accountStatus"
---
> #define LDAP_ISACTIVE "userAccountControl"
135c135
< #define ISACTIVE_BOUNCE "disabled"
---
> #define ISACTIVE_BOUNCE "514"
138c138,139
< #define ISACTIVE_ACTIVE "active"
---
> #define ISACTIVE_ACTIVE "512"
> #define ISACTIVE_MASK 0x202 /* because 514 is 0x202, 512 is
0x200 */
$ diff -d -r qmail-1.03-vanilla/qmail-ldaplookup.c
qmail-1.03-mps/qmail-ldaplookup.c
324c324
< output(subfdout, "%s: %s\n",
---
> output(subfdout, "%s: %s -> disabled\n",
332c332
< output(subfdout, "%s: %s\n",
---
> output(subfdout, "%s: %s -> active\n",
$ diff -d -r qmail-1.03-vanilla/qldap.c qmail-1.03-mps/qldap.c
671c671,672
< int r;
---
> int r;
> unsigned long ul,IS_BOUNCE,IS_ACTIVE;
680,686c681,688
< if (!case_diffs(ldap_attr.s, ISACTIVE_BOUNCE))
< *status = STATUS_BOUNCE;
< else if (!case_diffs(ldap_attr.s, ISACTIVE_DELETE))
< *status = STATUS_DELETE;
< else if (!case_diffs(ldap_attr.s, ISACTIVE_NOACCESS))
< *status = STATUS_NOACCESS;
< else *status = STATUS_OK; /* default to OK */
---
> scan_ulong(ISACTIVE_BOUNCE + '\0', &IS_BOUNCE);
> scan_ulong(ISACTIVE_ACTIVE + '\0', &IS_ACTIVE);
> if (ldap_attr.s[scan_ulong(ldap_attr.s, &ul)] == '\0') {
> ul &= ISACTIVE_MASK; /* mask result */
> if (ul == IS_BOUNCE) *status = STATUS_BOUNCE;
> else if (ul == IS_ACTIVE) *status = STATUS_OK;
> else *status =
STATUS_NOACCESS; /* default to NO ACCESS */
> }
--
Zdravko Stoychev
System Software and Support
MPS Ltd.
zdravko.stoychev@mps.bg
+359-2-491-1827 (ext.271)
Ако не отговарям на писмата Ви - погледнете тук: http://6lyokavitza.org/mail
This e-mail is intended only for the addressee(s) and may contain privileged
and confidential information. It should not be disseminated, distributed, or
copied. If you have received this e-mail message by mistake, please inform the
sender, and delete it from your system.
smime.p7s
Description: S/MIME Cryptographic Signature
|