summaryrefslogtreecommitdiff
path: root/src/login.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/login.c')
-rw-r--r--src/login.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/login.c b/src/login.c
index fe628de..2e5f65e 100644
--- a/src/login.c
+++ b/src/login.c
@@ -2,7 +2,7 @@
* Copyright (c) 1989 - 1994, Julianne Frances Haugh
* Copyright (c) 1996 - 2001, Marek Michałkiewicz
* Copyright (c) 2001 - 2006, Tomasz Kłoczko
- * Copyright (c) 2007 - 2011, Nicolas François
+ * Copyright (c) 2007 - 2012, Nicolas François
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,7 @@
#include <config.h>
-#ident "$Id: login.c 3549 2011-11-06 18:38:51Z nekral-guest $"
+#ident "$Id: login.c 3743 2012-05-25 11:51:53Z nekral-guest $"
#include <errno.h>
#include <grp.h>
@@ -126,12 +126,10 @@ static void usage (void);
static void setup_tty (void);
static void process_flags (int argc, char *const *argv);
static /*@observer@*/const char *get_failent_user (/*@returned@*/const char *user);
-#ifndef USE_PAM
static void update_utmp (const char *user,
const char *tty,
const char *host,
/*@null@*/const struct utmp *utent);
-#endif /* ! USE_PAM */
#ifndef USE_PAM
static struct faillog faillog;
@@ -473,7 +471,6 @@ static /*@observer@*/const char *get_failent_user (/*@returned@*/const char *use
return failent_user;
}
-#ifndef USE_PAM
/*
* update_utmp - Update or create an utmp entry in utmp, wtmp, utmpw, and
* wtmpx
@@ -499,7 +496,6 @@ static void update_utmp (const char *user,
free (utx);
#endif /* USE_UTMPX */
}
-#endif /* ! USE_PAM */
/*
* login - create a new login session for a user
@@ -1215,13 +1211,11 @@ int main (int argc, char **argv)
}
}
-#ifndef USE_PAM
/*
* The utmp entry needs to be updated to indicate the new status
* of the session, the new PID and SID.
*/
update_utmp (username, tty, hostname, utent);
-#endif /* ! USE_PAM */
/* The pwd and spwd entries for the user have been copied.
*