From 2d50270781264fa5ee57080b18619a7d997b1a8e Mon Sep 17 00:00:00 2001
From: David Wilson <dw@botanicus.net>
Date: Mon, 13 Aug 2018 11:29:37 +0100
Subject: [PATCH] sudo: support '-i' flag.

Closes #343.
---
 mitogen/sudo.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/mitogen/sudo.py b/mitogen/sudo.py
index 1ec5c2f6..89291acd 100644
--- a/mitogen/sudo.py
+++ b/mitogen/sudo.py
@@ -49,7 +49,7 @@ SUDO_OPTIONS = [
     #(False, 'str', '--group', '-g')
     (True,  'bool', '--set-home', '-H'),
     #(False, 'str', '--host', '-h')
-    #(False, 'bool', '--login', '-i')
+    (False, 'bool', '--login', '-i')
     #(False, 'bool', '--remove-timestamp', '-K')
     #(False, 'bool', '--reset-timestamp', '-k')
     #(False, 'bool', '--list', '-l')
@@ -116,10 +116,11 @@ class Stream(mitogen.parent.Stream):
     password = None
     preserve_env = False
     set_home = False
+    login = False
 
     def construct(self, username=None, sudo_path=None, password=None,
                   preserve_env=None, set_home=None, sudo_args=None,
-                  **kwargs):
+                  login=None, **kwargs):
         super(Stream, self).construct(**kwargs)
         opts = parse_sudo_flags(sudo_args or [])
 
@@ -133,6 +134,8 @@ class Stream(mitogen.parent.Stream):
             self.preserve_env = preserve_env or opts.preserve_env
         if (set_home or opts.set_home) is not None:
             self.set_home = set_home or opts.set_home
+        if (login or opts.login) is not None:
+            self.login = True
 
     def connect(self):
         super(Stream, self).connect()
@@ -144,13 +147,16 @@ class Stream(mitogen.parent.Stream):
 
     def get_boot_command(self):
         # Note: sudo did not introduce long-format option processing until July
-        # 2013, so even though we parse long-format options, we always supply
-        # short-form to the sudo command.
+        # 2013, so even though we parse long-format options, supply short-form
+        # to the sudo command.
         bits = [self.sudo_path, '-u', self.username]
         if self.preserve_env:
             bits += ['-E']
         if self.set_home:
             bits += ['-H']
+        if self.login:
+            bits += ['-i']
+
         bits = bits + super(Stream, self).get_boot_command()
         LOG.debug('sudo command line: %r', bits)
         return bits