enable %C token if both server and client support it

theoapp · Oct 9, 2023 · f08c366 · f08c366
1 parent 5e1402e
commit f08c366
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/tasks/sshd.yml b/tasks/sshd.yml
@@ -20,9 +20,14 @@
     - name: Set AuthorizedKeysCommand config snippet 2
       set_fact:
         theo_agent_sshd_authorized_keys_command_computed: "{{ theo_agent_sshd_authorized_keys_command_computed }} -fingerprint %f"
-      when: sshd_current_version is version('6.9', '>=')
+      when: sshd_current_version is version('6.9', '>=') and (sshd_current_version is version('9.4', '<') or theo_agent_version is version('0.16', '<')
 
     - name: Set AuthorizedKeysCommand config snippet 3
+      set_fact:
+        theo_agent_sshd_authorized_keys_command_computed: "{{ theo_agent_sshd_authorized_keys_command_computed }} -connection %C -fingerprint %f"
+      when: sshd_current_version is version('9.4', '>=') and theo_agent_version is version('0.16', '>=')
+
+    - name: Set AuthorizedKeysCommand config snippet 4
       set_fact:
         theo_agent_sshd_authorized_keys_command_computed: "{{ theo_agent_sshd_authorized_keys_command_computed }} %u"
       when: theo_agent_sshd_authorized_keys_command_computed != theo_agent_path