--- old/usr/src/cmd/fs.d/nfs/nfs4cbd/nfs4cbd.c	Wed Jun 17 00:15:43 2009
+++ new/usr/src/cmd/fs.d/nfs/nfs4cbd/nfs4cbd.c	Wed Jun 17 00:15:43 2009
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -31,8 +31,6 @@
  * under license from the Regents of the University of California.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * This module provides the user level support for the NFSv4
  * callback program.  It is modeled after nfsd.  When a nfsv4
@@ -129,7 +127,7 @@
 
 	if (pi == -1) {
 		(void) syslog(LOG_ERR,
-			"Could not start NFS4_CALLBACK service");
+		    "Could not start NFS4_CALLBACK service");
 		exit(1);
 	}
 
@@ -140,7 +138,7 @@
 	if (__init_daemon_priv(PU_RESETGROUPS|PU_CLEARLIMITSET,
 	    DAEMON_UID, DAEMON_GID, PRIV_SYS_NFS, (char *)NULL) == -1) {
 		(void) fprintf(stderr, "%s must be run with sufficient"
-			" privileges\n", argv[0]);
+		    " privileges\n", argv[0]);
 		exit(1);
 	}
 	/* Basic privileges we don't need, remove from E/P. */
@@ -240,7 +238,7 @@
 	if (ua == NULL) {
 #ifdef	DEBUG
 		fprintf(stderr, "taddr2uaddr failed for netid %s\n",
-			nconf->nc_netid);
+		    nconf->nc_netid);
 #endif
 		return (NULL);
 	}
@@ -261,7 +259,7 @@
 	if (ua2 == NULL) {
 #ifdef	DEBUG
 		fprintf(stderr, "taddr2uaddr failed for netid %s.\n",
-			nconf->nc_netid);
+		    nconf->nc_netid);
 #endif
 		return (NULL);
 	}
@@ -296,8 +294,8 @@
 
 	if (ua == NULL) {
 		syslog(LOG_NOTICE, "nfsv4 cannot determine local hostname "
-			"binding for transport %s - delegations will not be "
-			"available on this transport\n", nconf->nc_netid);
+		    "binding for transport %s - delegations will not be "
+		    "available on this transport\n", nconf->nc_netid);
 		return (0);
 	}
 
@@ -304,10 +302,10 @@
 #ifdef	DEBUG
 	if (cmd & NFS4_KRPC_START)
 		fprintf(stderr, "nfs4cbd: starting callback rpc on %s %s\n",
-			nconf->nc_netid, ua);
+		    nconf->nc_netid, ua);
 	else
 		fprintf(stderr, "nfs4cbd: listening on %s %s\n",
-			nconf->nc_netid, ua);
+		    nconf->nc_netid, ua);
 #endif
 
 	nsa.fd = fd;