5581e74188
Except for the added (and sorted) includes, and the removal of redundant parentheses, this patch can be approximated with the following semantic patch: $ cat ~/tmp/spatch/streq.sp; @@ expression a, b; @@ - strcmp(a, b) == 0 + streq(a, b) @@ expression a, b; @@ - 0 == strcmp(a, b) + streq(a, b) @@ expression a, b; @@ - !strcmp(a, b) + streq(a, b) $ find contrib/ lib* src/ -type f \ | xargs spatch --sp-file ~/tmp/spatch/streq.sp --in-place; $ git restore lib/string/strcmp/streq.h; Signed-off-by: Alejandro Colomar <alx@kernel.org>
107 lines
2.4 KiB
C
107 lines
2.4 KiB
C
/*
|
|
* SPDX-FileCopyrightText: 1989 - 1994, Julianne Frances Haugh
|
|
* SPDX-FileCopyrightText: 1996 - 1997, Marek Michałkiewicz
|
|
* SPDX-FileCopyrightText: 2001 - 2005, Tomasz Kłoczko
|
|
* SPDX-FileCopyrightText: 2008 - 2009, Nicolas François
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
/*
|
|
* Extracted from age.c and made part of libshadow.a - may be useful
|
|
* in other shadow-aware programs. --marekm
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <sys/types.h>
|
|
#include <pwd.h>
|
|
#include <time.h>
|
|
|
|
#include "adds.h"
|
|
#include "defines.h"
|
|
#include "prototypes.h"
|
|
#include "string/strcmp/streq.h"
|
|
|
|
#ident "$Id$"
|
|
|
|
|
|
/*
|
|
* isexpired - determine if account is expired yet
|
|
*
|
|
* isexpired calculates the expiration date based on the
|
|
* password expiration criteria.
|
|
*
|
|
* Return value:
|
|
* 0: The password is still valid
|
|
* 1: The password has expired, it must be changed
|
|
* 2: The password has expired since a long time and the account is
|
|
* now disabled. (password cannot be changed)
|
|
* 3: The account has expired
|
|
*/
|
|
int isexpired (const struct passwd *pw, /*@null@*/const struct spwd *sp)
|
|
{
|
|
long now;
|
|
|
|
now = time(NULL) / DAY;
|
|
|
|
if (NULL == sp) {
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Quick and easy - there is an expired account field
|
|
* along with an inactive account field. Do the expired
|
|
* one first since it is worse.
|
|
*/
|
|
|
|
if ((sp->sp_expire > 0) && (now >= sp->sp_expire)) {
|
|
return 3;
|
|
}
|
|
|
|
/*
|
|
* Last changed date 1970-01-01 (not very likely) means that
|
|
* the password must be changed on next login (passwd -e).
|
|
*
|
|
* The check for "x" is a workaround for RedHat NYS libc bug -
|
|
* if /etc/shadow doesn't exist, getspnam() still succeeds and
|
|
* returns sp_lstchg==0 (must change password) instead of -1!
|
|
*/
|
|
if ( (0 == sp->sp_lstchg)
|
|
&& streq(pw->pw_passwd, SHADOW_PASSWD_STRING)) {
|
|
return 1;
|
|
}
|
|
|
|
if ( (sp->sp_lstchg > 0)
|
|
&& (sp->sp_max >= 0)
|
|
&& (sp->sp_inact >= 0)
|
|
&& (now >= addsl(sp->sp_lstchg, sp->sp_max, sp->sp_inact)))
|
|
{
|
|
return 2;
|
|
}
|
|
|
|
/*
|
|
* The last and max fields must be present for an account
|
|
* to have an expired password. A maximum of >10000 days
|
|
* is considered to be infinite.
|
|
*/
|
|
|
|
if ( (-1 == sp->sp_lstchg)
|
|
|| (-1 == sp->sp_max)
|
|
|| (sp->sp_max >= 10000)) {
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Calculate today's day and the day on which the password
|
|
* is going to expire. If that date has already passed,
|
|
* the password has expired.
|
|
*/
|
|
|
|
if (now >= addsl(sp->sp_lstchg, sp->sp_max))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|