[Fedora-directory-commits] ldapserver/ldap/servers/plugins/pam_passthru pam_ptconfig.c, 1.9, 1.10 pam_ptimpl.c, 1.10, 1.11

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25950/ldap/servers/plugins/pam_passthru

Modified Files:
	pam_ptconfig.c pam_ptimpl.c 
Log Message:
Resolves: #188320
Summary: HP-UX: warnings reported by the HP-UX compiler



Index: pam_ptconfig.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru/pam_ptconfig.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pam_ptconfig.c	15 Mar 2007 18:21:37 -0000	1.9
+++ pam_ptconfig.c	18 Oct 2007 00:08:30 -0000	1.10
@@ -231,7 +231,6 @@
 parse_map_method(char *map_method, int *one, int *two, int *three, char *returntext)
 {
 	int err = LDAP_SUCCESS;
-	int extra;
 	char **ptr = &map_method;
 
 	*one = *two = *three = PAMPT_MAP_METHOD_NONE;
@@ -256,7 +255,7 @@
 					"one of %s", map_method, get_map_method_values());
 		return LDAP_UNWILLING_TO_PERFORM;
 	}
-	if (((extra = meth_to_int(ptr, &err)) != PAMPT_MAP_METHOD_NONE) ||
+	if ((meth_to_int(ptr, &err) != PAMPT_MAP_METHOD_NONE) ||
 		err) {
 		PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE,
 					"Invalid extra text [%s] after last map method",


Index: pam_ptimpl.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/pam_passthru/pam_ptimpl.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pam_ptimpl.c	10 Nov 2006 23:45:03 -0000	1.10
+++ pam_ptimpl.c	18 Oct 2007 00:08:30 -0000	1.11
@@ -177,7 +177,7 @@
  * tell if this is actually the case.
  */
 static int
-pam_conv_func(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *mydata)
+pam_conv_func(int num_msg, struct pam_message **msg, struct pam_response **resp, void *mydata)
 {
 	int ii;
 	struct berval *creds;