simon-git: putty (master): Simon Tatham

Commits to Tartarus hosted VCS tartarus-commits at lists.tartarus.org
Mon Apr 1 09:06:34 BST 2019


TL;DR:
  4cd040bc uxpty.c: stop setting DISPLAY to "(null)".
  e93d9ff3 Uppity: clear some key environment vars in subprocesses.
  d5199e47 Uppity: configurable cwd for session.
  2e3a1c6d Uppity: make a separate AuthPolicy per connection.

Repository:     https://git.tartarus.org/simon/putty.git
On the web:     https://git.tartarus.org/?p=simon/putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2019-04-01 09:06:34

commit 4cd040bced85ac462169c45e84ede49606f0e32f
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=4cd040bced85ac462169c45e84ede49606f0e32f;hp=9366a1b4d8038d091c147cb85aeeaaeb46c74aa1
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Mar 31 22:14:03 2019 +0100

    uxpty.c: stop setting DISPLAY to "(null)".
    
    In some contexts (namely pterm on a pure Wayland system, and Uppity),
    seat_get_x_display() will return NULL. In that situation uxpty.c was
    cheerfully passing it to dupprintf regardless, which in principle is
    undefined behaviour and in practice was causing it to construct the
    silly environment string "DISPLAY=(null)".
    
    Now we handle that case by unsetenv("DISPLAY") instead.

 unix/uxpty.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit e93d9ff305f469fff5328ce0f4bdb8b4e5d8182e
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=e93d9ff305f469fff5328ce0f4bdb8b4e5d8182e;hp=4cd040bced85ac462169c45e84ede49606f0e32f
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Mar 31 22:09:54 2019 +0100

    Uppity: clear some key environment vars in subprocesses.
    
    My helper scripts for invoking Uppity have been manually unsetting
    things like XAUTHORITY and SSH_AUTH_SOCK, to avoid accidentally
    passing them through from my primary login session, so that I don't
    get confused about whether agent forwarding is happening, or end up
    with one DISPLAY going with a different XAUTHORITY.
    
    Now I clear these within Uppity itself, so the wrapping script won't
    have to.

 sesschan.c   | 17 ++++++++++++++++-
 sshserver.h  |  3 ++-
 unix/uxpty.c | 10 ++++++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

commit d5199e473f6b7bdb488dce22c309b98b6db6c6b0
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=d5199e473f6b7bdb488dce22c309b98b6db6c6b0;hp=e93d9ff305f469fff5328ce0f4bdb8b4e5d8182e
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Mar 31 22:12:42 2019 +0100

    Uppity: configurable cwd for session.
    
    All my instincts expect the shell subprocesses to start off in ~, so
    it's confusing if they start off in some random PuTTY checkout
    directory. So now we default to $HOME, and if I really do want the
    latter, I can use the new config option to reselect '.'.

 sesschan.c      | 3 ++-
 sshserver.h     | 4 +++-
 unix/uxpty.c    | 7 +++++--
 unix/uxserver.c | 5 +++++
 4 files changed, 15 insertions(+), 4 deletions(-)

commit 2e3a1c6d693317dd70b46d40b9228c1175cb1fab
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=2e3a1c6d693317dd70b46d40b9228c1175cb1fab;hp=d5199e473f6b7bdb488dce22c309b98b6db6c6b0
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Mar 31 22:23:03 2019 +0100

    Uppity: make a separate AuthPolicy per connection.
    
    Despite the name, AuthPolicy in uxserver.c was also holding the state
    of the current connection, including in particular how far through the
    multi-step test keyboard-interactive interaction we are. But now that
    Uppity can handle multiple connections in the same run, we need to
    reset that state between connections. So the tree234s of acceptable
    user keys now live in an AuthPolicyShared structure, and AuthPolicy
    proper is a field of server_instance.

 unix/uxserver.c | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)



More information about the tartarus-commits mailing list