1 From 26f612877a2a9db59657a74d178079f92f01eb97 Mon Sep 17 00:00:00 2001
   2 From: oracle <solaris@oracle.com>
   3 Date: Mon, 3 Aug 2015 14:34:19 -0700
   4 Subject: [PATCH 02/30] PAM Support
   5 
   6 #
   7 # To comply to the Solaris PAM policy, the UsePAM option is changed to be
   8 # always on and not configurable on Solaris.  This is for Solaris only, so we
   9 # will not contribute the changes to the upstream community.
  10 #
  11 
  12 *** orig/servconf.c     Mon Dec  5 17:23:03 2011
  13 ---
  14  servconf.c | 14 ++++++++++++++
  15  1 file changed, 14 insertions(+)
  16 
  17 diff --git a/servconf.c b/servconf.c
  18 index 6c7a91e..5e8ed97 100644
  19 --- a/servconf.c
  20 +++ b/servconf.c
  21 @@ -185,7 +185,12 @@ fill_default_server_options(ServerOptions *options)
  22  
  23         /* Portable-specific options */
  24         if (options->use_pam == -1)
  25 +#ifdef SET_USE_PAM
  26 +               /* use_pam should be always set to 1 on Solaris */
  27 +               options->use_pam = 1;
  28 +#else
  29                 options->use_pam = 0;
  30 +#endif
  31  
  32         /* Standard Options */
  33         if (options->protocol == SSH_PROTO_UNKNOWN)
  34 @@ -997,8 +1002,17 @@ process_server_config_line(ServerOptions *options, char *line,
  35         switch (opcode) {
  36         /* Portable-specific options */
  37         case sUsePAM:
  38 +#ifdef SET_USE_PAM
  39 +               /* UsePAM is always on and not configurable on Solaris */
  40 +               logit("%s line %d: ignoring UsePAM option value."
  41 +                   " This option is always on.", filename, linenum);
  42 +               while (arg)
  43 +                       arg = strdelim(&cp);
  44 +               break; 
  45 +#else
  46                 intptr = &options->use_pam;
  47                 goto parse_flag;
  48 +#endif
  49  
  50         /* Standard Options */
  51         case sBadOption:
  52 -- 
  53 2.3.2 (Apple Git-55)
  54