VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

login: conditionally build lastlog functionality

Browse Source 
Resolves: https://github.com/shadow-maint/shadow/issues/674

Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>
This commit is contained in:
Iker Pedrosa
2023-07-13 12:59:33 +02:00
committed by Serge Hallyn
parent 1bdcfa8d37
commit 84a10ca019
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/prototypes.h
View File

@@ -28,7 +28,9 @@
#include <pwd.h>
#include <grp.h>
#include <shadow.h>
#ifdef ENABLE_LASTLOG
#include <lastlog.h>
#endif /* ENABLE_LASTLOG */
#include "defines.h"
#include "commonio.h"
@@ -222,12 +224,14 @@ extern /*@only@*/ /*@out@*/char **dup_list (char *const *);
extern bool is_on_list (char *const *list, const char *member);
extern /*@only@*/char **comma_to_list (const char *);
#ifdef ENABLE_LASTLOG
/* log.c */
extern void dolastlog (
struct lastlog *ll,
const struct passwd *pw,
/*@unique@*/const char *line,
/*@unique@*/const char *host);
#endif /* ENABLE_LASTLOG */
/* login_nopam.c */
extern int login_access (const char *user, const char *from);

5
libmisc/Makefile.am
View File

@@ -48,7 +48,7 @@ libmisc_la_SOURCES = \
idmapping.c \
isexpired.c \
limits.c \
list.c log.c \
list.c \
loginprompt.c \
mail.c \
mempcpy.c \
@@ -92,3 +92,6 @@ if WITH_BTRFS
libmisc_la_SOURCES += btrfs.c
endif
if ENABLE_LASTLOG
libmisc_la_SOURCES += log.c
endif

10
src/login.c
View File

@@ -14,7 +14,9 @@
#include <errno.h>
#include <grp.h>
#ifndef USE_PAM
#ifdef ENABLE_LASTLOG
#include <lastlog.h>
#endif /* ENABLE_LASTLOG */
#endif /* !USE_PAM */
#include <pwd.h>
#include <signal.h>
@@ -69,7 +71,9 @@ static /*@null@*/ /*@only@*/char *username = NULL;
static int reason = PW_LOGIN;
#ifndef USE_PAM
#ifdef ENABLE_LASTLOG
static struct lastlog ll;
#endif /* ENABLE_LASTLOG */
#endif /* !USE_PAM */
static bool pflg = false;
static bool fflg = false;
@@ -498,7 +502,9 @@ int main (int argc, char **argv)
char term[128] = "";
#endif /* RLOGIN */
#if !defined(USE_PAM)
#ifdef ENABLE_LASTLOG
char ptime[80];
#endif /* ENABLE_LASTLOG */
#endif
unsigned int delay;
unsigned int retries;
@@ -1128,11 +1134,13 @@ int main (int argc, char **argv)
#endif /* WITH_AUDIT */
#ifndef USE_PAM /* pam_lastlog handles this */
#ifdef ENABLE_LASTLOG
if ( getdef_bool ("LASTLOG_ENAB")
&& pwd->pw_uid <= (uid_t) getdef_ulong ("LASTLOG_UID_MAX", 0xFFFFFFFFUL)) {
/* give last login and log this one */
dolastlog (&ll, pwd, tty, hostname);
}
#endif /* ENABLE_LASTLOG */
#endif
#ifndef USE_PAM /* PAM handles this as well */
@@ -1266,6 +1274,7 @@ int main (int argc, char **argv)
username, (int) faillog.fail_cnt));
}
}
#ifdef ENABLE_LASTLOG
if ( getdef_bool ("LASTLOG_ENAB")
&& pwd->pw_uid <= (uid_t) getdef_ulong ("LASTLOG_UID_MAX", 0xFFFFFFFFUL)
&& (ll.ll_time != 0)) {
@@ -1284,6 +1293,7 @@ int main (int argc, char **argv)
#endif
printf (".\n");
}
#endif /* ENABLE_LASTLOG */
agecheck (spwd);
mailcheck (); /* report on the status of mail */