2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index f97c7acba..aa3d0ae9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,7 +119,10 @@
  - (djm) [uuencode.c]
    Add resolv.h, is it contains the prototypes for __b64_ntop/__b64_pton on
    some platforms
-
+ - (djm) [session.c]
+   fix compile error with -Werror -Wall: 'path' is only used in
+   do_setup_env() if HAVE_LOGIN_CAP is not defined
+  
 20060713
  - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
 
@@ -5037,4 +5040,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4432 2006/07/24 04:58:07 djm Exp $
+$Id: ChangeLog,v 1.4433 2006/07/24 05:03:06 djm Exp $
diff --git a/session.c b/session.c
index c2730a425..0c20d9e8a 100644
--- a/session.c
+++ b/session.c
@@ -995,8 +995,11 @@ do_setup_env(Session *s, const char *shell)
 {
         char buf[256];
         u_int i, envsize;
-        char **env, *laddr, *path = NULL;
+        char **env, *laddr;
         struct passwd *pw = s->pw;
+#ifndef HAVE_LOGIN_CAP
+        char *path = NULL;
+#endif
 
         /* Initialize the environment. */
         envsize = 100;