diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-05-21 06:43:30 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-05-21 16:45:46 +1000 |
| commit | bcc50d816187fa9a03907ac1f3a52f04a52e10d1 (patch) | |
| tree | 7fee32fe8c063a24674a37aad34e4b381d995ae5 /servconf.h | |
| parent | 24232a3e5ab467678a86aa67968bbb915caffed4 (diff) | |
| download | openssh-git-bcc50d816187fa9a03907ac1f3a52f04a52e10d1.tar.gz | |
upstream commit
add AuthorizedPrincipalsCommand that allows getting
authorized_principals from a subprocess rather than a file, which is quite
useful in deployments with large userbases
feedback and ok markus@
Upstream-ID: aa1bdac7b16fc6d2fa3524ef08f04c7258d247f6
Diffstat (limited to 'servconf.h')
| -rw-r--r-- | servconf.h | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.117 2015/04/29 03:48:56 dtucker Exp $ */ +/* $OpenBSD: servconf.h,v 1.118 2015/05/21 06:43:31 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -178,9 +178,11 @@ typedef struct { char *chroot_directory; char *revoked_keys_file; char *trusted_user_ca_keys; - char *authorized_principals_file; char *authorized_keys_command; char *authorized_keys_command_user; + char *authorized_principals_file; + char *authorized_principals_command; + char *authorized_principals_command_user; int64_t rekey_limit; int rekey_interval; @@ -216,9 +218,11 @@ struct connection_info { M_CP_STROPT(banner); \ M_CP_STROPT(trusted_user_ca_keys); \ M_CP_STROPT(revoked_keys_file); \ - M_CP_STROPT(authorized_principals_file); \ M_CP_STROPT(authorized_keys_command); \ M_CP_STROPT(authorized_keys_command_user); \ + M_CP_STROPT(authorized_principals_file); \ + M_CP_STROPT(authorized_principals_command); \ + M_CP_STROPT(authorized_principals_command_user); \ M_CP_STROPT(hostbased_key_types); \ M_CP_STROPT(pubkey_key_types); \ M_CP_STRARRAYOPT(authorized_keys_files, num_authkeys_files); \ |