summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-03-07 13:32:16 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-03-07 13:32:16 +1100
commitac0c4c9c1d511839b2c86ebe5994298b524ceffd (patch)
tree5c10202d0e2b3e0f7f67cbaa41bc024a0d86abac
parentc738e6c646aa0b588f50e953b4d3931c29e9ab28 (diff)
downloadopenssh-git-ac0c4c9c1d511839b2c86ebe5994298b524ceffd.tar.gz
- (dtucker) [session.c] Also initialize creds to NULL for handing to
setpcred.
-rw-r--r--ChangeLog2
-rw-r--r--session.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e9cb557d..f80d79aa 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 8f978faa..b384b7d8 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 &&