Attachment 1550 Details for Bug 1490 – do not display disabled options for -T

[patch] do not display disabled options for -T

conftest.diff (text/plain), 1.42 KB, created by Damien Miller on 2008-07-23 17:25:35 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2008-07-23 17:25:35 AEST

Size: 1.42 KB

patch

obsolete

>Index: servconf.c
>===================================================================
>RCS file: /var/cvs/openssh/servconf.c,v
>retrieving revision 1.177
>diff -u -p -r1.177 servconf.c
>--- servconf.c	4 Jul 2008 03:51:12 -0000	1.177
>+++ servconf.c	23 Jul 2008 07:21:49 -0000
>@@ -1544,6 +1544,9 @@ dump_config(ServerOptions *o)
> 	}
> 
> 	/* integer arguments */
>+#ifdef USE_PAM
>+	dump_cfg_int(sUsePAM, o->use_pam);
>+#endif
> 	dump_cfg_int(sServerKeyBits, o->server_key_bits);
> 	dump_cfg_int(sLoginGraceTime, o->login_grace_time);
> 	dump_cfg_int(sKeyRegenerationTime, o->key_regeneration_time);
>@@ -1562,12 +1565,18 @@ dump_config(ServerOptions *o)
> 	    o->hostbased_uses_name_from_packet_only);
> 	dump_cfg_fmtint(sRSAAuthentication, o->rsa_authentication);
> 	dump_cfg_fmtint(sPubkeyAuthentication, o->pubkey_authentication);
>+#ifdef KRB5
> 	dump_cfg_fmtint(sKerberosAuthentication, o->kerberos_authentication);
> 	dump_cfg_fmtint(sKerberosOrLocalPasswd, o->kerberos_or_local_passwd);
> 	dump_cfg_fmtint(sKerberosTicketCleanup, o->kerberos_ticket_cleanup);
>+# ifdef USE_AFS
> 	dump_cfg_fmtint(sKerberosGetAFSToken, o->kerberos_get_afs_token);
>+# endif
>+#endif
>+#ifdef GSSAPI
> 	dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
> 	dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
>+#endif
> 	dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
> 	dump_cfg_fmtint(sKbdInteractiveAuthentication,
> 	    o->kbd_interactive_authentication);

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 1490: 1548 | 1549 | 1550