$NetBSD: patch-dk,v 1.1 2007/12/31 09:15:15 spz Exp $

--- src/RtConfig/f_junos.cc.orig	2006-10-01 13:23:32.000000000 +0200
+++ src/RtConfig/f_junos.cc
@@ -811,6 +811,9 @@ int JunosConfig::print(NormalExpression 
 
    Debug(Channel(DBG_JUNOS) << "# ne: " << *ne << "\n");
 
+   if (ne->is_any() != NEITHER)
+      cerr << "Warning: filter matches ANY/NOT ANY" << endl;
+
    if (ne->isEmpty()) 
       return last;
 
@@ -916,11 +919,13 @@ bool JunosConfig::printNeighbor(int impo
       setMEDtoIGP = false;
    }
 
+#ifdef notdef
    if (afi_activate) {
 	  cout << "            family " << (AddressFamily &) *filter_afi << " { "<< endl;
 	  cout << "                any;" << endl;
 	  cout << "            } " << endl;
    }
+#endif
 
    cout << "         }\n"
 	<< "      }\n"
@@ -1019,7 +1024,9 @@ void JunosConfig::importP(ASt asno, MPPr
       return;
     }
 
+#ifdef notdef
    int preAclID = prefixMgr.lastID();
+#endif
    // get matching import attributes
    AutNumSelector<AttrImport> itr(autnum, "import", 
 				  NULL, peerAS, peer_addr, addr);
@@ -1074,7 +1081,7 @@ void JunosConfig::importP(ASt asno, MPPr
 
    ItemAFI *peer_afi = new ItemAFI(peer_addr->get_afi());
 
-   printNeighbor(IMPORT, asno, peerAS, peer_addr->get_text(), false, (ItemAFI *) peer_afi, (ItemAFI *) afi_list);
+   printNeighbor(IMPORT, asno, peerAS, peer_addr->get_ip_text(), false, (ItemAFI *) peer_afi, (ItemAFI *) afi_list);
 }
 
 void JunosConfig::static2bgp(ASt asno, MPPrefix *addr) {