--- a/usr/src/cmd/rad/mod/usermgr/mod_usermgr.c	Tue May 15 11:55:16 2012 -0400
+++ b/usr/src/cmd/rad/mod/usermgr/mod_usermgr.c	Tue May 15 15:28:14 2012 -0400
@@ -132,7 +132,6 @@
 	char *passwd = ptr;
 	struct pam_message	*m;
 	struct pam_response	*r;
-	char	*temp;
 	int	k, i;
 
 	if (num_msg <= 0)
@@ -152,12 +151,6 @@
 	m = *msg;
 	r = *response;
 
-	temp = strdup(passwd);
-	if (temp == NULL) {
-		rad_log(RL_DEBUG, "strdup of passwd failed.");
-		free(r);
-		return (PAM_BUF_ERR);
-	}
 	while (k--) {
 		r->resp = strdup(passwd);
 		if (r->resp == NULL) {
@@ -947,34 +940,31 @@
 		return (-1);
 	}
 	data_t *groups = data_new_array(&t_array__Group, 50);
-	FILE *fp = fopen(GRP_FILE, "r");
-	if (fp) {
-		struct group *entry;
-		nss_XbyY_buf_t *buf = NULL;
-		init_nss_buffer(SEC_REP_DB_GROUP, &buf);
-		scope_rep->rops->set_group();
-		while ((entry = scope_rep->rops->get_group(buf)) != NULL) {
-			data_t *group = data_new_struct(&t__Group);
+	struct group *entry;
+	nss_XbyY_buf_t *buf = NULL;
+	init_nss_buffer(SEC_REP_DB_GROUP, &buf);
+	scope_rep->rops->set_group();
+	while ((entry = scope_rep->rops->get_group(buf)) != NULL) {
+		data_t *group = data_new_struct(&t__Group);
 
-			struct_set(group, "groupName",
-			    data_new_string(entry->gr_name, lt_copy));
-			struct_set(group, "groupID",
-			    data_new_uinteger(entry->gr_gid));
+		struct_set(group, "groupName",
+			data_new_string(entry->gr_name, lt_copy));
+		struct_set(group, "groupID",
+			data_new_uinteger(entry->gr_gid));
 
-			int i = 0;
-			data_t *members = data_new_array(&t_array_string, 20);
-			char *member;
-			while ((member = entry->gr_mem[i++]) != NULL) {
-				(void) array_add(members,
-				    data_new_string(member, lt_copy));
-			}
+		int i = 0;
+		data_t *members = data_new_array(&t_array_string, 20);
+		char *member;
+		while ((member = entry->gr_mem[i++]) != NULL) {
+			(void) array_add(members,
+				data_new_string(member, lt_copy));
+		}
 
-			struct_set(group, "groupMembers", members);
-			(void) array_add(groups, group);
-		}
-		scope_rep->rops->end_group();
-		free_nss_buffer(&buf);
+		struct_set(group, "groupMembers", members);
+		(void) array_add(groups, group);
 	}
+	scope_rep->rops->end_group();
+	free_nss_buffer(&buf);
 
 	if (data_verify(groups, groups->d_type, B_TRUE)) {
 		*rtnval = groups;