From 9912296f1957f9449bd4daf0130a471010140580 Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Sat, 14 Jul 2001 01:55:15 +0000
Subject: [PATCH]  - (djm) Revert dirname fix, a better one is on its way.

---
 ChangeLog | 1 +
 auth.c    | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c60f290..e477fc9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
  - (djm) Enable /etc/nologin check on PAM systems, as some lack the 
    pam_nologin module. Report from William Yodlowsky 
    <bsd@openbsd.rutgers.edu>
+ - (djm) Revert dirname fix, a better one is on its way.
 
 20010711
  - (djm) dirname(3) may modify its argument on glibc and other systems. 
diff --git a/auth.c b/auth.c
index 43680234..84e0be76 100644
--- a/auth.c
+++ b/auth.c
@@ -368,11 +368,7 @@ secure_filename(FILE *f, const char *file, struct passwd *pw,
 	char *cp;
 	struct stat st;
 
-	strlcpy(homedir, pw->pw_dir, sizeof(homedir));
-	if ((cp = dirname(homedir)) == NULL)
-		strlcpy(homedir, "/", sizeof(homedir));
-	else
-		memmove(homedir, cp, strlen(cp));
+	strlcpy(homedir, dirname(pw->pw_dir), sizeof(homedir));
 
 	if (realpath(file, buf) == NULL) {
 		snprintf(err, errlen, "realpath %s failed: %s", file,
-- 
2.45.1