libs/libpam/patches/000-OE-pam-no-innetgr.patch

   1 innetgr may not be there so make sure that when innetgr is not present
   2 then we inform about it and not use it.
   3
   4 -Khem
   5 --- a/modules/pam_group/pam_group.c
   6 +++ b/modules/pam_group/pam_group.c
   7 @@ -656,7 +656,11 @@ static int check_account(pam_handle_t *p
   8         }
   9         /* If buffer starts with @, we are using netgroups */
  10         if (buffer[0] == '@')
  11 +#ifdef HAVE_INNETGR
  12           good &= innetgr (&buffer[1], NULL, user, NULL);
  13 +#else
  14 +       pam_syslog (pamh, LOG_ERR, "pam_group does not have netgroup support");
  15 +#endif
  16         /* otherwise, if the buffer starts with %, it's a UNIX group */
  17         else if (buffer[0] == '%')
  18            good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]);
  19 --- a/modules/pam_time/pam_time.c
  20 +++ b/modules/pam_time/pam_time.c
  21 @@ -555,9 +555,13 @@ check_account(pam_handle_t *pamh, const
  22           }
  23           /* If buffer starts with @, we are using netgroups */
  24           if (buffer[0] == '@')
  25 -           good &= innetgr (&buffer[1], NULL, user, NULL);
  26 +#ifdef HAVE_INNETGR
  27 +              good &= innetgr (&buffer[1], NULL, user, NULL);
  28 +#else
  29 +              pam_syslog (pamh, LOG_ERR, "pam_time does not have netgroup support");
  30 +#endif
  31           else
  32 -           good &= logic_field(pamh, user, buffer, count, is_same);
  33 +              good &= logic_field(pamh, user, buffer, count, is_same);
  34           D(("with user: %s", good ? "passes":"fails" ));
  35
  36           /* here we get the time field */
  37 --- a/modules/pam_succeed_if/pam_succeed_if.c
  38 +++ b/modules/pam_succeed_if/pam_succeed_if.c
  39 @@ -231,18 +231,27 @@ evaluate_notingroup(pam_handle_t *pamh,
  40  }
  41  /* Return PAM_SUCCESS if the (host,user) is in the netgroup. */
  42  static int
  43 -evaluate_innetgr(const char *host, const char *user, const char *group)
  44 +evaluate_innetgr(const pam_handle_t* pamh, const char *host, const char *user, const char *group)
  45  {
  46 +#ifdef HAVE_INNETGR
  47         if (innetgr(group, host, user, NULL) == 1)
  48                 return PAM_SUCCESS;
  49 +#else
  50 +        pam_syslog (pamh, LOG_ERR, "pam_succeed_if does not have netgroup support");
  51 +#endif
  52 +
  53         return PAM_AUTH_ERR;
  54  }
  55  /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */
  56  static int
  57 -evaluate_notinnetgr(const char *host, const char *user, const char *group)
  58 +evaluate_notinnetgr(const pam_handle_t* pamh, const char *host, const char *user, const char *group)
  59  {
  60 +#ifdef HAVE_INNETGR
  61         if (innetgr(group, host, user, NULL) == 0)
  62                 return PAM_SUCCESS;
  63 +#else
  64 +       pam_syslog (pamh, LOG_ERR, "pam_succeed_if does not have netgroup support");
  65 +#endif
  66         return PAM_AUTH_ERR;
  67  }
  68
  69 @@ -387,14 +396,14 @@ evaluate(pam_handle_t *pamh, int debug,
  70                 const void *rhost;
  71                 if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS)
  72                         rhost = NULL;
  73 -               return evaluate_innetgr(rhost, user, right);
  74 +               return evaluate_innetgr(pamh, rhost, user, right);
  75         }
  76         /* (Rhost, user) is not in this group. */
  77         if (strcasecmp(qual, "notinnetgr") == 0) {
  78                 const void *rhost;
  79                 if (pam_get_item(pamh, PAM_RHOST, &rhost) != PAM_SUCCESS)
  80                         rhost = NULL;
  81 -               return evaluate_notinnetgr(rhost, user, right);
  82 +               return evaluate_notinnetgr(pamh, rhost, user, right);
  83         }
  84         /* Fail closed. */
  85         return PAM_SERVICE_ERR;