Merge branch 'non-linux' into 'master'

Include <utmpx.h>, fixing the build on GNU/Hurd

See merge request debian/shadow!26
This commit is contained in:
Chris Hofstaedtler
2024-09-12 23:19:21 +00:00
2 changed files with 27 additions and 0 deletions

View File

@@ -9,3 +9,4 @@ debian/tests-libsubid-04_nss-fix-setting-basedir.patch
debian/Adapt-login.defs-for-Debian.patch
debian/Define-LOGIN_NAME_MAX-on-HURD.patch
debian/Stop-building-programs-we-do-not-install.patch
upstream/lib-user_busy.c-Include-utmpx.h.patch

View File

@@ -0,0 +1,26 @@
From b2b37863a62af83deb21284ae156aa425bed0cb9 Mon Sep 17 00:00:00 2001
From: Pino Toscano <toscano.pino@tiscali.it>
Date: Tue, 10 Sep 2024 14:36:49 +0200
Subject: [PATCH] lib/user_busy.c: Include <utmpx.h>
Since:
- utmpx APIs are used in non-Linux code blocks
- <utmpx.h> is already unconditionally included in Linux parts in other
files
then unconditionally include it in this file as well.
Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
---
lib/user_busy.c | 1 +
1 file changed, 1 insertion(+)
--- a/lib/user_busy.c
+++ b/lib/user_busy.c
@@ -17,6 +17,7 @@
#include <dirent.h>
#include <fcntl.h>
#include <unistd.h>
+#include <utmpx.h>
#include "defines.h"
#include "prototypes.h"
#ifdef ENABLE_SUBIDS