From 90279d80f57c79ac6566051172a94a2cca9674b1 Mon Sep 17 00:00:00 2001
From: Ben Lindstrom <mouring@eviladmin.org>
Date: Wed, 4 Jul 2001 03:56:56 +0000
Subject: [PATCH]    - markus@cvs.openbsd.org 2001/06/26 05:50:11     
 [auth2.c]      new interface for secure_filename()

---
 ChangeLog | 5 ++++-
 auth2.c   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ed5e9080..492d00c5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,9 @@
      [sshd.8]
      remove unnecessary .Pp between .It;
      millert@ ok
+   - markus@cvs.openbsd.org 2001/06/26 05:50:11
+     [auth2.c]
+     new interface for secure_filename()
 
 20010629
  - (bal) Removed net_aton() since we don't use it any more
@@ -5862,4 +5865,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1354 2001/07/04 03:55:21 mouring Exp $
+$Id: ChangeLog,v 1.1355 2001/07/04 03:56:56 mouring Exp $
diff --git a/auth2.c b/auth2.c
index e7a7050f4..276e05dd5 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.67 2001/06/25 20:26:37 stevesk Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.68 2001/06/26 05:50:11 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -679,7 +679,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
 		return 0;
 	}
 	if (options.strict_modes &&
-	    secure_filename(f, file, pw->pw_uid, line, sizeof(line)) != 0) {
+	    secure_filename(f, file, pw, line, sizeof(line)) != 0) {
 		fclose(f);
 		log("Authentication refused: %s", line);
 		restore_uid();