From 0b9b897495b16fe4efeb8060a97c00bbbab28c0d Mon Sep 17 00:00:00 2001 From: oracle Date: Mon, 3 Aug 2015 14:34:19 -0700 Subject: [PATCH 02/34] PAM Support # # To comply to the Solaris PAM policy, the UsePAM option is changed to be # always on and not configurable on Solaris. This is for Solaris only, so we # will not contribute the changes to the upstream community. # *** orig/servconf.c Mon Dec 5 17:23:03 2011 diff -wpruN --no-dereference '--exclude=*.orig' a~/servconf.c a/servconf.c --- a~/servconf.c 1970-01-01 00:00:00 +++ a/servconf.c 1970-01-01 00:00:00 @@ -297,7 +297,12 @@ fill_default_server_options(ServerOption /* Portable-specific options */ if (options->use_pam == -1) +#ifdef SET_USE_PAM + /* use_pam should be always set to 1 on Solaris */ + options->use_pam = 1; +#else options->use_pam = 0; +#endif if (options->pam_service_name == NULL) options->pam_service_name = xstrdup(SSHD_PAM_SERVICE); @@ -1345,8 +1350,17 @@ process_server_config_line_depth(ServerO switch (opcode) { /* Portable-specific options */ case sUsePAM: +#ifdef SET_USE_PAM + /* UsePAM is always on and not configurable on Solaris */ + logit("%s line %d: ignoring UsePAM option value." + " This option is always on.", filename, linenum); + while (arg) + arg = strdelim(&str); + break; +#else intptr = &options->use_pam; goto parse_flag; +#endif case sPAMServiceName: charptr = &options->pam_service_name; arg = argv_next(&ac, &av);