Supply our default authenticator by making the binding optional rather than by
binding the default in PresentsServer. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5165 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -62,7 +62,6 @@ public class PresentsServer
|
|||||||
bind(RunQueue.class).annotatedWith(EventQueue.class).to(PresentsDObjectMgr.class);
|
bind(RunQueue.class).annotatedWith(EventQueue.class).to(PresentsDObjectMgr.class);
|
||||||
bind(DObjectManager.class).to(PresentsDObjectMgr.class);
|
bind(DObjectManager.class).to(PresentsDObjectMgr.class);
|
||||||
bind(RootDObjectManager.class).to(PresentsDObjectMgr.class);
|
bind(RootDObjectManager.class).to(PresentsDObjectMgr.class);
|
||||||
bind(Authenticator.class).to(DummyAuthenticator.class);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ import com.threerings.presents.util.DatagramSequencer;
|
|||||||
|
|
||||||
import com.threerings.presents.server.Authenticator;
|
import com.threerings.presents.server.Authenticator;
|
||||||
import com.threerings.presents.server.ChainedAuthenticator;
|
import com.threerings.presents.server.ChainedAuthenticator;
|
||||||
|
import com.threerings.presents.server.DummyAuthenticator;
|
||||||
import com.threerings.presents.server.PresentsDObjectMgr;
|
import com.threerings.presents.server.PresentsDObjectMgr;
|
||||||
import com.threerings.presents.server.ReportManager;
|
import com.threerings.presents.server.ReportManager;
|
||||||
import com.threerings.presents.server.ShutdownManager;
|
import com.threerings.presents.server.ShutdownManager;
|
||||||
@@ -1052,7 +1053,7 @@ public class ConnectionManager extends LoopingThread
|
|||||||
/** Handles client authentication. The base authenticator is injected but optional services
|
/** Handles client authentication. The base authenticator is injected but optional services
|
||||||
* like the PeerManager may replace this authenticator with one that intercepts certain types
|
* like the PeerManager may replace this authenticator with one that intercepts certain types
|
||||||
* of authentication and then passes normal authentications through. */
|
* of authentication and then passes normal authentications through. */
|
||||||
@Inject protected Authenticator _author;
|
@Inject(optional=true) protected Authenticator _author = new DummyAuthenticator();
|
||||||
|
|
||||||
protected int[] _ports, _datagramPorts;
|
protected int[] _ports, _datagramPorts;
|
||||||
protected Selector _selector;
|
protected Selector _selector;
|
||||||
|
|||||||
Reference in New Issue
Block a user