1 From a77f4c6668feb9c991a7985425ce949c5f323f09 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 03/34] PAM Support
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.
12 *** orig/servconf.c Mon Dec 5 17:23:03 2011
14 servconf.c | 14 ++++++++++++++
15 1 file changed, 14 insertions(+)
17 diff --git a/servconf.c b/servconf.c
18 index b19d30e..c6f4bdd 100644
21 @@ -199,7 +199,12 @@ fill_default_server_options(ServerOptions *options)
23 /* Portable-specific options */
24 if (options->use_pam == -1)
26 + /* use_pam should be always set to 1 on Solaris */
27 + options->use_pam = 1;
32 /* Standard Options */
33 if (options->protocol == SSH_PROTO_UNKNOWN)
34 @@ -1008,8 +1013,17 @@ process_server_config_line(ServerOptions *options, char *line,
36 /* Portable-specific options */
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);
43 + arg = strdelim(&cp);
46 intptr = &options->use_pam;
50 /* Standard Options */