[net] deprecate TSocket::CreateAuthSocket()

Author: jblomer

net/net/inc/TSocket.h

@@ -42,6 +42,12 @@ struct TSocketFriend {
    static Bool_t IsAuthenticated(const TSocket &s);
    static void SetSecContext(TSocket &s, TSecContext *ctx);
    static TSecContext *GetSecContext(const TSocket &s);
+
+   static TSocket *CreateAuthSocket(const char *user, const char *host,
+                                    Int_t port, Int_t size = 0,
+                                    Int_t tcpwindowsize = -1, TSocket *s = nullptr, Int_t *err = nullptr);
+   static TSocket *CreateAuthSocket(const char *url, Int_t size = 0,
+                                    Int_t tcpwindowsize = -1, TSocket *s = nullptr, Int_t *err = nullptr);
 };
 } // namespace ROOT::Deprecated
 
@@ -183,9 +189,15 @@ friend struct ROOT::Deprecated::TSocketFriend;
 
    static TSocket       *CreateAuthSocket(const char *user, const char *host,
                                           Int_t port, Int_t size = 0,
-                                          Int_t tcpwindowsize = -1, TSocket *s = nullptr, Int_t *err = nullptr);
+                                          Int_t tcpwindowsize = -1, TSocket *s = nullptr, Int_t *err = nullptr)
+                        R__DEPRECATED(6, 42, "Socket authentication is deprecated. See README.AUTH for details.")
+                        { return ROOT::Deprecated::TSocketFriend::CreateAuthSocket(
+                           user, host, port, size, tcpwindowsize, s, err); }
    static TSocket       *CreateAuthSocket(const char *url, Int_t size = 0,
-                                          Int_t tcpwindowsize = -1, TSocket *s = nullptr, Int_t *err = nullptr);
+                                          Int_t tcpwindowsize = -1, TSocket *s = nullptr, Int_t *err = nullptr)
+                        R__DEPRECATED(6, 42, "Socket authentication is deprecated. See README.AUTH for details.")
+                        { return ROOT::Deprecated::TSocketFriend::CreateAuthSocket(url, size, tcpwindowsize, s, err); }
+
    static void           NetError(const char *where, Int_t error);
 
    ClassDefOverride(TSocket,0)  //This class implements client sockets

net/net/src/TFTP.cxx

@@ -102,7 +102,7 @@ void ROOT::Deprecated::TFTP::Init(const char *surl, Int_t par, Int_t wsize)
    }
    hurl += TString(Form("://%s@%s:%d",
                         url.GetUser(), url.GetHost(), url.GetPort()));
-   fSocket = TSocket::CreateAuthSocket(hurl, par, wsize, fSocket);
+   fSocket = ROOT::Deprecated::TSocketFriend::CreateAuthSocket(hurl, par, wsize, fSocket);
    if (!fSocket || !ROOT::Deprecated::TSocketFriend::IsAuthenticated(*fSocket)) {
       if (par > 1)
          Error("TFTP", "can't open %d-stream connection to rootd on "

net/net/src/TNetFile.cxx

@@ -582,7 +582,7 @@ void ROOT::Deprecated::TNetFile::ConnectServer(Int_t *stat, EMessageTypes *kind,
    }
    url += TString(Form("://%s@%s:%d",
                        fUrl.GetUser(), fUrl.GetHost(), fUrl.GetPort()));
-   fSocket = TSocket::CreateAuthSocket(url, sSize, tcpwindowsize, fSocket, stat);
+   fSocket = ROOT::Deprecated::TSocketFriend::CreateAuthSocket(url, sSize, tcpwindowsize, fSocket, stat);
    if (!fSocket || (fSocket && !ROOT::Deprecated::TSocketFriend::IsAuthenticated(*fSocket))) {
       if (sSize > 1)
          Error("TNetFile", "can't open %d-stream connection to rootd on "

net/net/src/TSocket.cxx

@@ -1291,8 +1291,8 @@ Bool_t TSocket::Authenticate(const char *user)
 /// Returns pointer to an authenticated socket or 0 if creation or
 /// authentication is unsuccessful.
 
-TSocket *TSocket::CreateAuthSocket(const char *url, Int_t size, Int_t tcpwindowsize,
-                                   TSocket *opensock, Int_t *err)
+TSocket *ROOT::Deprecated::TSocketFriend::CreateAuthSocket(
+   const char *url, Int_t size, Int_t tcpwindowsize, TSocket *opensock, Int_t *err)
 {
    R__LOCKGUARD2(gSocketAuthMutex);
 
@@ -1428,9 +1428,8 @@ TSocket *TSocket::CreateAuthSocket(const char *url, Int_t size, Int_t tcpwindows
 /// Returns pointer to an authenticated socket or 0 if creation or
 /// authentication is unsuccessful.
 
-TSocket *TSocket::CreateAuthSocket(const char *user, const char *url,
-                                   Int_t port, Int_t size, Int_t tcpwindowsize,
-                                   TSocket *opensock, Int_t *err)
+TSocket *ROOT::Deprecated::TSocketFriend::CreateAuthSocket(
+   const char *user, const char *url, Int_t port, Int_t size, Int_t tcpwindowsize, TSocket *opensock, Int_t *err)
 {
    R__LOCKGUARD2(gSocketAuthMutex);
 
@@ -1459,7 +1458,7 @@ TSocket *TSocket::CreateAuthSocket(const char *user, const char *url,
    }
 
    // Create the socket and return it
-   return TSocket::CreateAuthSocket(eurl,size,tcpwindowsize,opensock,err);
+   return TSocketFriend::CreateAuthSocket(eurl,size,tcpwindowsize,opensock,err);
 }
 
 ////////////////////////////////////////////////////////////////////////////////