From 49db85d820a30de2e94b933747fe12f9916ff723 Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <rhaferkamp@owncloud.com>
Date: Wed, 22 Nov 2023 13:16:33 +0100
Subject: [PATCH] Bump reva to latest edge

---
 go.mod                                        |  2 +-
 go.sum                                        |  4 ++--
 .../reva/v2/pkg/utils/ldap/reconnect.go       | 19 +++++++++++++++++++
 vendor/modules.txt                            |  2 +-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index 54109ca21..aa611c345 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/coreos/go-oidc/v3 v3.7.0
 	github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781
-	github.com/cs3org/reva/v2 v2.16.1-0.20231122103032-e6cbb1241c54
+	github.com/cs3org/reva/v2 v2.16.1-0.20231122120948-0b4c31a518f7
 	github.com/dhowden/tag v0.0.0-20230630033851-978a0926ee25
 	github.com/disintegration/imaging v1.6.2
 	github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e
diff --git a/go.sum b/go.sum
index e279f5c69..d2c2651ae 100644
--- a/go.sum
+++ b/go.sum
@@ -1013,8 +1013,8 @@ github.com/crewjam/saml v0.4.14 h1:g9FBNx62osKusnFzs3QTN5L9CVA/Egfgm+stJShzw/c=
 github.com/crewjam/saml v0.4.14/go.mod h1:UVSZCf18jJkk6GpWNVqcyQJMD5HsRugBPf4I1nl2mME=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781 h1:BUdwkIlf8IS2FasrrPg8gGPHQPOrQ18MS1Oew2tmGtY=
 github.com/cs3org/go-cs3apis v0.0.0-20231023073225-7748710e0781/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.16.1-0.20231122103032-e6cbb1241c54 h1:oavpeTAA3FN0yKpgZHxY93Wry+7w5fRzcPH3EVcilmg=
-github.com/cs3org/reva/v2 v2.16.1-0.20231122103032-e6cbb1241c54/go.mod h1:utPCNSrWDdAwz2biLrKvzO6nDH9L7vRVGNzof13r8Kw=
+github.com/cs3org/reva/v2 v2.16.1-0.20231122120948-0b4c31a518f7 h1:PXQMMy6BW7HTJXb4+nyNRC7E+dr/zRg2lwjc4n09ouM=
+github.com/cs3org/reva/v2 v2.16.1-0.20231122120948-0b4c31a518f7/go.mod h1:zcrrYVsBv/DwhpyO2/W5hoSZ/k6az6Z2EYQok65uqZY=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
diff --git a/vendor/github.com/cs3org/reva/v2/pkg/utils/ldap/reconnect.go b/vendor/github.com/cs3org/reva/v2/pkg/utils/ldap/reconnect.go
index 7bf2b7f07..dc0c8a8d0 100644
--- a/vendor/github.com/cs3org/reva/v2/pkg/utils/ldap/reconnect.go
+++ b/vendor/github.com/cs3org/reva/v2/pkg/utils/ldap/reconnect.go
@@ -22,6 +22,7 @@ package ldap
 // https://gist.github.com/emsearcy/cba3295d1a06d4c432ab4f6173b65e4f#file-ldap_snippet-go
 
 import (
+	"context"
 	"crypto/tls"
 	"errors"
 	"fmt"
@@ -306,6 +307,12 @@ func (c *ConnWithReconnect) SearchWithPaging(searchRequest *ldap.SearchRequest,
 	return nil, ldap.NewError(ldap.LDAPResultNotSupported, fmt.Errorf("not implemented"))
 }
 
+// SearchAsync implements the ldap.Client interface
+func (c *ConnWithReconnect) SearchAsync(ctx context.Context, searchRequest *ldap.SearchRequest, bufferSize int) ldap.Response {
+	// unimplemented
+	return nil
+}
+
 // NTLMUnauthenticatedBind implements the ldap.Client interface
 func (c *ConnWithReconnect) NTLMUnauthenticatedBind(domain, username string) error {
 	return ldap.NewError(ldap.LDAPResultNotSupported, fmt.Errorf("not implemented"))
@@ -325,3 +332,15 @@ func (c *ConnWithReconnect) Unbind() error {
 func (c *ConnWithReconnect) DirSync(searchRequest *ldap.SearchRequest, flags, maxAttrCount int64, cookie []byte) (*ldap.SearchResult, error) {
 	return nil, ldap.NewError(ldap.LDAPResultNotSupported, fmt.Errorf("not implemented"))
 }
+
+// DirSyncAsync implements the ldap.Client interface
+func (c *ConnWithReconnect) DirSyncAsync(ctx context.Context, searchRequest *ldap.SearchRequest, bufferSize int, flags, maxAttrCount int64, cookie []byte) ldap.Response {
+	// unimplemented
+	return nil
+}
+
+// Syncrepl implements the ldap.Client interface
+func (c *ConnWithReconnect) Syncrepl(ctx context.Context, searchRequest *ldap.SearchRequest, bufferSize int, mode ldap.ControlSyncRequestMode, cookie []byte, reloadHint bool) ldap.Response {
+	// unimplemented
+	return nil
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 8591cd8c3..2ab45bf09 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -357,7 +357,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1
 github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1
 github.com/cs3org/go-cs3apis/cs3/tx/v1beta1
 github.com/cs3org/go-cs3apis/cs3/types/v1beta1
-# github.com/cs3org/reva/v2 v2.16.1-0.20231122103032-e6cbb1241c54
+# github.com/cs3org/reva/v2 v2.16.1-0.20231122120948-0b4c31a518f7
 ## explicit; go 1.20
 github.com/cs3org/reva/v2/cmd/revad/internal/grace
 github.com/cs3org/reva/v2/cmd/revad/runtime