Skip to content
Snippets Groups Projects
Commit ad08cd8d authored by Josh Brooks's avatar Josh Brooks
Browse files

Remove UnsetAlternativeUserDiscovery call

parent 95f96c9e
No related branches found
No related tags found
2 merge requests!510Release,!323Xx 4019/new or load alt ud
...@@ -314,13 +314,6 @@ func (ud *UserDiscovery) RemoveFact(factJson []byte) error { ...@@ -314,13 +314,6 @@ func (ud *UserDiscovery) RemoveFact(factJson []byte) error {
return ud.api.RemoveFact(f) return ud.api.RemoveFact(f)
} }
// UnsetAlternativeUserDiscovery clears out the information from the Manager
// object.
// todo: should this be removed as well?
func (ud *UserDiscovery) UnsetAlternativeUserDiscovery() error {
return ud.api.UnsetAlternativeUserDiscovery()
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// User Discovery Lookup // // User Discovery Lookup //
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
......
...@@ -51,17 +51,3 @@ func (m *Manager) setAlternateUserDiscovery(altCert, altAddress, ...@@ -51,17 +51,3 @@ func (m *Manager) setAlternateUserDiscovery(altCert, altAddress,
return nil return nil
} }
// UnsetAlternativeUserDiscovery clears out the information from
// the Manager object.
// fixme: I think this should be removed to avoid creating a Manager object
// which has never been registered to production, and can't be w/o exporting
// the Manger.register method.
func (m *Manager) UnsetAlternativeUserDiscovery() error {
if m.alternativeUd == nil {
return errors.New("Alternative User Discovery is already unset.")
}
m.alternativeUd = nil
return nil
}
...@@ -17,7 +17,7 @@ import ( ...@@ -17,7 +17,7 @@ import (
func (m *Manager) register(username string, networkSignature []byte, func (m *Manager) register(username string, networkSignature []byte,
rng csprng.Source, comm registerUserComms) error { rng csprng.Source, comm registerUserComms) error {
// Initialize/Get host // Initialize or get host
udHost, err := m.getOrAddUdHost() udHost, err := m.getOrAddUdHost()
if err != nil { if err != nil {
return errors.WithMessage(err, return errors.WithMessage(err,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment