diff options
| author | Christian Göttsche <cgzones@googlemail.com> | 2024-02-22 17:04:09 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2024-02-22 16:04:09 +0000 |
| commit | f476a55237123dce667cdcdd70cadebba028c0b3 (patch) | |
| tree | c72e16cdff0feccebfe1f420f898fca06ad955fe | |
| parent | e74769f4a43b047193d457232c9c82530068658d (diff) | |
| download | pam-f476a55237123dce667cdcdd70cadebba028c0b3.tar.gz pam-f476a55237123dce667cdcdd70cadebba028c0b3.tar.bz2 pam-f476a55237123dce667cdcdd70cadebba028c0b3.zip | |
modules: enclose macro parameter
| -rw-r--r-- | modules/pam_access/pam_access.c | 2 | ||||
| -rw-r--r-- | modules/pam_faillock/faillock.c | 2 | ||||
| -rw-r--r-- | modules/pam_group/pam_group.c | 2 | ||||
| -rw-r--r-- | modules/pam_keyinit/pam_keyinit.c | 6 | ||||
| -rw-r--r-- | modules/pam_limits/pam_limits.c | 12 | ||||
| -rw-r--r-- | modules/pam_warn/pam_warn.c | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/modules/pam_access/pam_access.c b/modules/pam_access/pam_access.c index 312e56e0..2ab1ca94 100644 --- a/modules/pam_access/pam_access.c +++ b/modules/pam_access/pam_access.c @@ -85,7 +85,7 @@ #define ALL 2 #define YES 1 #define NO 0 -#define NOMATCH -1 +#define NOMATCH (-1) /* * A structure to bundle up all login-related information to keep the diff --git a/modules/pam_faillock/faillock.c b/modules/pam_faillock/faillock.c index 1d2057e7..ed013f6a 100644 --- a/modules/pam_faillock/faillock.c +++ b/modules/pam_faillock/faillock.c @@ -49,7 +49,7 @@ #include "faillock.h" -#define ignore_return(x) if (1==((int)x)) {;} +#define ignore_return(x) if (1==((int)(x))) {;} int open_tally (const char *dir, const char *user, uid_t uid, int create) diff --git a/modules/pam_group/pam_group.c b/modules/pam_group/pam_group.c index 08cad250..2483059a 100644 --- a/modules/pam_group/pam_group.c +++ b/modules/pam_group/pam_group.c @@ -513,7 +513,7 @@ static int find_member(const char *string, int *at) } #define GROUP_BLK 10 -#define blk_size(len) (((len-1 + GROUP_BLK)/GROUP_BLK)*GROUP_BLK) +#define blk_size(len) ((((len)-1 + GROUP_BLK)/GROUP_BLK)*GROUP_BLK) static int mkgrplist(pam_handle_t *pamh, char *buf, gid_t **list, int len) { diff --git a/modules/pam_keyinit/pam_keyinit.c b/modules/pam_keyinit/pam_keyinit.c index df9804b9..ad81b80b 100644 --- a/modules/pam_keyinit/pam_keyinit.c +++ b/modules/pam_keyinit/pam_keyinit.c @@ -23,9 +23,9 @@ #include <sys/syscall.h> #include <stdatomic.h> -#define KEY_SPEC_SESSION_KEYRING -3 /* ID for session keyring */ -#define KEY_SPEC_USER_KEYRING -4 /* ID for UID-specific keyring */ -#define KEY_SPEC_USER_SESSION_KEYRING -5 /* - key ID for UID-session keyring */ +#define KEY_SPEC_SESSION_KEYRING (-3) /* ID for session keyring */ +#define KEY_SPEC_USER_KEYRING (-4) /* ID for UID-specific keyring */ +#define KEY_SPEC_USER_SESSION_KEYRING (-5) /* - key ID for UID-session keyring */ #define KEYCTL_GET_KEYRING_ID 0 /* ask for a keyring's ID */ #define KEYCTL_JOIN_SESSION_KEYRING 1 /* start named session keyring */ diff --git a/modules/pam_limits/pam_limits.c b/modules/pam_limits/pam_limits.c index 8c7f7654..75c2bd99 100644 --- a/modules/pam_limits/pam_limits.c +++ b/modules/pam_limits/pam_limits.c @@ -62,7 +62,7 @@ #define LIMITS_DEF_KERNEL 5 /* limit was set from /proc/1/limits */ #define LIMITS_DEF_NONE 6 /* this limit was not set yet */ -#define LIMIT_RANGE_ERR -1 /* error in specified uid/gid range */ +#define LIMIT_RANGE_ERR (-1) /* error in specified uid/gid range */ #define LIMIT_RANGE_NONE 0 /* no range specified */ #define LIMIT_RANGE_ONE 1 /* exact uid/gid specified (:max_uid)*/ #define LIMIT_RANGE_MIN 2 /* only minimum uid/gid specified (min_uid:) */ @@ -100,11 +100,11 @@ struct pam_limit_s { char *login_group; }; -#define LIMIT_LOGIN RLIM_NLIMITS+1 -#define LIMIT_NUMSYSLOGINS RLIM_NLIMITS+2 +#define LIMIT_LOGIN (RLIM_NLIMITS+1) +#define LIMIT_NUMSYSLOGINS (RLIM_NLIMITS+2) -#define LIMIT_PRI RLIM_NLIMITS+3 -#define LIMIT_NONEWPRIVS RLIM_NLIMITS+4 +#define LIMIT_PRI (RLIM_NLIMITS+3) +#define LIMIT_NONEWPRIVS (RLIM_NLIMITS+4) #define LIMIT_SOFT 1 #define LIMIT_HARD 2 @@ -389,7 +389,7 @@ static rlim_t str2rlim_t(char *value) { pos--; \ while (pos && line[pos] != ' ') pos--; \ if (!pos) continue; \ - item = line + pos + 1; \ + (item) = line + pos + 1; \ } static void parse_kernel_limits(pam_handle_t *pamh, struct pam_limit_s *pl, int ctrl) diff --git a/modules/pam_warn/pam_warn.c b/modules/pam_warn/pam_warn.c index d91c3e9f..e2258feb 100644 --- a/modules/pam_warn/pam_warn.c +++ b/modules/pam_warn/pam_warn.c @@ -17,8 +17,8 @@ /* some syslogging */ #define OBTAIN(item, value, default_value) do { \ - (void) pam_get_item(pamh, item, &value); \ - value = value ? value : default_value ; \ + (void) pam_get_item(pamh, item, &(value)); \ + (value) = (value) ? (value) : (default_value) ; \ } while (0) static void log_items(pam_handle_t *pamh, const char *function, int flags) |