lib/shadow/shadow/, lib/, po/: sgetspent(): Move to under lib/shadow/shadow/

Signed-off-by: Alejandro Colomar <[email protected]>

Author: alejandro-colomar

lib/Makefile.am

@@ -166,7 +166,6 @@ libshadow_la_SOURCES = \
 	semanage.c \
 	setugid.c \
 	setupenv.c \
-	sgetspent.c \
 	sgroupio.c \
 	sgroupio.h \
 	shadow.c \
@@ -194,6 +193,8 @@ libshadow_la_SOURCES = \
 	shadow/gshadow/sgrp.h \
 	shadow/passwd/sgetpwent.c \
 	shadow/passwd/sgetpwent.h \
+	shadow/shadow/sgetspent.c \
+	shadow/shadow/sgetspent.h \
 	shadowio.c \
 	shadowio.h \
 	shadowlog.c \

lib/prototypes.h

@@ -401,11 +401,6 @@ extern void setup (struct passwd *);
 /* setupenv.c */
 extern void setup_env (struct passwd *);
 
-/* sgetspent.c */
-#ifndef HAVE_SGETSPENT
-extern struct spwd *sgetspent (const char *string);
-#endif
-
 /* sgroupio.c */
 extern void __sgr_del_entry (const struct commonio_entry *ent);
 extern /*@null@*/ /*@only@*/struct sgrp *__sgr_dup (const struct sgrp *sgent);

lib/sgetspent.c renamed to lib/shadow/shadow/sgetspent.c

@@ -1,19 +1,15 @@
-/*
- * SPDX-FileCopyrightText: 1989 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1998, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2003 - 2005, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2009       , Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 1989-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2005, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2009, Nicolas François
+// SPDX-FileCopyrightText: 2025, Alejandro Colomar <[email protected]>
+// SPDX-License-Identifier: BSD-3-Clause
+
 
 #include <config.h>
 
-/* Newer versions of Linux libc already have shadow support.  */
 #ifndef HAVE_SGETSPENT
 
-#ident "$Id$"
-
 #include <stddef.h>
 #include <stdio.h>
 #include <sys/types.h>

lib/shadow/shadow/sgetspent.h

@@ -0,0 +1,19 @@
+// SPDX-FileCopyrightText: 2025, Alejandro Colomar <[email protected]>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_SHADOW_SHADOW_SGETSPENT_H_
+#define SHADOW_INCLUDE_LIB_SHADOW_SHADOW_SGETSPENT_H_
+
+
+#include <config.h>
+
+#include <shadow.h>
+
+
+#if !defined(HAVE_SGETSPENT)
+struct spwd *sgetspent(const char *s);
+#endif
+
+
+#endif  // include guard

lib/shadowio.c

@@ -12,12 +12,14 @@
 
 #ident "$Id$"
 
-#include "prototypes.h"
-#include "defines.h"
 #include <shadow.h>
 #include <stdio.h>
+
 #include "commonio.h"
+#include "defines.h"
 #include "getdef.h"
+#include "prototypes.h"
+#include "shadow/shadow/sgetspent.h"
 #include "shadowio.h"
 #ifdef WITH_TCB
 #include <tcb.h>

po/POTFILES.in

@@ -56,7 +56,6 @@ lib/selinux.c
 lib/semanage.c
 lib/setugid.c
 lib/setupenv.c
-lib/sgetspent.c
 lib/sgroupio.c
 lib/shadow.c
 lib/shadow/group/sgetgrent.c