From c6b577caefb7ea2f9a73229f94703792b66f7a8f Mon Sep 17 00:00:00 2001 From: Arjun Shankar Date: Mon, 2 Oct 2023 14:55:18 +0200 Subject: Remove 'shadow' and merge into 'nss' The majority of shadow routines are entry points for nss functionality. This commit removes the 'shadow' subdirectory and moves all functionality and tests to 'nss'. References to shadow/ are accordingly changed. Reviewed-by: Adhemerval Zanella --- shadow/tst-putspent.c | 164 -------------------------------------------------- 1 file changed, 164 deletions(-) delete mode 100644 shadow/tst-putspent.c (limited to 'shadow/tst-putspent.c') diff --git a/shadow/tst-putspent.c b/shadow/tst-putspent.c deleted file mode 100644 index 7b85096636..0000000000 --- a/shadow/tst-putspent.c +++ /dev/null @@ -1,164 +0,0 @@ -/* Test for processing of invalid shadow entries. [BZ #18724] - Copyright (C) 2015-2023 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include -#include -#include -#include - -static bool errors; - -static void -check (struct spwd p, const char *expected) -{ - char *buf; - size_t buf_size; - FILE *f = open_memstream (&buf, &buf_size); - - if (f == NULL) - { - printf ("open_memstream: %m\n"); - errors = true; - return; - } - - int ret = putspent (&p, f); - - if (expected == NULL) - { - if (ret == -1) - { - if (errno != EINVAL) - { - printf ("putspent: unexpected error code: %m\n"); - errors = true; - } - } - else - { - printf ("putspent: unexpected success (\"%s\")\n", p.sp_namp); - errors = true; - } - } - else - { - /* Expect success. */ - size_t expected_length = strlen (expected); - if (ret == 0) - { - long written = ftell (f); - - if (written <= 0 || fflush (f) < 0) - { - printf ("stream error: %m\n"); - errors = true; - } - else if (buf[written - 1] != '\n') - { - printf ("FAILED: \"%s\" without newline\n", expected); - errors = true; - } - else if (strncmp (buf, expected, written - 1) != 0 - || written - 1 != expected_length) - { - printf ("FAILED: \"%s\" (%ld), expected \"%s\" (%zu)\n", - buf, written - 1, expected, expected_length); - errors = true; - } - } - else - { - printf ("FAILED: putspent (expected \"%s\"): %m\n", expected); - errors = true; - } - } - - fclose (f); - free (buf); -} - -static int -do_test (void) -{ - check ((struct spwd) { - .sp_namp = (char *) "root", - }, - "root::0:0:0:0:0:0:0"); - check ((struct spwd) { - .sp_namp = (char *) "root", - .sp_pwdp = (char *) "password", - }, - "root:password:0:0:0:0:0:0:0"); - check ((struct spwd) { - .sp_namp = (char *) "root", - .sp_pwdp = (char *) "password", - .sp_lstchg = -1, - .sp_min = -1, - .sp_max = -1, - .sp_warn = -1, - .sp_inact = -1, - .sp_expire = -1, - .sp_flag = -1 - }, - "root:password:::::::"); - check ((struct spwd) { - .sp_namp = (char *) "root", - .sp_pwdp = (char *) "password", - .sp_lstchg = 1, - .sp_min = 2, - .sp_max = 3, - .sp_warn = 4, - .sp_inact = 5, - .sp_expire = 6, - .sp_flag = 7 - }, - "root:password:1:2:3:4:5:6:7"); - - /* Bad values. */ - { - static const char *const bad_strings[] = { - ":", - "\n", - ":bad", - "\nbad", - "b:ad", - "b\nad", - "bad:", - "bad\n", - "b:a\nd", - NULL - }; - for (const char *const *bad = bad_strings; *bad != NULL; ++bad) - { - check ((struct spwd) { - .sp_namp = (char *) *bad, - }, NULL); - check ((struct spwd) { - .sp_namp = (char *) "root", - .sp_pwdp = (char *) *bad, - }, NULL); - } - } - - return errors; -} - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" -- cgit v1.2.3