1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-09 01:55:24 +02:00

Bug 158756 - suppress the showing of the signon prompt for windows since we don't validate at the target end.

This commit is contained in:
David Dykstal 2006-11-07 19:46:37 +00:00
parent 1a8ea54117
commit b8a078229a

View file

@ -55,6 +55,7 @@ import org.eclipse.rse.core.subsystems.CommunicationsEvent;
import org.eclipse.rse.core.subsystems.IRemoteServerLauncher; import org.eclipse.rse.core.subsystems.IRemoteServerLauncher;
import org.eclipse.rse.core.subsystems.IServerLauncher; import org.eclipse.rse.core.subsystems.IServerLauncher;
import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ServerLaunchType; import org.eclipse.rse.core.subsystems.ServerLaunchType;
import org.eclipse.rse.core.subsystems.SubSystem; import org.eclipse.rse.core.subsystems.SubSystem;
import org.eclipse.rse.dstore.universal.miners.environment.EnvironmentMiner; import org.eclipse.rse.dstore.universal.miners.environment.EnvironmentMiner;
@ -292,7 +293,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
} }
/** /**
* @see org.eclipse.rse.core.subsystems.IConnectorService#disconnect() * @see org.eclipse.rse.core.subsystems.IConnectorService#disconnect(IProgressMonitor)
*/ */
public void internalDisconnect(IProgressMonitor monitor) throws Exception public void internalDisconnect(IProgressMonitor monitor) throws Exception
{ {
@ -1253,33 +1254,33 @@ public class DStoreConnectorService extends AbstractConnectorService implements
/** /**
* @see org.eclipse.rse.core.subsystems.AbstractConnectorService#getPasswordInformation() * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#getPasswordInformation()
*/ */
public SystemSignonInformation getPasswordInformation() // public SystemSignonInformation getPasswordInformation()
{ // {
// For Windows we want to avoid the signon prompt (because we never // // For Windows we want to avoid the signon prompt (because we never
// really authenticate with the remote system and this would be decieving // // really authenticate with the remote system and this would be deceiving
// for the end user // // for the end user
//
if (getPrimarySubSystem().getHost().getSystemType().equals(IRSESystemType.SYSTEMTYPE_WINDOWS)) // if (getPrimarySubSystem().getHost().getSystemType().equals(IRSESystemType.SYSTEMTYPE_WINDOWS))
{ // {
String userid = getPrimarySubSystem().getUserId(); // String userid = getPrimarySubSystem().getUserId();
if (userid == null) // if (userid == null)
{ // {
userid = "remoteuser"; //$NON-NLS-1$ // userid = "remoteuser"; //$NON-NLS-1$
} // }
SystemSignonInformation info = new SystemSignonInformation(getPrimarySubSystem().getHost().getHostName(), // SystemSignonInformation info = new SystemSignonInformation(getPrimarySubSystem().getHost().getHostName(),
userid, "", IRSESystemType.SYSTEMTYPE_WINDOWS); //$NON-NLS-1$ // userid, "", IRSESystemType.SYSTEMTYPE_WINDOWS); //$NON-NLS-1$
return info; // return info;
} // }
else // else
{ // {
return super.getPasswordInformation(); // return super.getPasswordInformation();
} // }
} // }
/** /**
* @see org.eclipse.rse.core.subsystems.AbstractConnectorService#isPasswordCached() * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#isPasswordCached()
*/ */
// public boolean isPasswordCached() // DWD is this method needed? // public boolean isPasswordCached()
// { // {
// // For Windows we never prompt for userid / password so we don't need // // For Windows we never prompt for userid / password so we don't need
// // to clear the password cache // // to clear the password cache
@ -1293,10 +1294,6 @@ public class DStoreConnectorService extends AbstractConnectorService implements
// } // }
// } // }
public boolean hasRemoteServerLauncherProperties() public boolean hasRemoteServerLauncherProperties()
{ {
return getRemoteServerLauncherProperties() != null; return getRemoteServerLauncherProperties() != null;
@ -1317,13 +1314,30 @@ public class DStoreConnectorService extends AbstractConnectorService implements
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.rse.core.subsystems.AbstractConnectorService#requiresPassword() * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsPassword()
*/ */
public boolean requiresPassword() { public boolean supportsPassword() {
boolean result = super.supportsPassword();
IHost host = getHost(); IHost host = getHost();
String systemType = host.getSystemType(); String systemType = host.getSystemType();
boolean requiresPassword = !systemType.equals("Windows"); if (systemType.equals(IRSESystemType.SYSTEMTYPE_WINDOWS)) {
return requiresPassword; result = false;
}
return result;
} }
/* (non-Javadoc)
* @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsUserid()
*/
public boolean supportsUserId() {
boolean result = super.supportsUserId();
IHost host = getHost();
String systemType = host.getSystemType();
if (systemType.equals(IRSESystemType.SYSTEMTYPE_WINDOWS)) {
result = false;
}
return result;
}
} }