From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 31 Jul 2013 16:43:23 +0000 (+0200)
Subject: Merge commit 'f8e8fcfabeb206287065f48e800743b0aa797cc2' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e48b4bb4c7912d85296c3004c96c407248bb178;p=thirdparty%2Fbird.git

Merge commit 'f8e8fcfabeb206287065f48e800743b0aa797cc2' into integrated

Conflicts:

	conf/confbase.Y
---

4e48b4bb4c7912d85296c3004c96c407248bb178
diff --cc conf/confbase.Y
index bcee76d54,c6678e77d..7a9cfa615
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@@ -140,18 -138,12 +141,18 @@@ bool
   ;
  
  /* Addresses, prefixes and netmasks */
 +// XXXX check users
 +
 +ipa_raw:
 +   IP4 { $$ = ipa_from_ip4($1); }
 + | IP6 { $$ = ipa_from_ip6($1); }
 + ;
  
  ipa:
 -   IPA
 +   ipa_raw
   | SYM {
-      if ($1->class != SYM_IPA) cf_error("IP address expected");
-      $$ = *(ip_addr *)$1->def;
+      if ($1->class != (SYM_CONSTANT | T_IP)) cf_error("IP address expected");
+      $$ = SYM_VAL($1).px.ip;
     }
   ;
  
diff --cc sysdep/config.h
index 18423cdde,7bfb05d6d..218ab3bb6
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@@ -7,11 -7,8 +7,11 @@@
  #define _BIRD_CONFIG_H_
  
  /* BIRD version */
- #define BIRD_VERSION "1.3.10"
+ #define BIRD_VERSION "1.3.11"
  
 +// XXXX temporary define
 +#define IPV1 1
 +
  /* Include parameters determined by configure script */
  #include "sysdep/autoconf.h"