merge 5.6p1

1 files changed, 2 insertions, 1 deletions

diff --git a/servconf.h b/servconf.h
index 083789334..ef7cc214a 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.92 2010/03/04 10:36:03 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.93 2010/05/07 11:30:30 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -159,6 +159,7 @@ typedef struct {
         char   *chroot_directory;
         char   *revoked_keys_file;
         char   *trusted_user_ca_keys;
+        char   *authorized_principals_file;
 }       ServerOptions;
 
 void     initialize_server_options(ServerOptions *);