Merge branch 'master' into security-md

linka-cloud · Jan 5, 2020 · 53ae0a9 · 53ae0a9
2 parents e4ef0d6 + f41212d
commit 53ae0a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -143,4 +143,4 @@ Thanks to:
 See [LICENSE](LICENSE) file.
 
 
-[SecretService]: https://standards.freedesktop.org/secret-service/
+[SecretService]: https://specifications.freedesktop.org/secret-service/latest/
diff --git a/secret_service/secret_service.go b/secret_service/secret_service.go
@@ -121,7 +121,7 @@ func (s *SecretService) Unlock(collection dbus.ObjectPath) error {
 		unlocked = append(unlocked, c...)
 	}
 
-	if len(unlocked) != 1 || unlocked[0] != collection {
+	if len(unlocked) != 1 || (collection != loginCollectionAlias && unlocked[0] != collection) {
 		return fmt.Errorf("failed to unlock correct collection '%v'", collection)
 	}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -143,4 +143,4 @@ Thanks to:
		See [LICENSE](LICENSE) file.


		[SecretService]: https://standards.freedesktop.org/secret-service/
		[SecretService]: https://specifications.freedesktop.org/secret-service/latest/