Apply recv() hide patch from Martin

diff --git a/bacula/src/lib/bsockcore.c b/bacula/src/lib/bsockcore.c
index 2cda1f798647cf7b66ef1bee97fcfbcdd1bc61fb..9b68c1d8e0a2974289ceb3fa72d9b58163ceb4c9 100644 (file)
--- a/bacula/src/lib/bsockcore.c
+++ b/bacula/src/lib/bsockcore.c
@@ -590,7 +590,7 @@ bool BSOCKCORE::fsend(const char *fmt, ...)
  * Returns number of bytes read (may return zero), the msglen is set accordingly.
  * Returns -1 on error so msglen will be zero.
  */
-int32_t BSOCKCORE::recv(int len)
+int32_t BSOCKCORE::recvn(int len)
 {
    /* The method has to be redesigned from scratch */
    int32_t nbytes;

diff --git a/bacula/src/lib/bsockcore.h b/bacula/src/lib/bsockcore.h
index 695ad38d4c2e6ca29b228330209e954b699ab270..a9cba8519c6ecb4b5d29c93e45a2c1912cdec3d4 100644 (file)
--- a/bacula/src/lib/bsockcore.h
+++ b/bacula/src/lib/bsockcore.h
@@ -137,7 +137,7 @@ public:
    bool connect(JCR * jcr, int retry_interval, utime_t max_retry_time,
                 utime_t heart_beat, const char *name, char *host,
                 char *service, int port, int verbose);
-   virtual int32_t recv(int /*len*/);
+  virtual int32_t recvn(int /*len*/);
    virtual bool send();
    bool fsend(const char*, ...);
    void close();              /* close connection and destroy packet */