- Fix logic error in resolution of names on IPv4 systems.

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

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 72acd0411c4ee19e1ac6f9370fb6eecdd2fbc2bd..9f7b7306ff14c4e14bd8c86e17b4998e2800e1c5 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,4 +1,6 @@
 Changes to 1.35.2
+01Sep04
+- Fix logic error in resolution of names on IPv4 systems.
 30Aug04
 - Inhibit printing of FileSet for a restore as it is misleading.
 - Cleaned up a number of minor scripting problems with the CDROM

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index 1aa986dc8a34bcd9c98e825fdd2113ce7c6a503d..b840899197948bb349faf7be10550eb1b69e6910 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -20,6 +20,7 @@ Items to note!!!
 - Regular expressions are not implemented in the Win32 FD.
 
 Other Items:
+- Fix logic error in resolution of names on IPv4 systems.
 - Inhibit printing of FileSet for a restore as it is misleading.
 - Cleaned up a number of minor scripting problems with the CDROM
   creation.

diff --git a/bacula/src/lib/bnet.c b/bacula/src/lib/bnet.c
index 1cdd33520f1434f699b2a2b7f84223b3c076cb1a..ac65544ba82cdc4a1de78e5eef48b4e84536e3cd 100644 (file)
--- a/bacula/src/lib/bnet.c
+++ b/bacula/src/lib/bnet.c
@@ -637,19 +637,13 @@ dlist *bnet_host2ipaddrs(const char *host, int family, const char **errstr)
            return 0;
         }
       } else {
-        int done = 0;
         errmsg = resolv_host(AF_INET, host, addr_list);
 #ifdef HAVE_IPV6
         if (errmsg) {
            errmsg = resolv_host(AF_INET6, host, addr_list);
-           if (!errmsg) {
-              done = 1;
-           }
-        } else {  
-           done = 1;
         }
 #endif
-        if (!done) {
+        if (errmsg) {
            *errstr = errmsg;
            free_addresses(addr_list);
            return 0;
@@ -684,6 +678,8 @@ static BSOCK *bnet_open(JCR * jcr, const char *name, char *host, char *service,
       /* Note errstr is not malloc'ed */
       Qmsg2(jcr, M_ERROR, 0, "gethostbyname() for host \"%s\" failed: ERR=%s\n",
            host, errstr);
+      Dmsg2(100, "bnet_host2ipaddrs() for host %s failed: ERR=%s\n",
+           host, errstr);
       *fatal = 1;
       return NULL;
    }

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 56b7e9019ae323a2550b0057bd93f0551228e58d..e094337fdf5fac8071c5daf5ddec836fd34aa034 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.35.2"
-#define BDATE   "30 August 2004"
-#define LSMDATE "30Aug04"
+#define BDATE   "01 September 2004"
+#define LSMDATE "01Sep04"
 
 /* Debug flags */
 #undef  DEBUG