summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--auth.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b1cd5242..de1fb753d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
12 Refactor internals of private key loading and saving to work on memory 12 Refactor internals of private key loading and saving to work on memory
13 buffers rather than directly on files. This will make a few things 13 buffers rather than directly on files. This will make a few things
14 easier to do in the future; ok markus@ 14 easier to do in the future; ok markus@
15 - djm@cvs.openbsd.org 2010/11/23 02:35:50
16 [auth.c]
17 use strict_modes already passed as function argument over referencing
18 global options.strict_modes
15 19
1620101124 2020101124
17 - (dtucker) [platform.c session.c] Move the getluid call out of session.c and 21 - (dtucker) [platform.c session.c] Move the getluid call out of session.c and
diff --git a/auth.c b/auth.c
index dba1e6555..6fe1b21a4 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.c,v 1.89 2010/08/04 05:42:47 djm Exp $ */ 1/* $OpenBSD: auth.c,v 1.90 2010/11/23 02:35:50 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -518,7 +518,7 @@ auth_openfile(const char *file, struct passwd *pw, int strict_modes,
518 close(fd); 518 close(fd);
519 return NULL; 519 return NULL;
520 } 520 }
521 if (options.strict_modes && 521 if (strict_modes &&
522 secure_filename(f, file, pw, line, sizeof(line)) != 0) { 522 secure_filename(f, file, pw, line, sizeof(line)) != 0) {
523 fclose(f); 523 fclose(f);
524 logit("Authentication refused: %s", line); 524 logit("Authentication refused: %s", line);