From: Christian Göttsche <cgzones@googlemail.com>
Date: Fri, 9 Apr 2021 16:20:41 +0000 (+0200)
Subject: struct commonio_db[selinux]: do not use deprecated type security_context_t
X-Git-Tag: v4.9~26^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e4b2fe25d9b53912f035736342cc0372eb0cd81;p=thirdparty%2Fshadow.git

struct commonio_db[selinux]: do not use deprecated type security_context_t

The typedef security_context_t is deprecated, see
https://github.com/SELinuxProject/selinux/commit/9eb9c9327563014ad6a807814e7975424642d5b9

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Acked-by: James Carter <jwcart2@gmail.com>
---

diff --git a/lib/commonio.h b/lib/commonio.h
index 64e830731..2bad47a59 100644
--- a/lib/commonio.h
+++ b/lib/commonio.h
@@ -34,10 +34,6 @@
 #ifndef COMMONIO_H
 #define COMMONIO_H
 
-#ifdef WITH_SELINUX
-#include <selinux/selinux.h>
-#endif
-
 #include "defines.h" /* bool */
 
 /*
@@ -121,7 +117,7 @@ struct commonio_db {
 	/*@dependent@*/ /*@null@*/FILE *fp;
 
 #ifdef WITH_SELINUX
-	/*@null@*/security_context_t scontext;
+	/*@null@*/char *scontext;
 #endif
 	/*
 	 * Default permissions and owner for newly created data file.
diff --git a/src/useradd.c b/src/useradd.c
index a0369cd87..dcda31960 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -69,6 +69,9 @@
 #include "sgroupio.h"
 #endif
 #include "shadowio.h"
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#endif				/* WITH_SELINUX */
 #ifdef ENABLE_SUBIDS
 #include "subordinateio.h"
 #endif				/* ENABLE_SUBIDS */
diff --git a/src/userdel.c b/src/userdel.c
index 4248ab80d..92bca4999 100644
--- a/src/userdel.c
+++ b/src/userdel.c
@@ -59,6 +59,9 @@
 #ifdef	SHADOWGRP
 #include "sgroupio.h"
 #endif				/* SHADOWGRP */
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#endif				/* WITH_SELINUX */
 #ifdef WITH_TCB
 #include <tcb.h>
 #include "tcbfuncs.h"
diff --git a/src/usermod.c b/src/usermod.c
index 3ba011c2b..15c70b5c8 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -68,6 +68,9 @@
 #ifdef ENABLE_SUBIDS
 #include "subordinateio.h"
 #endif				/* ENABLE_SUBIDS */
+#ifdef WITH_SELINUX
+#include <selinux/selinux.h>
+#endif				/* WITH_SELINUX */
 #ifdef WITH_TCB
 #include "tcbfuncs.h"
 #endif