From bcc50d816187fa9a03907ac1f3a52f04a52e10d1 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Thu, 21 May 2015 06:43:30 +0000 Subject: 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 --- servconf.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'servconf.h') diff --git a/servconf.h b/servconf.h index 38520f47..dc2a5f6a 100644 --- a/servconf.h +++ b/servconf.h @@ -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 @@ -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); \ -- cgit v1.2.1