- djm@cvs.openbsd.org 2010/11/23 02:35:50

     [auth.c]
     use strict_modes already passed as function argument over referencing
     global options.strict_modes

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 @@
      Refactor internals of private key loading and saving to work on memory
      buffers rather than directly on files. This will make a few things
      easier to do in the future; ok markus@
+   - djm@cvs.openbsd.org 2010/11/23 02:35:50
+     [auth.c]
+     use strict_modes already passed as function argument over referencing
+     global options.strict_modes
 
 20101124
  - (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 @@
-/* $OpenBSD: auth.c,v 1.89 2010/08/04 05:42:47 djm Exp $ */
+/* $OpenBSD: auth.c,v 1.90 2010/11/23 02:35:50 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -518,7 +518,7 @@ auth_openfile(const char *file, struct passwd *pw, int strict_modes,
                 close(fd);
                 return NULL;
         }
-        if (options.strict_modes &&
+        if (strict_modes &&
             secure_filename(f, file, pw, line, sizeof(line)) != 0) {
                 fclose(f);
                 logit("Authentication refused: %s", line);