11382 ldap: NULL pointer errors

Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Dan McDonald <danmcd@joyent.com>

2 files changed, 20 insertions, 18 deletions

diff --git a/usr/src/cmd/ldap/ns_ldap/ldapaddent.c b/usr/src/cmd/ldap/ns_ldap/ldapaddent.c
index e4a645636a..6c4e83f0b9 100644
--- a/usr/src/cmd/ldap/ns_ldap/ldapaddent.c
+++ b/usr/src/cmd/ldap/ns_ldap/ldapaddent.c
@@ -144,7 +144,7 @@ again:
 		else
 			base = 8;
 	}
-	while ((c = *cp) != NULL) {
+	while ((c = *cp) != '\0') {
 		if (isdigit(c)) {
 			if ((c - '0') >= base)
 				break;
@@ -463,7 +463,8 @@ addentry(void *entry, int mod)
  * Display usage message to STDERR.
  */
 static void
-usage(char *msg) {
+usage(char *msg)
+{
 
 	if (msg)
 		(void) fprintf(stderr, "%s\n", msg);
@@ -508,7 +509,8 @@ usage(char *msg) {
  *		AF_INET6	: IPv6
  */
 static int
-check_ipaddr(char *addr, char **newaddr) {
+check_ipaddr(char *addr, char **newaddr)
+{
 	ipaddr_t	addr_ipv4 = 0;
 	in6_addr_t	addr_ipv6;
 
@@ -519,7 +521,7 @@ check_ipaddr(char *addr, char **newaddr) {
 
 		/* Convert IPv4-mapped IPv6 address to IPv4 */
 		if (IN6_IS_ADDR_V4MAPPED(&addr_ipv6) ||
-					IN6_IS_ADDR_V4COMPAT(&addr_ipv6)) {
+		    IN6_IS_ADDR_V4COMPAT(&addr_ipv6)) {
 			IN6_V4MAPPED_TO_IPADDR(&addr_ipv6, addr_ipv4);
 			if ((*newaddr = calloc(1, INET_ADDRSTRLEN)) == NULL) {
 				(void) fprintf(stderr,
@@ -2167,7 +2169,7 @@ dump_aliases(ns_ldap_result_t *res)
 {
 
 	char	**value = NULL;
-	int 		attr_count = 0;
+	int		attr_count = 0;
 
 	value = __ns_ldap_getAttr(res->entry, "mail");
 	if (value && value[0])
@@ -3819,8 +3821,8 @@ static void
 dump_project(ns_ldap_result_t *res)
 {
 	char    **value = NULL;
-	char 	*endptr = NULL;
-	int 	projid;
+	char	*endptr = NULL;
+	int	projid;
 
 	if (res == NULL || res->entry == NULL)
 		return;
@@ -4721,7 +4723,8 @@ static int get_basedn(char *service, char **basedn) {
 	}
 }
 static char *
-h_errno2str(int h_errno) {
+h_errno2str(int h_errno)
+{
 	switch (h_errno) {
 	case HOST_NOT_FOUND:
 		return ("HOST_NOT_FOUND");
diff --git a/usr/src/cmd/ldap/ns_ldap/ldaplist.c b/usr/src/cmd/ldap/ns_ldap/ldaplist.c
index 162639d119..1ed200938a 100644
--- a/usr/src/cmd/ldap/ns_ldap/ldaplist.c
+++ b/usr/src/cmd/ldap/ns_ldap/ldaplist.c
@@ -75,12 +75,12 @@ static struct database_t {
 
 
 void
-usage(char *msg) {
+usage(char *msg)
+{
 	if (msg)
 		(void) fprintf(stderr, "%s\n", msg);
 
-	(void) fprintf(stderr,
-	gettext(
+	(void) fprintf(stderr, gettext(
 	"\n"
 	"usage: ldaplist [-dlv] [-h LDAP_server[:serverPort] [-M domainName]\n"
 	"[-N  profileName] [-a  authenticationMethod] [-P certifPath]\n"
@@ -144,9 +144,8 @@ usage(char *msg) {
  * filter, if the input SSD contains a filter "department=sds".
  */
 static int
-merge_SSD_filter(const ns_ldap_search_desc_t *desc,
-			char **realfilter,
-			const void *userdata)
+merge_SSD_filter(const ns_ldap_search_desc_t *desc, char **realfilter,
+    const void *userdata)
 {
 	int	len;
 	char *checker;
@@ -189,13 +188,13 @@ merge_SSD_filter(const ns_ldap_search_desc_t *desc,
 /* returns 0=success, 1=error */
 int
 list(char *database, char *ldapfilter, char **ldapattribute,
-char **err, char *userdata)
+    char **err, char *userdata)
 {
 	ns_ldap_result_t	*result;
 	ns_ldap_error_t	*errorp;
 	int		rc;
 	char		buf[500];
-	const char 	*sort = NULL;
+	const char	*sort = NULL;
 	int		i;
 
 	if (database) {
@@ -260,7 +259,7 @@ main(int argc, char **argv)
 	char			*attribute = "dn";
 	char			**key = NULL;
 	char			**ldapattribute = NULL;
-	char 			*buffer[100];
+	char			*buffer[100];
 	char			*err = NULL;
 	char			*p;
 	int			index = 1;
@@ -488,7 +487,7 @@ main(int argc, char **argv)
 	}
 
 	/* build the filter */
-	if (database && (strcasecmp(database, "publickey") == NULL)) {
+	if (database && (strcasecmp(database, "publickey") == 0)) {
 		/* user publickey lookup */
 		char *err1 = NULL;
 		int  rc1;