2 files changed, 3 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e9cb557d7..f80d79aa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
  - (dtucker) [session.c] Bug #1567: move setpcred call to before chroot and
    do not set real uid, since that's needed for the chroot, and will be set
    by permanently_set_uid.
+ - (dtucker) [session.c] Also initialize creds to NULL for handing to
+    setpcred.
 
 20100305
  - OpenBSD CVS Sync
diff --git a/session.c b/session.c
index 8f978faa6..b384b7d86 100644
--- a/session.c
+++ b/session.c
@@ -1537,7 +1537,7 @@ do_setusercontext(struct passwd *pw)
                  * chroot directory, we don't override anything.
                  */
                 {
-                        char **creds, *chroot_creds[] =
+                        char **creds = NULL, *chroot_creds[] =
                             { "REAL_USER=root", NULL };
 
                         if (options.chroot_directory != NULL &&