patches/tcp_wrappers/initgroups

   1 diff -up tcp_wrappers_7.6/options.c.initgroups tcp_wrappers_7.6/options.c
   2 --- tcp_wrappers_7.6/options.c.initgroups       2011-08-11 23:10:43.610418714 +0200
   3 +++ tcp_wrappers_7.6/options.c  2011-08-12 05:51:17.748481294 +0200
   4 @@ -256,8 +256,12 @@ struct request_info *request;
   5         tcpd_jump("unknown group: \"%s\"", value);
   6      endgrent();
   7
   8 -    if (dry_run == 0 && setgid(grp->gr_gid))
   9 -       tcpd_jump("setgid(%s): %m", value);
  10 +    if (dry_run != 0) {
  11 +        if (setgid(grp->gr_gid))
  12 +          tcpd_jump("setgid(%s): %m", value);
  13 +        if (setgroups(0, NULL))
  14 +          tcpd_jump("setgroups(%s): %m", value);
  15 +    }
  16  }
  17
  18  /* user_option - switch user id */
  19 @@ -271,15 +275,26 @@ struct request_info *request;
  20      struct passwd *pwd;
  21      struct passwd *getpwnam();
  22      char   *group;
  23 +    int    defaultgroup = 0;
  24
  25      if ((group = split_at(value, '.')) != 0)
  26         group_option(group, request);
  27 +    else
  28 +       defaultgroup = 1;
  29      if ((pwd = getpwnam(value)) == 0)
  30         tcpd_jump("unknown user: \"%s\"", value);
  31      endpwent();
  32
  33 -    if (dry_run == 0 && setuid(pwd->pw_uid))
  34 -       tcpd_jump("setuid(%s): %m", value);
  35 +    if (dry_run != 0) {
  36 +        if (setuid(pwd->pw_uid))
  37 +           tcpd_jump("setuid(%s): %m", value);
  38 +       if (defaultgroup) {
  39 +            if (setgid(pwd->pw_gid))
  40 +              tcpd_jump("setgid(%s): %m", value);
  41 +            if (initgroups(value, pwd->pw_gid))
  42 +              tcpd_jump("initgroups(%s): %m", value);
  43 +       }
  44 +    }
  45  }
  46
  47  /* umask_option - set file creation mask */
  48 diff -up tcp_wrappers_7.6/safe_finger.c.initgroups tcp_wrappers_7.6/safe_finger.c
  49 --- tcp_wrappers_7.6/safe_finger.c.initgroups   2011-08-12 05:54:06.068606291 +0200
  50 +++ tcp_wrappers_7.6/safe_finger.c      2011-08-12 05:55:34.835483785 +0200
  51 @@ -66,9 +66,11 @@ char  **argv;
  52      if (getuid() == 0 || geteuid() == 0) {
  53         if ((pwd = getpwnam(UNPRIV_NAME)) && pwd->pw_uid > 0) {
  54             setgid(pwd->pw_gid);
  55 +           initgroups(UNPRIV_NAME, pwd->pw_gid);
  56             setuid(pwd->pw_uid);
  57         } else {
  58             setgid(UNPRIV_UGID);
  59 +           setgroups(0, NULL);
  60             setuid(UNPRIV_UGID);
  61         }
  62      }