From 6ff4d40d7477005308fe50a32e2c38b8402d5992 Mon Sep 17 00:00:00 2001 From: Abhijit Menon-Sen Date: Sat, 26 Sep 2015 17:28:22 +0530 Subject: [PATCH 1/2] Update outdated comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We now use "sudo -n" instead of "sudo -k && sudo …" --- lib/ansible/playbook/play_context.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/ansible/playbook/play_context.py b/lib/ansible/playbook/play_context.py index 1e9f35d4ae..63bea3b53b 100644 --- a/lib/ansible/playbook/play_context.py +++ b/lib/ansible/playbook/play_context.py @@ -356,11 +356,13 @@ class PlayContext(Base): '' if self.become_method == 'sudo': - # Rather than detect if sudo wants a password this time, -k makes sudo always ask for - # a password if one is required. Passing a quoted compound command to sudo (or sudo -s) - # directly doesn't work, so we shellquote it with pipes.quote() and pass the quoted - # string to the user's shell. We loop reading output until we see the randomly-generated - # sudo prompt set with the -p option. + # If we have a password, we run sudo with a randomly-generated + # prompt set using -p. Otherwise we run it with -n, which makes + # it fail if it would have prompted for a password. + # + # Passing a quoted compound command to sudo (or sudo -s) + # directly doesn't work, so we shellquote it with pipes.quote() + # and pass the quoted string to the user's shell. # force quick error if password is required but not supplied, should prevent sudo hangs. if self.become_pass: From 8251ab2e377cdd657e175635982329a0a4eb90aa Mon Sep 17 00:00:00 2001 From: Abhijit Menon-Sen Date: Sat, 26 Sep 2015 17:32:13 +0530 Subject: [PATCH 2/2] Update outdated comment Since #12165 was merged, hostnames are properly validated. --- lib/ansible/inventory/ini.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ansible/inventory/ini.py b/lib/ansible/inventory/ini.py index f29a5f73ec..d7b28fde2e 100644 --- a/lib/ansible/inventory/ini.py +++ b/lib/ansible/inventory/ini.py @@ -352,8 +352,7 @@ class InventoryParser(object): # FIXME: What are the real restrictions on group names, or rather, what # should they be? At the moment, they must be non-empty sequences of non # whitespace characters excluding ':' and ']', but we should define more - # precise rules in order to support better diagnostics. The same applies - # to hostnames. It seems sensible for them both to follow DNS rules. + # precise rules in order to support better diagnostics. self.patterns['groupname'] = re.compile( r'''^