From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 30 Mar 2004 06:32:31 +0000 (-0500)
Subject: gen_uuid.c (get_node_id): Clean up AF_LINK #ifdef's for Darwin.
X-Git-Tag: APPLE_UUID_SNAP_1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13be1fff0009465741845a785fa4aff153ec20d9;p=thirdparty%2Fe2fsprogs.git

gen_uuid.c (get_node_id): Clean up AF_LINK #ifdef's for Darwin.
---

diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index 7a043a1f5..1529cc3c9 100644
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-30  Theodore Ts'o  <tytso@mit.edu>
+
+	* gen_uuid.c (get_node_id): Clean up AF_LINK #ifdef's for Darwin.
+
 2004-03-22  Theodore Ts'o  <tytso@mit.edu>
 
 	* unparse.c (uuid_unparse_lower, uuid_unparse_upper),
diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c
index 4ddb8fb25..b58485bab 100644
--- a/lib/uuid/gen_uuid.c
+++ b/lib/uuid/gen_uuid.c
@@ -143,7 +143,7 @@ static int get_node_id(unsigned char *node_id)
 	char buf[1024];
 	int		n, i;
 	unsigned char 	*a;
-#if defined(HAVE_NET_IF_DL_H) && defined(AF_LINK)
+#ifdef AF_LINK
 	struct sockaddr_dl *sdlp;
 #endif
 
@@ -188,9 +188,9 @@ static int get_node_id(unsigned char *node_id)
 			continue;
 		a = (unsigned char *) ifr.ifr_enaddr;
 #else
-#if defined(HAVE_NET_IF_DL_H) && defined(AF_LINK)
+#ifdef AF_LINK
 		sdlp = (struct sockaddr_dl *) &ifrp->ifr_addr;
-		if ((sdlp->sdl_family != AF_LINK) || (sdlp->sdl_alen < 6))
+		if ((sdlp->sdl_family != AF_LINK) || (sdlp->sdl_alen != 6))
 			continue;
 		a = (unsigned char *) &sdlp->sdl_data[sdlp->sdl_nlen];
 #else
@@ -200,7 +200,7 @@ static int get_node_id(unsigned char *node_id)
 		 */
 		close(sd);
 		return 0;
-#endif /* HAVE_NET_IF_DL_H && AF_LINK */
+#endif /* AF_LINK */
 #endif /* SIOCGENADDR */
 #endif /* SIOCGIFHWADDR */
 		if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5])