[SCM] NSS Wrapper Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  6ab6a09 nss_wrapper: Fix some "discarding const" warnings
       via  dbaad3a nss_wrapper: Align indentation with the rest of Samba
      from  7d26793 nwrap: Fall back to RTLD_NEXT if we can't find libc.

http://gitweb.samba.org/?p=nss_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6ab6a09feb599fbca4fd2886adfb9d1ec4f10ed7
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jun 21 10:48:56 2014 +0200

    nss_wrapper: Fix some "discarding const" warnings
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

commit dbaad3a1710bf1bf642c9dca46300e950d0c93e2
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jun 21 10:47:28 2014 +0200

    nss_wrapper: Align indentation with the rest of Samba
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 src/nss_wrapper.c |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/src/nss_wrapper.c b/src/nss_wrapper.c
index 6ed48c6..e3943ee 100644
--- a/src/nss_wrapper.c
+++ b/src/nss_wrapper.c
@@ -4049,24 +4049,24 @@ static int nwrap_getnameinfo(const struct sockaddr *sa, socklen_t salen,
 
 	type = sa->sa_family;
 	switch (type) {
-		case AF_INET:
-			if (salen < sizeof(struct sockaddr_in))
-				return EAI_FAMILY;
-			addr = &((struct sockaddr_in *)sa)->sin_addr;
-			addrlen = sizeof(((struct sockaddr_in *)sa)->sin_addr);
-			port = ntohs(((struct sockaddr_in *)sa)->sin_port);
-			break;
+	case AF_INET:
+		if (salen < sizeof(struct sockaddr_in))
+			return EAI_FAMILY;
+		addr = &((const struct sockaddr_in *)sa)->sin_addr;
+		addrlen = sizeof(((const struct sockaddr_in *)sa)->sin_addr);
+		port = ntohs(((const struct sockaddr_in *)sa)->sin_port);
+		break;
 #ifdef HAVE_IPV6
-		case AF_INET6:
-			if (salen < sizeof(struct sockaddr_in6))
-				return EAI_FAMILY;
-			addr = &((struct sockaddr_in6 *)sa)->sin6_addr;
-			addrlen = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
-			port = ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
-			break;
-#endif
-		default:
+	case AF_INET6:
+		if (salen < sizeof(struct sockaddr_in6))
 			return EAI_FAMILY;
+		addr = &((const struct sockaddr_in6 *)sa)->sin6_addr;
+		addrlen = sizeof(((const struct sockaddr_in6 *)sa)->sin6_addr);
+		port = ntohs(((const struct sockaddr_in6 *)sa)->sin6_port);
+		break;
+#endif
+	default:
+		return EAI_FAMILY;
 	}
 
 	if (host != NULL) {


-- 
NSS Wrapper Repository