- Add missing #define for IPV6 found by Martin in address_conf.c

- Use strcasecmp() instead of strcmp() in address_conf.c

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

diff --git a/bacula/src/lib/address_conf.c b/bacula/src/lib/address_conf.c
index f67c4704342c6532a756995fbc2c5d6a639f3647..a1fe35a10cf7001f624ec2334532efd1a33627fd 100644 (file)
--- a/bacula/src/lib/address_conf.c
+++ b/bacula/src/lib/address_conf.c
@@ -44,9 +44,15 @@ IPADDR::IPADDR(const IPADDR &src) : type(src.type)
 
 IPADDR::IPADDR(int af) : type(R_EMPTY)
 {
+#ifdef HAVE_IPV6
   if (!(af  == AF_INET6 || af  == AF_INET)) {
-     Emsg1(M_ERROR_TERM, 0, _("Only ipv4 and ipv6 are supported(%d)\n"), af);
+     Emsg1(M_ERROR_TERM, 0, _("Only ipv4 and ipv6 are supported (%d)\n"), af);
+  }
+#else
+  if (af != AF_INET) {
+     Emsg1(M_ERROR_TERM, 0, _("Only ipv4 is supported (%d)\n"), af);
   }
+#endif
   saddr  = &saddrbuf.dontuse;
   saddr4 = &saddrbuf.dontuse4; 
 #ifdef HAVE_IPV6
@@ -391,11 +397,11 @@ void store_addresses(LEX * lc, RES_ITEM * item, int index, int pass)
       if (!(token == T_UNQUOTED_STRING || token == T_IDENTIFIER)) {
          scan_err1(lc, _("Expected a string, got: %s"), lc->str);
       }
-      if (strcmp("ip", lc->str) == 0 || strcmp("ipv4", lc->str) == 0) {
+      if (strcasecmp("ip", lc->str) == 0 || strcasecmp("ipv4", lc->str) == 0) {
         family = AF_INET;
       }
 #ifdef HAVE_IPV6
-      else if (strcmp("ipv6", lc->str) == 0) {
+      else if (strcasecmp("ipv6", lc->str) == 0) {
         family = AF_INET6;
       } else {
          scan_err1(lc, _("Expected a string [ip|ipv4|ipv6], got: %s"), lc->str);
@@ -420,13 +426,13 @@ void store_addresses(LEX * lc, RES_ITEM * item, int index, int pass)
         if (token != T_IDENTIFIER) {
             scan_err1(lc, _("Expected a identifier [addr|port], got: %s"), lc->str);
         }
-         if (strcmp("port", lc->str) == 0) {
+         if (strcasecmp("port", lc->str) == 0) {
            next_line = PORTLINE;
            if (exist & PORTLINE) {
                scan_err0(lc, _("Only one port per address block"));
            }
            exist |= PORTLINE;
-         } else if (strcmp("addr", lc->str) == 0) {
+         } else if (strcasecmp("addr", lc->str) == 0) {
            next_line = ADDRLINE;
            if (exist & ADDRLINE) {
                scan_err0(lc, _("Only one addr per address block"));

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 2f38b0dae04075b302a3805fd532b602c4215eda..406ebaafaa9cfbf4ccbc89f08efc936c0e6223e4 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.35.8"
-#define BDATE   "07 October 2004"
-#define LSMDATE "07Oct04"
+#define BDATE   "08 October 2004"
+#define LSMDATE "08Oct04"
 
 /* Debug flags */
 #undef  DEBUG