Relevant BUGIDs: none

Purpose of commit: cleanup

Commit summary:
---------------

Fix all occurrence of dereferencing type-punned pointer will break
strict-aliasing rules warnings

2 files changed, 11 insertions, 9 deletions

diff --git a/modules/pam_userdb/conv.c b/modules/pam_userdb/conv.c
index de5d12f2..33923851 100644
--- a/modules/pam_userdb/conv.c
+++ b/modules/pam_userdb/conv.c
@@ -22,13 +22,15 @@ static int converse(pam_handle_t *pamh,
 		    struct pam_response **response)
 {
     int retval;
+    const void* void_conv;
     const struct pam_conv *conv;
 
-    retval = pam_get_item(pamh, PAM_CONV, (const void **) &conv ) ;
+    retval = pam_get_item(pamh, PAM_CONV,  &void_conv ) ;
+    conv = void_conv;
     if (retval == PAM_SUCCESS)
 	retval = conv->conv(1, (const struct pam_message **)message,
 			    response, conv->appdata_ptr);
-	
+
     return retval; /* propagate error status */
 }
 
@@ -49,7 +51,7 @@ int conversation(pam_handle_t *pamh)
     struct pam_response *resp;
     int retval;
     char * token = NULL;
-    
+
     pmsg[0] = &msg[0];
     msg[0].msg_style = PAM_PROMPT_ECHO_OFF;
     msg[0].msg = "Password: ";
@@ -59,7 +61,7 @@ int conversation(pam_handle_t *pamh)
     retval = converse(pamh, pmsg, &resp);
 
     if (resp != NULL) {
-	const char * item;
+	const void *item;
 	/* interpret the response */
 	if (retval == PAM_SUCCESS) {     /* a good conversation */
 	    token = x_strdup(resp[0].resp);
@@ -72,11 +74,11 @@ int conversation(pam_handle_t *pamh)
 	retval = pam_set_item(pamh, PAM_AUTHTOK, token);
 	token = _pam_delete(token);   /* clean it up */
 	if ( (retval != PAM_SUCCESS) ||
-	     (retval = pam_get_item(pamh, PAM_AUTHTOK, (const void **)&item))
+	     (retval = pam_get_item(pamh, PAM_AUTHTOK, &item))
 	     != PAM_SUCCESS ) {
 	    return retval;
 	}
-	
+
 	_pam_drop_reply(resp, 1);
     } else {
 	retval = (retval == PAM_SUCCESS)
diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c
index a0a5b8b5..f019c67a 100644
--- a/modules/pam_userdb/pam_userdb.c
+++ b/modules/pam_userdb/pam_userdb.c
@@ -295,7 +295,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
 			int argc, const char **argv)
 {
      const char *username;
-     const char *password;
+     const void *password;
      char *database = NULL;
      char *cryptmode = NULL;
      int retval = PAM_AUTH_ERR, ctrl;
@@ -329,7 +329,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
       * user anyway, so check for one and handle a failure for that case.  If
       * use_authtok wasn't specified, then we've already asked once and needn't
       * do so again. */
-     retval = pam_get_item(pamh, PAM_AUTHTOK, (const void **) &password);
+     retval = pam_get_item(pamh, PAM_AUTHTOK, &password);
      if ((retval != PAM_SUCCESS) && ((ctrl & PAM_USE_AUTHTOK_ARG) != 0)) {
         retval = conversation(pamh);
         if (retval != PAM_SUCCESS) {
@@ -340,7 +340,7 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags,
      }
 
      /* Get the password */
-     retval = pam_get_item(pamh, PAM_AUTHTOK, (const void **)&password);
+     retval = pam_get_item(pamh, PAM_AUTHTOK, &password);
      if (retval != PAM_SUCCESS) {
 	 _pam_log(LOG_ERR, "Could not retrieve user's password");
 	 return -2;