mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-10 07:04:03 +00:00
Fix build with utmpx
Reported by: pointyhat by erwin@
This commit is contained in:
parent
4be8a8eb3d
commit
697b95bd06
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=252316
@ -311,7 +311,11 @@ NO_MTREE= yes
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${OSVERSION} >= 900007
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-utmpx
|
||||
. if defined(SLAVE_LDAP)
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-utmpx-ldap
|
||||
. else
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-utmpx
|
||||
. endif
|
||||
.endif
|
||||
|
||||
.if defined(SLAVE_TLS)
|
||||
|
65
mail/qmail/files/extra-patch-utmpx-ldap
Normal file
65
mail/qmail/files/extra-patch-utmpx-ldap
Normal file
@ -0,0 +1,65 @@
|
||||
--- qbiff.c.orig 2010-04-06 08:43:28.000000000 -0300
|
||||
+++ qbiff.c 2010-04-06 08:44:35.000000000 -0300
|
||||
@@ -1,14 +1,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
-#include <utmp.h>
|
||||
-#ifndef UTMP_FILE
|
||||
-#ifdef _PATH_UTMP
|
||||
-#define UTMP_FILE _PATH_UTMP
|
||||
-#else
|
||||
-#define UTMP_FILE "/etc/utmp"
|
||||
-#endif
|
||||
-#endif
|
||||
+#include <utmpx.h>
|
||||
#include "readwrite.h"
|
||||
#include "stralloc.h"
|
||||
#include "substdio.h"
|
||||
@@ -21,15 +14,12 @@
|
||||
#include "env.h"
|
||||
#include "exit.h"
|
||||
|
||||
-substdio ssutmp;
|
||||
-char bufutmp[sizeof(struct utmp) * 16];
|
||||
-int fdutmp;
|
||||
substdio sstty;
|
||||
char buftty[1024];
|
||||
int fdtty;
|
||||
|
||||
-struct utmp ut;
|
||||
-char line[sizeof(ut.ut_line) + 1];
|
||||
+struct utmpx *ut;
|
||||
+char line[sizeof(ut->ut_line) + 1];
|
||||
stralloc woof = {0};
|
||||
stralloc tofrom = {0};
|
||||
stralloc text = {0};
|
||||
@@ -64,7 +54,7 @@
|
||||
if (!(user = env_get("USER"))) _exit(0);
|
||||
if (!(sender = env_get("SENDER"))) _exit(0);
|
||||
if (!(userext = env_get("LOCAL"))) _exit(0);
|
||||
- if (str_len(user) > sizeof(ut.ut_name)) _exit(0);
|
||||
+ if (str_len(user) > sizeof(ut->ut_user)) _exit(0);
|
||||
|
||||
if (!stralloc_copys(&tofrom,"*** TO <")) _exit(0);
|
||||
if (!stralloc_cats(&tofrom,userext)) _exit(0);
|
||||
@@ -89,15 +79,11 @@
|
||||
if (!stralloc_cat(&woof,&text)) _exit(0);
|
||||
if (!stralloc_cats(&woof,"\015\n")) _exit(0);
|
||||
|
||||
- fdutmp = open_read(UTMP_FILE);
|
||||
- if (fdutmp == -1) _exit(0);
|
||||
- substdio_fdbuf(&ssutmp,subread,fdutmp,bufutmp,sizeof(bufutmp));
|
||||
-
|
||||
- while (substdio_get(&ssutmp,(char *)&ut,sizeof(ut)) == sizeof(ut))
|
||||
- if (!str_diffn(ut.ut_name,user,sizeof(ut.ut_name)))
|
||||
+ while ((ut = getutxent()) != NULL)
|
||||
+ if (ut->ut_type == USER_PROCESS && !str_diffn(ut->ut_user,user,sizeof(ut->ut_user)))
|
||||
{
|
||||
- byte_copy(line,sizeof(ut.ut_line),ut.ut_line);
|
||||
- line[sizeof(ut.ut_line)] = 0;
|
||||
+ byte_copy(line,sizeof(ut->ut_line),ut->ut_line);
|
||||
+ line[sizeof(ut->ut_line)] = 0;
|
||||
if (line[0] == '/') continue;
|
||||
if (!line[0]) continue;
|
||||
if (line[str_chr(line,'.')]) continue;
|
Loading…
Reference in New Issue
Block a user