aboutsummaryrefslogtreecommitdiff
path: root/modules/pam_umask/pam_umask.c
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2010-08-31 17:23:27 -0700
committerSteve Langasek <vorlon@debian.org>2019-01-08 21:47:21 -0800
commit6c6f451aff56e368041dd4076ad61d8f51635b7f (patch)
treeed1162733e6688167c56704ffbf4e63c602abf35 /modules/pam_umask/pam_umask.c
parent0b7e86d2422eb0ddabce5ffcd59ee31525a4e8af (diff)
parentb70316c593cbc8e5c9155e5c6597497090c6eb88 (diff)
downloadpam-6c6f451aff56e368041dd4076ad61d8f51635b7f.tar.gz
pam-6c6f451aff56e368041dd4076ad61d8f51635b7f.tar.bz2
pam-6c6f451aff56e368041dd4076ad61d8f51635b7f.zip
merge upstream version 1.1.2
Diffstat (limited to 'modules/pam_umask/pam_umask.c')
-rw-r--r--modules/pam_umask/pam_umask.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/pam_umask/pam_umask.c b/modules/pam_umask/pam_umask.c
index eb88c1ac..6d2ec1ac 100644
--- a/modules/pam_umask/pam_umask.c
+++ b/modules/pam_umask/pam_umask.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, 2007 Thorsten Kukuk <kukuk@thkukuk.de>
+ * Copyright (c) 2005, 2006, 2007, 2010 Thorsten Kukuk <kukuk@thkukuk.de>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -197,10 +197,10 @@ setup_limits_from_gecos (pam_handle_t *pamh, options_t *options,
if (options->usergroups)
{
- /* if not root, and UID == GID, and username is the same as
- primary group name, set umask group bits to be the same as
- owner bits (examples: 022 -> 002, 077 -> 007). */
- if (pw->pw_uid != 0 && pw->pw_uid == pw->pw_gid)
+ /* if not root and username is the same as primary group name,
+ set umask group bits to be the same as owner bits
+ (examples: 022 -> 002, 077 -> 007). */
+ if (pw->pw_uid != 0)
{
struct group *grp = pam_modutil_getgrgid (pamh, pw->pw_gid);
if (grp && (strcmp (pw->pw_name, grp->gr_name) == 0))