14385 libnsl: mismatched bound

Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>

4 files changed, 16 insertions, 22 deletions

diff --git a/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c b/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c
index a116d08125..f392c999d4 100644
--- a/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c
+++ b/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c
@@ -200,7 +200,7 @@ Done:
 	(memcmp((o1)->elements, (o2)->elements, (o1)->length) == 0))
 
 int
-__nis_gssprin2netname(rpc_gss_principal_t prin, char netname[MAXNETNAMELEN+1])
+__nis_gssprin2netname(rpc_gss_principal_t prin, char netname[])
 {
 	gss_buffer_desc display_name;
 	gss_name_t name;
diff --git a/usr/src/lib/libnsl/rpc/netname.c b/usr/src/lib/libnsl/rpc/netname.c
index 0e5b19d2a0..3dc17d383d 100644
--- a/usr/src/lib/libnsl/rpc/netname.c
+++ b/usr/src/lib/libnsl/rpc/netname.c
@@ -139,7 +139,7 @@ user2netname_nis(int *err, char netname[MAXNETNAMELEN + 1], uid_t uid,
  * Figure out my fully qualified network name
  */
 int
-getnetname(char name[MAXNETNAMELEN + 1])
+getnetname(char *name)
 {
 	uid_t uid;
 
@@ -174,8 +174,7 @@ __getnetnamebyuid(char name[MAXNETNAMELEN + 1], uid_t uid)
  * so only the first entry would be relevant for those cases.
  */
 int
-user2netname(char netname[MAXNETNAMELEN + 1], const uid_t uid,
-    const char *domain)
+user2netname(char *netname, const uid_t uid, const char *domain)
 {
 	struct __nsw_switchconfig *conf;
 	struct __nsw_lookup *look;
@@ -265,8 +264,7 @@ user2netname(char netname[MAXNETNAMELEN + 1], const uid_t uid,
  *	h.w.x	a.b		unix.h@a.b
  */
 int
-host2netname(char netname[MAXNETNAMELEN + 1], const char *host,
-    const char *domain)
+host2netname(char *netname, const char *host, const char *domain)
 {
 	char *p;
 	char hostname[MAXHOSTNAMELEN + 1];
diff --git a/usr/src/lib/libnsl/rpc/netnamer.c b/usr/src/lib/libnsl/rpc/netnamer.c
index b257403b70..e1ca4919cd 100644
--- a/usr/src/lib/libnsl/rpc/netnamer.c
+++ b/usr/src/lib/libnsl/rpc/netnamer.c
@@ -159,7 +159,7 @@ parse_gidlist(char *p, struct netid_userdata *argp)
  * Parse uid and group information from the passed string.
  *
  * The format of the string passed is
- * 	uid:gid,grp,grp, ...
+ *	uid:gid,grp,grp, ...
  *
  */
 static int
@@ -194,10 +194,10 @@ parse_netid_str(char *s, struct netid_userdata *argp)
 static int
 netname2user_files(int *err, char *netname, struct netid_userdata *argp)
 {
-	char 	buf[512];	/* one line from the file */
+	char	buf[512];	/* one line from the file */
 	char	*name;
 	char	*value;
-	char 	*res;
+	char	*res;
 	FILE	*fd;
 
 	fd = fopen(NETIDFILE, "rF");
@@ -372,8 +372,8 @@ netname2user_ldap(int *err, char *netname, struct netid_userdata *argp)
  * Convert network-name into unix credential
  */
 int
-netname2user(const char netname[MAXNETNAMELEN + 1], uid_t *uidp, gid_t *gidp,
-						int *gidlenp, gid_t *gidlist)
+netname2user(const char *netname, uid_t *uidp, gid_t *gidp, int *gidlenp,
+    gid_t *gidlist)
 {
 	struct __nsw_switchconfig *conf;
 	struct __nsw_lookup *look;
@@ -464,8 +464,7 @@ netname2user(const char netname[MAXNETNAMELEN + 1], uid_t *uidp, gid_t *gidp,
  * We just construct the hostname using information from the domainname.
  */
 int
-netname2host(const char netname[MAXNETNAMELEN + 1], char *hostname,
-							const int hostlen)
+netname2host(const char *netname, char *hostname, const int hostlen)
 {
 	char *p, *domainname;
 	int len, dlen;
diff --git a/usr/src/lib/libnsl/yp/dbm.c b/usr/src/lib/libnsl/yp/dbm.c
index 561ac1d432..c367a25617 100644
--- a/usr/src/lib/libnsl/yp/dbm.c
+++ b/usr/src/lib/libnsl/yp/dbm.c
@@ -34,8 +34,6 @@
  * California.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "mt.h"
 #include <rpcsvc/dbm.h>
 #include <sys/types.h>
@@ -391,7 +389,7 @@ setbit(void)
 }
 
 datum
-makdatum(char buf[PBLKSIZ], int n)
+makdatum(char *buf, int n)
 {
 	short *sp;
 	int t;
@@ -427,10 +425,10 @@ cmpdatum(datum d1, datum d2)
 		return (0);
 	p1 = d1.dptr;
 	p2 = d2.dptr;
-	do
+	do {
 		if (*p1++ != *p2++)
 			return (*--p1 - *--p2);
-	while (--n);
+	} while (--n);
 	return (0);
 }
 
@@ -503,7 +501,7 @@ calchash(datum item)
 }
 
 void
-delitem(char buf[PBLKSIZ], int n)
+delitem(char *buf, int n)
 {
 	short *sp;
 	int i1, i2, i3;
@@ -537,12 +535,11 @@ bad:
 }
 
 int
-additem(char buf[PBLKSIZ], datum item)
+additem(char *buf, datum item)
 {
 	short *sp;
 	int i1, i2;
 
-	/* LINTED pointer cast */
 	sp = (short *)buf;
 	i1 = PBLKSIZ;
 	if (sp[0] > 0)
@@ -561,7 +558,7 @@ additem(char buf[PBLKSIZ], datum item)
 }
 
 void
-chkblk(char buf[PBLKSIZ])
+chkblk(char *buf)
 {
 	short *sp;
 	int t, i;