ldap_utils.diff

   1 --- pdns-2.9.15.orig/modules/ldapbackend/utils.hh       Thu Oct 23 20:35:55 2003
   2 +++ pdns-2.9.15/modules/ldapbackend/utils.hh    Thu Feb 19 19:24:28 2004
   3 @@ -39,28 +39,34 @@
   4         parts.pop_back();
   5         parts.pop_back();
   6
   7 -       while( i < 3 && parts.size() > 1 )
   8 +       while( i < 3 && parts.size() > 1 && parts.back() == "0" )
   9         {
  10 -               if( parts.back() != "0" ) { ip += parts.back(); }
  11                 parts.pop_back();
  12                 i++;
  13         }
  14 -       ip += parts.back();
  15 -       parts.pop_back();
  16 +
  17 +       while( i++ < 4 && !parts.empty() )
  18 +       {
  19 +               ip += parts.back();
  20 +               parts.pop_back();
  21 +       }
  22
  23         while( !parts.empty() )
  24         {
  25                 i = 0;
  26                 ip += ":";
  27
  28 -               while( i < 3 && parts.size() > 1 )
  29 +               while( i < 3 && parts.size() > 1 && parts.back() == "0" )
  30                 {
  31 -                       if( parts.back() != "0" ) { ip += parts.back(); }
  32                         parts.pop_back();
  33                         i++;
  34                 }
  35 -               ip += parts.back();
  36 -               parts.pop_back();
  37 +
  38 +               while( i++ < 4 && !parts.empty() )
  39 +               {
  40 +                       ip += parts.back();
  41 +                       parts.pop_back();
  42 +               }
  43         }
  44
  45         return ip;