@@ -9,6 +9,5 @@ import (

 // AuthenticateToRegistry checks the validity of credentials in authConfig

 func (daemon *Daemon) AuthenticateToRegistry(ctx context.Context, authConfig *registry.AuthConfig) (string, error) {

-	_, token, err := daemon.registryService.Auth(ctx, authConfig, dockerversion.DockerUserAgent(ctx))

-	return token, err

+	return daemon.registryService.Auth(ctx, authConfig, dockerversion.DockerUserAgent(ctx))

 }

@@ -56,7 +56,7 @@ func (s *Service) ReplaceConfig(options ServiceOptions) (commit func(), _ error)

 // Auth contacts the public registry with the provided credentials,

 // and returns OK if authentication was successful.

 // It can be used to verify the validity of a client's credentials.

-func (s *Service) Auth(ctx context.Context, authConfig *registry.AuthConfig, userAgent string) (statusMessage, token string, _ error) {

+func (s *Service) Auth(ctx context.Context, authConfig *registry.AuthConfig, userAgent string) (token string, _ error) {

 	// TODO Use ctx when searching for repositories

 	registryHostName := IndexHostname

@@ -67,7 +67,7 @@ func (s *Service) Auth(ctx context.Context, authConfig *registry.AuthConfig, use

 		}

 		u, err := url.Parse(serverAddress)

 		if err != nil {

-			return "", "", invalidParamWrapf(err, "unable to parse server address")

+			return "", invalidParamWrapf(err, "unable to parse server address")

 		}

 		registryHostName = u.Host

 	}

@@ -79,9 +79,9 @@ func (s *Service) Auth(ctx context.Context, authConfig *registry.AuthConfig, use

 	s.mu.RUnlock()

 	if err != nil {

 		if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {

-			return "", "", err

+			return "", err

 		}

-		return "", "", invalidParam(err)

+		return "", invalidParam(err)

 	}

 	var lastErr error

@@ -90,7 +90,7 @@ func (s *Service) Auth(ctx context.Context, authConfig *registry.AuthConfig, use

 		if err != nil {

 			if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) || cerrdefs.IsUnauthorized(err) {

 				// Failed to authenticate; don't continue with (non-TLS) endpoints.

-				return "", "", err

+				return "", err

 			}

 			// Try next endpoint

 			log.G(ctx).WithFields(log.Fields{

@@ -101,11 +101,10 @@ func (s *Service) Auth(ctx context.Context, authConfig *registry.AuthConfig, use

 			continue

 		}

-		// TODO(thaJeztah): move the statusMessage to the API endpoint; we don't need to produce that here?

-		return "Login Succeeded", authToken, nil

+		return authToken, nil

 	}

-	return "", "", lastErr

+	return "", lastErr

 }

 // ResolveAuthConfig looks up authentication for the given reference from the