PSARC/2005/362 Removal of <rpc/trace.h>

4426428 libnsl needs some tidying up
6256192 Remaining ulonglong_t needs to be exorcised
6267468 rpcgen generates code gcc doesn't like
6271220 rpc/trace.h is obsolete and dead code
6271232 rpcgen fails to cast memset correctly

--HG--
rename : usr/src/lib/libnsl/dial/dk.h => deleted_files/usr/src/lib/libnsl/dial/dk.h
rename : usr/src/lib/libnsl/dial/dkbreak.c => deleted_files/usr/src/lib/libnsl/dial/dkbreak.c
rename : usr/src/lib/libnsl/dial/dkdial.c => deleted_files/usr/src/lib/libnsl/dial/dkdial.c
rename : usr/src/lib/libnsl/dial/dkerr.c => deleted_files/usr/src/lib/libnsl/dial/dkerr.c
rename : usr/src/lib/libnsl/dial/dkminor.c => deleted_files/usr/src/lib/libnsl/dial/dkminor.c
rename : usr/src/lib/libnsl/dial/dtnamer.c => deleted_files/usr/src/lib/libnsl/dial/dtnamer.c
rename : usr/src/lib/libnsl/rpc/rpc_trace.c => deleted_files/usr/src/lib/libnsl/rpc/rpc_trace.c
rename : usr/src/uts/common/rpc/trace.h => deleted_files/usr/src/uts/common/rpc/trace.h

1 files changed, 8 insertions, 25 deletions

diff --git a/usr/src/lib/libnsl/nss/getauthattr.c b/usr/src/lib/libnsl/nss/getauthattr.c
index 8f3f234321..bbae54a2ff 100644
--- a/usr/src/lib/libnsl/nss/getauthattr.c
+++ b/usr/src/lib/libnsl/nss/getauthattr.c
@@ -19,9 +19,10 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright (c) 1999-2001 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -29,7 +30,6 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <nss_dbdefs.h>
-#include <rpc/trace.h>
 #include <string.h>
 #include <auth_attr.h>
 
@@ -49,10 +49,8 @@ static DEFINE_NSS_GETENT(context);
 void
 _nss_initf_authattr(nss_db_params_t *p)
 {
-	trace1(TR__nss_initf_authattr, 0);
 	p->name = NSS_DBNAM_AUTHATTR;
 	p->default_config = NSS_DEFCONF_AUTHATTR;
-	trace1(TR__nss_initf_authattr, 1);
 }
 
 
@@ -65,29 +63,22 @@ _nss_initf_authattr(nss_db_params_t *p)
 int
 str2authattr(const char *instr, int lenstr, void *ent, char *buffer, int buflen)
 {
-	char		*str = (char *)NULL;
-	char		*last = (char *)NULL;
+	char		*last = NULL;
 	char		*sep = KV_TOKEN_DELIMIT;
 	authstr_t	*auth = (authstr_t *)ent;
 
-	trace3(TR_str2authattr, 0, lenstr, buflen);
 	if ((instr >= buffer && (buffer + buflen) > instr) ||
-	    (buffer >= instr && (instr + lenstr) > buffer)) {
-		trace3(TR_str2authattr, 1, lenstr, buflen);
+	    (buffer >= instr && (instr + lenstr) > buffer))
 		return (NSS_STR_PARSE_PARSE);
-	}
-	if (lenstr >= buflen) {
-		trace3(TR_str2authattr, 1, lenstr, buflen);
+	if (lenstr >= buflen)
 		return (NSS_STR_PARSE_ERANGE);
-	}
-	strncpy(buffer, instr, buflen);
+	(void) strncpy(buffer, instr, buflen);
 	/*
 	 * Remove newline that nis (yp_match) puts at the
 	 * end of the entry it retrieves from the map.
 	 */
-	if (buffer[lenstr] == '\n') {
+	if (buffer[lenstr] == '\n')
 		buffer[lenstr] = '\0';
-	}
 
 	auth->name = _strtok_escape(buffer, sep, &last);
 	auth->res1 = _strtok_escape(NULL, sep, &last);
@@ -103,21 +94,17 @@ str2authattr(const char *instr, int lenstr, void *ent, char *buffer, int buflen)
 void
 _setauthattr(void)
 {
-	trace1(TR_setauthattr, 0);
 	authattr_stayopen = 0;
 	nss_setent(&db_root, _nss_initf_authattr, &context);
-	trace1(TR_setauthattr, 0);
 }
 
 
 void
 _endauthattr(void)
 {
-	trace1(TR_endauthattr, 0);
 	authattr_stayopen = 0;
 	nss_endent(&db_root, _nss_initf_authattr, &context);
 	nss_delete(&db_root);
-	trace1(TR_endauthattr, 0);
 }
 
 
@@ -127,12 +114,10 @@ _getauthattr(authstr_t *result, char *buffer, int buflen, int *h_errnop)
 	nss_XbyY_args_t arg;
 	nss_status_t res;
 
-	trace2(TR_getauthattr, 0, buflen);
 	NSS_XbyY_INIT(&arg, result, buffer, buflen, str2authattr);
 	res = nss_getent(&db_root, _nss_initf_authattr, &context, &arg);
 	arg.status = res;
 	*h_errnop = arg.h_errno;
-	trace2(TR_getauthattr, 1, buflen);
 	return ((authstr_t *)NSS_XbyY_FINI(&arg));
 }
 
@@ -144,7 +129,6 @@ _getauthnam(const char *name, authstr_t *result, char *buffer, int buflen,
 	nss_XbyY_args_t arg;
 	nss_status_t    res;
 
-	trace2(TR_getauthnam, 0, buflen);
 	NSS_XbyY_INIT(&arg, result, buffer, buflen, str2authattr);
 	arg.key.name = name;
 	arg.stayopen = authattr_stayopen;
@@ -152,6 +136,5 @@ _getauthnam(const char *name, authstr_t *result, char *buffer, int buflen,
 	    NSS_DBOP_AUTHATTR_BYNAME, &arg);
 	arg.status = res;
 	*errnop = arg.h_errno;
-	trace2(TR_getauthnam, 1, buflen);
 	return ((authstr_t *)NSS_XbyY_FINI(&arg));
 }