From owner-svn-src-projects@FreeBSD.ORG Wed Jan 28 18:13:54 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 71DB9877; Wed, 28 Jan 2015 18:13:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5E7E4810; Wed, 28 Jan 2015 18:13:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0SIDsoF072532; Wed, 28 Jan 2015 18:13:54 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0SIDrdF072526; Wed, 28 Jan 2015 18:13:53 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201501281813.t0SIDrdF072526@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 28 Jan 2015 18:13:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r277840 - in projects/clang360-import/contrib/openpam: . lib/libpam modules/pam_unix X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jan 2015 18:13:54 -0000 Author: dim Date: Wed Jan 28 18:13:52 2015 New Revision: 277840 URL: https://svnweb.freebsd.org/changeset/base/277840 Log: Apply changeset 854 from upstream openpam (by Dag-Erling Smørgrav): Silence all remaining qual-cast warnings except in the test suite. Modified: projects/clang360-import/contrib/openpam/CREDITS projects/clang360-import/contrib/openpam/configure.ac projects/clang360-import/contrib/openpam/lib/libpam/openpam_dispatch.c projects/clang360-import/contrib/openpam/modules/pam_unix/pam_unix.c Modified: projects/clang360-import/contrib/openpam/CREDITS ============================================================================== --- projects/clang360-import/contrib/openpam/CREDITS Wed Jan 28 18:13:16 2015 (r277839) +++ projects/clang360-import/contrib/openpam/CREDITS Wed Jan 28 18:13:52 2015 (r277840) @@ -21,6 +21,7 @@ ideas: Christos Zoulas Daniel Richard G. Darren J. Moffat + Dimitry Andric Dmitry V. Levin Don Lewis Emmanuel Dreyfus Modified: projects/clang360-import/contrib/openpam/configure.ac ============================================================================== --- projects/clang360-import/contrib/openpam/configure.ac Wed Jan 28 18:13:16 2015 (r277839) +++ projects/clang360-import/contrib/openpam/configure.ac Wed Jan 28 18:13:52 2015 (r277840) @@ -110,7 +110,7 @@ AC_SUBST(CRYPTO_LIBS) 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)]), [CFLAGS="${CFLAGS} -O0 -g -fno-inline"]) Modified: projects/clang360-import/contrib/openpam/lib/libpam/openpam_dispatch.c ============================================================================== --- projects/clang360-import/contrib/openpam/lib/libpam/openpam_dispatch.c Wed Jan 28 18:13:16 2015 (r277839) +++ projects/clang360-import/contrib/openpam/lib/libpam/openpam_dispatch.c Wed Jan 28 18:13:52 2015 (r277840) @@ -117,7 +117,7 @@ openpam_dispatch(pam_handle_t *pamh, openpam_log(PAM_LOG_LIBDEBUG, "calling %s() in %s", 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", chain->module->path, pam_sm_func_name[primitive], Modified: projects/clang360-import/contrib/openpam/modules/pam_unix/pam_unix.c ============================================================================== --- projects/clang360-import/contrib/openpam/modules/pam_unix/pam_unix.c Wed Jan 28 18:13:16 2015 (r277839) +++ projects/clang360-import/contrib/openpam/modules/pam_unix/pam_unix.c Wed Jan 28 18:13:52 2015 (r277840) @@ -74,7 +74,7 @@ pam_sm_authenticate(pam_handle_t *pamh, #endif struct passwd *pwd; const char *user; - char *crypt_password, *password; + const char *crypt_password, *password; int pam_err, retry; (void)argc; @@ -98,7 +98,7 @@ pam_sm_authenticate(pam_handle_t *pamh, for (retry = 0; retry < 3; ++retry) { #ifdef OPENPAM pam_err = pam_get_authtok(pamh, PAM_AUTHTOK, - (const char **)&password, NULL); + &password, NULL); #else resp = NULL; pam_err = (*conv->conv)(1, &msgp, &resp, conv->appdata_ptr);