Index: usr.sbin/nscd/debug.h
===================================================================
--- usr.sbin/nscd/debug.h
+++ usr.sbin/nscd/debug.h
@@ -31,8 +31,7 @@
 
 #define TRACE_WANTED 32
 
-/* #ifndef NDEBUG */
-#if 0
+#ifndef NDEBUG
 #define TRACE_IN(x)	nscd_trace_in(#x, __FILE__, __LINE__)
 #define TRACE_POINT()	nscd_trace_point(__FILE__, __LINE__)
 #define TRACE_MSG(x)	nscd_trace_msg(x, __FILE__, __LINE__)
Index: usr.sbin/nscd/debug.c
===================================================================
--- usr.sbin/nscd/debug.c
+++ usr.sbin/nscd/debug.c
@@ -131,7 +131,7 @@
 		for (i = 0; i < trace_level; ++i)
 			printf("\t");
 
-		printf("<= %s\n", s);
+		printf("<= %s, %s: %d\n", s, f, l);
 	}
 }
 
Index: usr.sbin/nscd/nscd.c
===================================================================
--- usr.sbin/nscd/nscd.c
+++ usr.sbin/nscd/nscd.c
@@ -338,9 +338,9 @@
 						qstate->use_alternate_io = 0;
 					}
 				}
-			break;
+				break;
 			default:
-			break;
+				break;
 			}
 		}
 
Index: usr.sbin/nscd/protocol.c
===================================================================
--- usr.sbin/nscd/protocol.c
+++ usr.sbin/nscd/protocol.c
@@ -157,7 +157,7 @@
 	case CET_UNDEFINED:
 		break;
 	default:
-	break;
+		break;
 	}
 
 	element->type = CET_UNDEFINED;
Index: usr.sbin/nscd/query.c
===================================================================
--- usr.sbin/nscd/query.c
+++ usr.sbin/nscd/query.c
@@ -160,7 +160,7 @@
 	struct cmsgcred *cred;
 	int elem_type;
 
-	struct {
+	union {
 		struct cmsghdr	hdr;
 		char cred[CMSG_SPACE(sizeof(struct cmsgcred))];
 	} cmsg;
@@ -171,8 +171,8 @@
 	memset(&cred_hdr, 0, sizeof(struct msghdr));
 	cred_hdr.msg_iov = &iov;
 	cred_hdr.msg_iovlen = 1;
-	cred_hdr.msg_control = (caddr_t)&cmsg;
-	cred_hdr.msg_controllen = CMSG_LEN(sizeof(struct cmsgcred));
+	cred_hdr.msg_control = &cmsg;
+	cred_hdr.msg_controllen = sizeof(cmsg);
 
 	memset(&iov, 0, sizeof(struct iovec));
 	iov.iov_base = &elem_type;
@@ -183,9 +183,22 @@
 		return (-1);
 	}
 
-	if (cmsg.hdr.cmsg_len < CMSG_LEN(sizeof(struct cmsgcred))
-		|| cmsg.hdr.cmsg_level != SOL_SOCKET
-		|| cmsg.hdr.cmsg_type != SCM_CREDS) {
+	if (cred_hdr.msg_flags & (MSG_CTRUNC | MSG_TRUNC)) {
+		TRACE_OUT(on_query_startup);
+		return (-1);
+	}
+
+	if (cmsg.hdr.cmsg_len < CMSG_LEN(sizeof(struct cmsgcred))) {
+		TRACE_OUT(on_query_startup);
+		return (-1);
+	}
+
+	if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
+		TRACE_OUT(on_query_startup);
+		return (-1);
+	}
+
+	if (cmsg.hdr.cmsg_type != SCM_CREDS) {
 		TRACE_OUT(on_query_startup);
 		return (-1);
 	}