diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2012-01-14 20:01:10 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2012-01-14 20:01:10 +0000 |
| commit | dc5d0e4a152945c36ed1f58af93f63907e315970 (patch) | |
| tree | 5ada81119140e97e1c1fbacf2564dbb3b0bd8d9f /mail/popper | |
| parent | 4603a533d9c34ee27a6721f70692b7d717b87772 (diff) | |
Notes
Diffstat (limited to 'mail/popper')
| -rw-r--r-- | mail/popper/Makefile | 3 | ||||
| -rw-r--r-- | mail/popper/files/patch-pop_pass.c (renamed from mail/popper/files/patch-ab) | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mail/popper/Makefile b/mail/popper/Makefile index ac4152f1ae37..4ebb7e4770a8 100644 --- a/mail/popper/Makefile +++ b/mail/popper/Makefile @@ -25,6 +25,7 @@ COMMENT= Berkeley POP 3 server (now maintained by Qualcomm) # If WITH_POPPER_DEBUG variable present in the environment, popper builds # with more verbose debugging. +USE_CSTD= gnu89 O_DEFS= -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \ -DBULLDB -DNONAUTHFILE='\"/etc/ftpusers\"' @@ -55,7 +56,7 @@ PLIST_DIRS= etc/popper LATEST_LINK= popper -PORTSCOUT= limit:^2\. +PORTSCOUT= limit:^2\. post-patch: $(RM) ${WRKSRC}/md5.h diff --git a/mail/popper/files/patch-ab b/mail/popper/files/patch-pop_pass.c index b106989e561c..a1f1e8caac99 100644 --- a/mail/popper/files/patch-ab +++ b/mail/popper/files/patch-pop_pass.c @@ -1,5 +1,5 @@ ---- pop_pass.c.orig Mon Jul 30 19:29:19 2001 -+++ pop_pass.c Mon Jul 30 19:29:25 2001 +--- pop_pass.c.orig 1998-07-10 03:44:07.000000000 +0400 ++++ pop_pass.c 2012-01-09 03:03:30.395199055 +0400 @@ -19,6 +19,12 @@ #include <pwd.h> #include "popper.h" @@ -52,11 +52,12 @@ return(pop_msg(p, POP_FAILURE, "\"%s\": shell not found.", p->user)); #endif +- if ((p->kerberos ? auth_user_kerberos(p, pw) : auth_user(p, pwp)) +#ifdef OPIE + if (opieverify(&opiestate, p->pop_parm[1])) { + if (pwok) { +#endif /* OPIE */ - if ((p->kerberos ? auth_user_kerberos(p, pw) : auth_user(p, pwp)) ++ if ((p->kerberos ? auth_user_kerberos(p, &pw) : auth_user(p, pwp)) != POP_SUCCESS) { pop_log(p,POP_PRIORITY,"Failed attempted login to %s from host %s", p->user, p->client); |