cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unbreak authentication, spotted by aja@

Browse Source 
explicitely disable mysql support
hints and ok tb@
This commit is contained in:
giovanni 2017-05-22 20:03:43 +00:00
parent cbe666a201
commit ab326bd943
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/akpop3d/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2016/09/10 13:03:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.12 2017/05/22 20:03:43 giovanni Exp $
COMMENT= small and secure POP3 daemon
DISTNAME= akpop3d-0.7.7
REVISION = 2
REVISION = 3
CATEGORIES= mail
HOMEPAGE= http://www.synflood.at/akpop3d.html
@ -16,6 +16,7 @@ MASTER_SITES= http://www.synflood.at/akpop3d/ \
EXTRACT_SUFX= .tar.bz2
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS=--with-mysql=no
NO_TEST= Yes

22
mail/akpop3d/patches/patch-authenticate_c
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-authenticate_c,v 1.1.1.1 2004/11/08 21:57:05 naddy Exp $
--- authenticate.c.orig Sun Aug 17 19:44:55 2003
+++ authenticate.c Mon Nov 8 22:49:53 2004
$OpenBSD: patch-authenticate_c,v 1.2 2017/05/22 20:03:43 giovanni Exp $
Index: authenticate.c
--- authenticate.c.orig
+++ authenticate.c
@@ -25,6 +25,9 @@
#include "strlcpy.h"
#include "mysql.h"
@ -11,7 +12,7 @@ $OpenBSD: patch-authenticate_c,v 1.1.1.1 2004/11/08 21:57:05 naddy Exp $
extern const char * authfile;
char real_username[MAXLINE+1];
char real_maildrop[MAXLINE+1];
@@ -104,7 +107,7 @@ static int user_in_file(char * user, cha
@@ -104,7 +107,7 @@ static int user_in_file(char * user, char * path) {
static int is_user_allowed(char * user) {
int allow, deny;
@ -20,7 +21,7 @@ $OpenBSD: patch-authenticate_c,v 1.1.1.1 2004/11/08 21:57:05 naddy Exp $
case 0:
allow = 0;
break;
@@ -115,7 +118,7 @@ static int is_user_allowed(char * user)
@@ -115,7 +118,7 @@ static int is_user_allowed(char * user) {
return 0;
}
@ -29,7 +30,7 @@ $OpenBSD: patch-authenticate_c,v 1.1.1.1 2004/11/08 21:57:05 naddy Exp $
case 0:
deny = 0;
break;
@@ -322,7 +325,7 @@ int authenticate(char * username, char *
@@ -322,7 +325,7 @@ int authenticate(char * username, char * password) {
memset(pass,0,sizeof(pass));
strlcpy(pass,password,len+1);
@ -38,3 +39,12 @@ $OpenBSD: patch-authenticate_c,v 1.1.1.1 2004/11/08 21:57:05 naddy Exp $
if (0!=use_pop3_allow_deny && 0==is_user_allowed(user)) {
return 0;
}
@@ -335,7 +338,7 @@ int authenticate(char * username, char * password) {
}
#ifndef HAVE_LIBMYSQLCLIENT
- u = getpwnam(user);
+ u = getpwnam_shadow(user);
#else
u = getMpwnam( user ); /* getMpwnam first checks getpwnam() */
#endif /* HAVE_LIBMYSQLCLIENT */

4
mail/akpop3d/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2005/12/14 06:02:09 jolan Exp $
@comment $OpenBSD: PLIST,v 1.3 2017/05/22 20:03:43 giovanni Exp $
@newgroup _akpop3d:555
@man man/man8/akpop3d.8
sbin/akpop3d
@bin sbin/akpop3d