sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump reva to latest edge

Browse Source 
To get https://github.com/cs3org/reva/pull/4249

Fixes: #7469
This commit is contained in:
Ralf Haferkamp
2023-10-12 18:32:01 +02:00
committed by Ralf Haferkamp
parent 79a4e3d500
commit 2ea843b814
7 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/github.com/cs3org/reva/v2/pkg/trace/trace.go
Generated Vendored
+2
View File
@@ -85,6 +85,8 @@ func NewTracerProvider(opts ...Option) trace.TracerProvider {
// SetDefaultTracerProvider sets the default trace provider
func SetDefaultTracerProvider(tp trace.TracerProvider) {
otel.SetTracerProvider(tp)
defaultProvider.mutex.Lock()
defer defaultProvider.mutex.Unlock()
defaultProvider.initialized = true
}
vendor/github.com/cs3org/reva/v2/pkg/utils/ldap/identity.go
Generated Vendored
+2 -2
View File
@@ -526,7 +526,7 @@ func (i *Identity) getUserAttributeFilter(attribute, value string) (string, erro
default:
return "", errors.New("ldap: invalid field " + attribute)
}
if attribute == "userid" && i.User.Schema.IDIsOctetString {
if attribute == i.User.Schema.ID && i.User.Schema.IDIsOctetString {
id, err := uuid.Parse(value)
if err != nil {
err := errors.Wrap(err, fmt.Sprintf("error parsing OpaqueID '%s' as UUID", value))
@@ -687,7 +687,7 @@ func (i *Identity) getGroupAttributeFilter(attribute, value string) (string, err
default:
return "", errors.New("ldap: invalid field " + attribute)
}
if attribute == "group_id" && i.Group.Schema.IDIsOctetString {
if attribute == i.Group.Schema.ID && i.Group.Schema.IDIsOctetString {
id, err := uuid.Parse(value)
if err != nil {
err := errors.Wrap(err, fmt.Sprintf("error parsing OpaqueID '%s' as UUID", value))