Changeset 854 in openpam

Timestamp:

Jan 27, 2015, 10:13:03 PM (6 years ago)

Author:

Dag-Erling Smørgrav

Message:

Silence all remaining qual-cast warnings except in the test suite.

Location:

trunk

Files:

• CREDITS (modified) (1 diff)
• configure.ac (modified) (1 diff)
• lib/libpam/openpam_dispatch.c (modified) (1 diff)
• modules/pam_oath/pam_oath.c (modified) (2 diffs)
• modules/pam_unix/pam_unix.c (modified) (2 diffs)

trunk/CREDITS

@@ -22 +22 @@
         Daniel Richard G. <skunk@iskunk.org>
         Darren J. Moffat <darren.moffat@sun.com>
+        Dimitry Andric <dim@freebsd.org>
         Dmitry V. Levin <ldv@altlinux.org>
         Don Lewis <truckman@freebsd.org>

trunk/configure.ac

@@ -143 +143 @@
 AC_ARG_ENABLE([developer-warnings],
     AS_HELP_STRING([--enable-developer-warnings], [enable strict warnings (default is NO)]),
-    [CFLAGS="${CFLAGS} -Wall -Wextra"])
+    [CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual"])
 AC_ARG_ENABLE([debugging-symbols],
     AS_HELP_STRING([--enable-debugging-symbols], [enable debugging symbols (default is NO)]),

trunk/lib/libpam/openpam_dispatch.c

@@ -118 +118 @@
                             pam_sm_func_name[primitive], chain->module->path);
                         r = (chain->module->func[primitive])(pamh, flags,
-                            chain->optc, (const char **)chain->optv);
+                            chain->optc, (const char **)(intptr_t)chain->optv);
                         pamh->current = NULL;
                         openpam_log(PAM_LOG_LIBDEBUG, "%s: %s(): %s",

trunk/modules/pam_oath/pam_oath.c

@@ -176 +176 @@
         enum pam_oath_nokey nokey, badkey;
         struct passwd *pwd;
-        const char *user;
-        char *keyfile;
+        const char *user, *password;
+        char *end, *keyfile;
         struct oath_key *key;
         unsigned long response;
-        char *password, *end;
         int pam_err, ret, window;
 
@@ -248 +247 @@
         /* get user's response */
         pam_err = pam_get_authtok(pamh, PAM_AUTHTOK,
-            (const char **)&password, PAM_OATH_PROMPT);
+            &password, PAM_OATH_PROMPT);
         if (pam_err != PAM_SUCCESS) {
                 openpam_log(PAM_LOG_VERBOSE, "conversation failure");

trunk/modules/pam_unix/pam_unix.c

@@ -75 +75 @@
         struct passwd *pwd;
         const char *user;
-        char *crypt_password, *password;
+        const char *crypt_password, *password;
         int pam_err, retry;
 
@@ -99 +99 @@
 #ifdef OPENPAM
                 pam_err = pam_get_authtok(pamh, PAM_AUTHTOK,
-                    (const char **)&password, NULL);
+                    &password, NULL);
 #else
                 resp = NULL;