diff options
| author | Christian Göttsche <cgzones@googlemail.com> | 2023-01-30 17:36:57 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2023-01-30 16:36:57 +0000 |
| commit | d13a8ea18f852e97201269e55255a14fe4fe5d0f (patch) | |
| tree | ac308dd7d56af306d49bf7c996ecb6ae424d37b5 /libpam/pam_handlers.c | |
| parent | e2ada10676aa6ce116964a41f083fa4776e9453a (diff) | |
| download | pam-d13a8ea18f852e97201269e55255a14fe4fe5d0f.tar.gz pam-d13a8ea18f852e97201269e55255a14fe4fe5d0f.tar.bz2 pam-d13a8ea18f852e97201269e55255a14fe4fe5d0f.zip | |
Enable format compiler warnings
* libpam/include/pam_cc_compat.h (DIAG_PUSH_IGNORE_FORMAT_NONLITERAL,
DIAG_POP_IGNORE_FORMAT_NONLITERAL): New macros.
* libpam/pam_handlers.c (_pam_open_config_file): Use them to exempt
usage of format string literals from a constant array.
* m4/warn_lang_flags.m4 (gl_WARN_ADD): Add -Wformat=2.
Diffstat (limited to 'libpam/pam_handlers.c')
| -rw-r--r-- | libpam/pam_handlers.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c index 12ebb8fc..6629480e 100644 --- a/libpam/pam_handlers.c +++ b/libpam/pam_handlers.c @@ -281,7 +281,7 @@ _pam_open_config_file(pam_handle_t *pamh , char **path , FILE **file) { - const char *pamd_dirs[] = { PAM_CONFIG_DF, PAM_CONFIG_DIST_DF + const char *const pamd_dirs[] = { PAM_CONFIG_DF, PAM_CONFIG_DIST_DF #ifdef VENDORDIR , PAM_CONFIG_DIST2_DF #endif @@ -317,10 +317,12 @@ _pam_open_config_file(pam_handle_t *pamh } for (i = 0; i < PAM_ARRAY_SIZE(pamd_dirs); i++) { - if (asprintf (&p, pamd_dirs[i], service) < 0) { + DIAG_PUSH_IGNORE_FORMAT_NONLITERAL + if (asprintf (&p, pamd_dirs[i], service) < 0) { pam_syslog(pamh, LOG_CRIT, "asprintf failed"); return PAM_BUF_ERR; } + DIAG_POP_IGNORE_FORMAT_NONLITERAL D(("opening %s", p)); f = fopen(p, "r"); |