Sophie

Sophie

distrib > Mageia > cauldron > x86_64 > by-pkgid > b9c5cb7fdac8909981b146063e0ad8cf > files > 3

apache-sshd-2.1.0-1.mga7.src.rpm

--- sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java.orig	2018-11-29 23:39:24.581254624 +0000
+++ sshd-core/src/main/java/org/apache/sshd/agent/local/ProxyAgentFactory.java	2018-11-29 23:41:15.823913619 +0000
@@ -27,8 +27,6 @@
 import org.apache.sshd.agent.SshAgent;
 import org.apache.sshd.agent.SshAgentFactory;
 import org.apache.sshd.agent.SshAgentServer;
-import org.apache.sshd.agent.unix.AprLibrary;
-import org.apache.sshd.agent.unix.UnixAgentFactory;
 import org.apache.sshd.common.FactoryManager;
 import org.apache.sshd.common.NamedFactory;
 import org.apache.sshd.common.PropertyResolver;
@@ -53,9 +51,7 @@
 
     @Override
     public List<NamedFactory<Channel>> getChannelForwardingFactories(FactoryManager manager) {
-        return isPreferredUnixAgent(manager)
-            ? UnixAgentFactory.DEFAULT_FORWARDING_CHANNELS
-            : LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS;
+        return LocalAgentFactory.DEFAULT_FORWARDING_CHANNELS;
     }
 
     @Override
@@ -106,16 +102,6 @@
     }
 
     public static boolean isPreferredUnixAgent(PropertyResolver resolver) {
-        if (PropertyResolverUtils.getBooleanProperty(resolver, PREFER_UNIX_AGENT, OsUtils.isUNIX())) {
-            try {
-                if (AprLibrary.getInstance() != null) {
-                    return true;
-                }
-            } catch (Exception ignore) {
-                // ignored
-            }
-        }
-
         return false;
     }
 }