195 Need replacement for nfs/lockd+klm

@@ -16,15 +16,15 @@
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- */
-/*
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
 
 /*
  * nfs_tbind.c, common part for nfsd and lockd.

@@ -1696,13 +1696,13 @@
  * For an internet address the host-specific part is just
  * the 32 bit IP address and this part of the mask is set
  * to all-ones. The port number part of the mask is zeroes.
  */
 static int
-set_addrmask(fd, nconf, mask)
-        struct netconfig *nconf;
-        struct netbuf *mask;
+set_addrmask(int fd,
+        struct netconfig *nconf,
+        struct netbuf *mask)
 {
         struct t_info info;
 
         /*
          * Find the size of the address we need to mask.

@@ -1723,12 +1723,11 @@
                     (0 == strcmp(nconf->nc_protofmly, NC_LOOPBACK))) {
                         memset(mask, 0, sizeof (*mask));
                         return (0);
                 }
 
-                syslog(LOG_ERR, "set_addrmask: address size: %ld",
-                        info.addr);
+                syslog(LOG_ERR, "set_addrmask: address size: %ld", info.addr);
                 return (-1);
         }
 
         mask->buf = (char *)malloc(mask->len);
         if (mask->buf == NULL) {