-Wall

diff --git a/ChangeLog b/ChangeLog
index 6d572cada92a30c0342b5e6d7ab11f0a00c86218..7b7f698ec08d9116b7823e8b122f8e432dcb8318 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,6 @@
      o) better -mdoc style;
      o) typo;
      o) sort SEE ALSO;
-
      aaron@ ok
    - provos@cvs.openbsd.org 2001/06/22 21:27:08
      [dh.c pathnames.h]
@@ -105,6 +104,7 @@
    - markus@cvs.openbsd.org 2001/06/24 17:18:31
      [ttymodes.c]
      passing modes works fine: debug2->3
+ - (djm) -Wall fix for session.c
 
 20010622
  - (stevesk) handle systems without pw_expire and pw_change.

diff --git a/session.c b/session.c
index 92870a111805461543ba612c42be5c0ae447feca..0571c2f64678817405972cfd004843ca6f9d00dd 100644 (file)
--- a/session.c
+++ b/session.c
@@ -607,6 +607,29 @@ do_exec(Session *s, const char *command)
        original_command = NULL;
 }
 
+/*
+ * Check for quiet login, either .hushlogin or command given.
+ */
+static int
+check_quietlogin(Session *s, const char *command)
+{
+       char buf[256];
+       struct passwd * pw = s->pw;
+       struct stat st;
+
+       /* Return 1 if .hushlogin exists or a command given. */
+       if (command != NULL)
+               return 1;
+       snprintf(buf, sizeof(buf), "%.200s/.hushlogin", pw->pw_dir);
+#ifdef HAVE_LOGIN_CAP
+       if (login_getcapbool(lc, "hushlogin", 0) || stat(buf, &st) >= 0)
+               return 1;
+#else
+       if (stat(buf, &st) >= 0)
+               return 1;
+#endif
+       return 0;
+}
 
 /* administrative, login(1)-like work */
 void
@@ -706,31 +729,6 @@ do_motd(void)
        }
 }
 
-
-/*
- * Check for quiet login, either .hushlogin or command given.
- */
-int
-check_quietlogin(Session *s, const char *command)
-{
-       char buf[256];
-       struct passwd * pw = s->pw;
-       struct stat st;
-
-       /* Return 1 if .hushlogin exists or a command given. */
-       if (command != NULL)
-               return 1;
-       snprintf(buf, sizeof(buf), "%.200s/.hushlogin", pw->pw_dir);
-#ifdef HAVE_LOGIN_CAP
-       if (login_getcapbool(lc, "hushlogin", 0) || stat(buf, &st) >= 0)
-               return 1;
-#else
-       if (stat(buf, &st) >= 0)
-               return 1;
-#endif
-       return 0;
-}
-
 /*
  * Sets the value of the given variable in the environment.  If the variable
  * already exists, its value is overriden.