Andreas Wacknitz
2023-08-14 e2f9e102c7c197563cb81df38d8afa2dae23e95c
openssh: import fixed pubkey patch from OmniOS

2 files modified
3 ■■■■ changed files
components/network/openssh/Makefile 1 ●●●● patch | view | raw | blame | history
components/network/openssh/patches/0019-PubKeyPlugin-support.patch 2 ●●● patch | view | raw | blame | history
components/network/openssh/Makefile
@@ -33,6 +33,7 @@
#   OpenSSH <x>.<y>.<z>p<n> => IPS <x>.<y>.<z>.<n>
COMPONENT_VERSION=    9.4.0.1
HUMAN_VERSION=        9.4p1
COMPONENT_REVISION=    1
COMPONENT_SUMMARY=    OpenSSH client and associated utilities
COMPONENT_SRC=        $(COMPONENT_NAME)-$(HUMAN_VERSION)
COMPONENT_PROJECT_URL=    https://www.openssh.org
components/network/openssh/patches/0019-PubKeyPlugin-support.patch
@@ -183,7 +183,7 @@
 
+    success = user_key_allowed_from_plugin(pw, key);
+    if (success > 0)
+        return success;
+        goto out;
+
     if ((success = user_key_command_allowed2(pw, key, remote_ip,
         remote_host, conn_id, rdomain, &opts)) != 0)