Relevant BUGIDs:

Purpose of commit: cleanup

Commit summary:
---------------

2006-06-15  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_group/pam_group.c (logic_member): Remove unused
        variable len.
        (check_account): Fix usage of err variable in debug code.

diff --git a/ChangeLog b/ChangeLog
index 2283bddcd629617b6647c7ceb3dd4a7603dfc5df..108a7784048af089d7190997dd342b89420c22a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
        * modules/pam_group/pam_group.c (logic_field): Accept
        colon in tty name. [#1428276].
+       (logic_member): Remove unused variable len.
+       (check_account): Fix usage of err variable in debug code.
+
        * modules/pam_time/pam_time.c (logic_field): Likewise.
 
        * configure.in: Add special exceptions for icc: different

diff --git a/modules/pam_group/pam_group.c b/modules/pam_group/pam_group.c
index 80edee5af35b79a5c0aaefb5717b463546db5d08..dd0bfcce56b31af9a18800be755ebf35eb9358c6 100644 (file)
--- a/modules/pam_group/pam_group.c
+++ b/modules/pam_group/pam_group.c
@@ -1,8 +1,6 @@
 /* pam_group module */
 
 /*
- * $Id$
- *
  * Written by Andrew Morgan <morgan@linux.kernel.org> 1996/7/6
  */
 
@@ -220,11 +218,10 @@ read_field (const pam_handle_t *pamh, int fd, char **buf, int *from, int *to)
 
 static int logic_member(const char *string, int *at)
 {
-     int len,c,to;
+     int c,to;
      int done=0;
      int token=0;
 
-     len=0;
      to=*at;
      do {
          c = string[to++];
@@ -478,11 +475,10 @@ check_time (const pam_handle_t *pamh, const void *AT,
 
 static int find_member(const char *string, int *at)
 {
-     int len,c,to;
+     int c,to;
      int done=0;
      int token=0;
 
-     len=0;
      to=*at;
      do {
           c = string[to++];
@@ -717,15 +713,17 @@ static int check_account(pam_handle_t *pamh, const char *service,
     /* now set the groups for the user */
 
     if (no_grps > 0) {
+#ifdef DEBUG
        int err;
+#endif
        D(("trying to set %d groups", no_grps));
 #ifdef DEBUG
        for (err=0; err<no_grps; ++err) {
            D(("gid[%d]=%d", err, grps[err]));
        }
 #endif
-       if ((err = setgroups(no_grps, grps))) {
-           D(("but couldn't set groups %d", err));
+       if (setgroups(no_grps, grps) != 0) {
+           D(("but couldn't set groups %m"));
            pam_syslog(pamh, LOG_ERR,
                       "unable to set the group membership for user: %m");
            retval = PAM_CRED_ERR;