Changeset View
Changeset View
Standalone View
Standalone View
security/openssh-portable/files/patch-servconf.c
| Show All 23 Lines | |||||
| +#ifdef USE_PAM | +#ifdef USE_PAM | ||||
| + options->use_pam = 1; | + options->use_pam = 1; | ||||
| +#else | +#else | ||||
| + options->use_pam = 0; | + options->use_pam = 0; | ||||
| +#endif | +#endif | ||||
| if (options->pam_service_name == NULL) | if (options->pam_service_name == NULL) | ||||
| options->pam_service_name = xstrdup(SSHD_PAM_SERVICE); | options->pam_service_name = xstrdup(SSHD_PAM_SERVICE); | ||||
| @@ -339,7 +344,7 @@ fill_default_server_options(ServerOptions *options) | |||||
| if (options->print_lastlog == -1) | |||||
| options->print_lastlog = 1; | |||||
| if (options->x11_forwarding == -1) | |||||
| - options->x11_forwarding = 0; | |||||
| + options->x11_forwarding = 1; | |||||
| if (options->x11_display_offset == -1) | |||||
| options->x11_display_offset = 10; | |||||
| if (options->x11_use_localhost == -1) | |||||
| @@ -381,7 +386,11 @@ fill_default_server_options(ServerOptions *options) | @@ -381,7 +386,11 @@ fill_default_server_options(ServerOptions *options) | ||||
| if (options->gss_strict_acceptor == -1) | if (options->gss_strict_acceptor == -1) | ||||
| options->gss_strict_acceptor = 1; | options->gss_strict_acceptor = 1; | ||||
| if (options->password_authentication == -1) | if (options->password_authentication == -1) | ||||
| +#ifdef USE_PAM | +#ifdef USE_PAM | ||||
| + options->password_authentication = 0; | + options->password_authentication = 0; | ||||
| +#else | +#else | ||||
| options->password_authentication = 1; | options->password_authentication = 1; | ||||
| +#endif | +#endif | ||||
| if (options->kbd_interactive_authentication == -1) | if (options->kbd_interactive_authentication == -1) | ||||
| options->kbd_interactive_authentication = 1; | options->kbd_interactive_authentication = 1; | ||||
| if (options->permit_empty_passwd == -1) | if (options->permit_empty_passwd == -1) | ||||