Apply Meno's bnet.c patch and enable SMARTALLOC in IPADDR

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1520 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/lib/address_conf.h b/bacula/src/lib/address_conf.h
index 67f731ffbf404b439e6f505a48e40d535cc7f76d..27df19ed9d9ff77e83f694672635670256e5be03 100644 (file)
--- a/bacula/src/lib/address_conf.h
+++ b/bacula/src/lib/address_conf.h
@@ -26,8 +26,8 @@
  */
 
 
-//class IPADDR : public SMARTALLOC {
-class IPADDR {
+class IPADDR : public SMARTALLOC {
+// class IPADDR {
  public:
    typedef enum { R_SINGLE, R_SINGLE_PORT, R_SINGLE_ADDR, R_MULTIPLE,
                   R_DEFAULT, R_EMPTY

diff --git a/bacula/src/lib/bnet.c b/bacula/src/lib/bnet.c
index 9994facfac32a0585d7d94fa26c57812ce6bb4fa..9d52383d72fc4e8820d5776e73064defcdbeeab5 100644 (file)
--- a/bacula/src/lib/bnet.c
+++ b/bacula/src/lib/bnet.c
@@ -705,12 +705,14 @@ static BSOCK *bnet_open(JCR * jcr, const char *name, char *host, char *service,
       break;
    }
 
-   free_addresses(addr_list);
    if (!connected) {
+         free_addresses(addr_list);
       errno = save_errno;
       return NULL;
    }
-   return init_bsock(jcr, sockfd, name, host, port, ipaddr->get_sockaddr());
+   BSOCK* ret =  init_bsock(jcr, sockfd, name, host, port, ipaddr->get_sockaddr());
+   free_addresses(addr_list);
+   return ret;
 }
 
 /*

diff --git a/bacula/src/lib/smartall.h b/bacula/src/lib/smartall.h
index 381bfcef2f56360f471c1d7785a40970888ff567..82685a3e76435081b9b47b3e6c3a7eb7e43c1f0d 100644 (file)
--- a/bacula/src/lib/smartall.h
+++ b/bacula/src/lib/smartall.h
@@ -89,8 +89,8 @@ extern void *b_malloc();
 
 #endif
 
-//#ifdef SMARTALLOC
-#ifdef xxx
+#ifdef SMARTALLOC
+// #ifdef xxx
 
 #define New(type) new(__FILE__, __LINE__) type
 
@@ -118,8 +118,8 @@ void  operator delete[](void *ptr, size_t i)
 }
 
 private:
-//void *operator new(size_t s) throw() { return 0; }
-//void *operator new[](size_t s) throw() { return 0; }
+void *operator new(size_t s) throw() { return 0; }
+void *operator new[](size_t s) throw() { return 0; }
 };
  
 

diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c
index 8e5725adeb14614090534fb71a64f0f706f12743..e4d14291916a2d2ed0ed9e0ad79faa2fd7d831de 100644 (file)
--- a/bacula/src/stored/block.c
+++ b/bacula/src/stored/block.c
@@ -738,8 +738,8 @@ reread:
       }
    } while (stat == -1 && (errno == EINTR || errno == EIO) && retry++ < 11);
    if (stat < 0) {
-      Dmsg1(90, "Read device got: ERR=%s\n", strerror(errno));
       clrerror_dev(dev, -1);
+      Dmsg1(90, "Read device got: ERR=%s\n", strerror(errno));
       block->read_len = 0;
       Mmsg4(&dev->errmsg, _("Read error at file:blk %u:%u on device %s. ERR=%s.\n"), 
         dev->file, dev->block_num, dev->dev_name, strerror(dev->dev_errno));