1 #

     2 # To comply to the Solaris PAM policy, the UsePAM option is changed to be

     3 # always on and not configurable on Solaris.  This is for Solaris only, so we

     4 # will not contribute the changes to the upstream community.

     5 #

     6 *** orig/servconf.c	Mon Dec  5 17:23:03 2011

     7 --- new/servconf.c	Wed Dec  7 13:41:04 2011

     8 ***************

     9 *** 145,151 ****

    10 --- 145,156 ----

    11   {

    12   	/* Portable-specific options */

    13   	if (options->use_pam == -1)

    14 + #ifdef SET_USE_PAM

    15 + 		/* use_pam should be always set to 1 on Solaris */

    16 + 		options->use_pam = 1;

    17 + #else

    18   		options->use_pam = 0;

    19 + #endif

    20   

    21   	/* Standard Options */

    22   	if (options->protocol == SSH_PROTO_UNKNOWN)

    23 ***************

    24 *** 755,762 ****

    25 --- 760,776 ----

    26   	switch (opcode) {

    27   	/* Portable-specific options */

    28   	case sUsePAM:

    29 + #ifdef SET_USE_PAM

    30 + 		/* UsePAM is always on and not configurable on Solaris */

    31 + 		logit("%s line %d: ignoring UsePAM option value."

    32 + 		    " This option is always on.", filename, linenum);

    33 + 		while (arg)

    34 + 			arg = strdelim(&cp);

    35 + 		break; 

    36 + #else

    37   		intptr = &options->use_pam;

    38   		goto parse_flag;

    39 + #endif

    40   

    41   	/* Standard Options */

    42   	case sBadOption: