don't call adjust_linklocal() since this function does not do anything.

this was part of a really big cleanup commit.

From brian FreeBSD

1 files changed, 5 insertions, 3 deletions

diff --git a/usr.sbin/ppp/ppp/ncpaddr.c b/usr.sbin/ppp/ppp/ncpaddr.c
index 05ef803c43e..ab80498d405 100644
--- a/usr.sbin/ppp/ppp/ncpaddr.c
+++ b/usr.sbin/ppp/ppp/ncpaddr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: ncpaddr.c,v 1.11 2005/07/12 01:28:10 brad Exp $
+ * $OpenBSD: ncpaddr.c,v 1.12 2005/07/17 20:42:03 brad Exp $
  */
 
 #include <sys/types.h>
@@ -159,11 +159,11 @@ mask62bits(const struct in6_addr *mask)
   return masklen;
 }
 
+#if 0
 static void
 adjust_linklocal(struct sockaddr_in6 *sin6)
 {
     /* XXX: ?????!?!?!!!!!  This is horrible ! */
-#if 0
     /*
      * The kernel does not understand sin6_scope_id for routing at this moment.
      * We should rather keep the embedded ID.
@@ -175,9 +175,9 @@ adjust_linklocal(struct sockaddr_in6 *sin6)
         ntohs(*(u_short *)&sin6->sin6_addr.s6_addr[2]);
       *(u_short *)&sin6->sin6_addr.s6_addr[2] = 0;
     }
-#endif
 }
 #endif
+#endif
 
 void
 ncpaddr_init(struct ncpaddr *addr)
@@ -385,7 +385,9 @@ ncpaddr_ntowa(const struct ncpaddr *addr)
     sin6.sin6_len = sizeof(sin6);
     sin6.sin6_family = AF_INET6;
     sin6.sin6_addr = addr->ncpaddr_ip6addr;
+#if 0
     adjust_linklocal(&sin6);
+#endif
     if (getnameinfo((struct sockaddr *)&sin6, sizeof sin6, res, sizeof(res),
                     NULL, 0, NI_NUMERICHOST) != 0)
       break;