summaryrefslogtreecommitdiff
path: root/auth.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-15 08:51:05 +1000
committerDamien Miller <djm@mindrot.org>2011-05-15 08:51:05 +1000
commit7c1b2c4ea8a5d06908dda3f8e406b902b81fe905 (patch)
treed4feec6013425aa759cb0e0d4863de23c8cc2997 /auth.c
parent3219824f2d8b0ea1711818745b046931ffcd3918 (diff)
- djm@cvs.openbsd.org 2011/05/11 04:47:06
[auth.c auth.h auth2-pubkey.c pathnames.h servconf.c servconf.h] remove support for authorized_keys2; it is a relic from the early days of protocol v.2 support and has been undocumented for many years; ok markus@
Diffstat (limited to 'auth.c')
-rw-r--r--auth.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/auth.c b/auth.c
index 33680b91b..be78f1a28 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.c,v 1.91 2010/11/29 23:45:51 djm Exp $ */ 1/* $OpenBSD: auth.c,v 1.92 2011/05/11 04:47:06 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -361,12 +361,6 @@ authorized_keys_file(struct passwd *pw)
361} 361}
362 362
363char * 363char *
364authorized_keys_file2(struct passwd *pw)
365{
366 return expand_authorized_keys(options.authorized_keys_file2, pw);
367}
368
369char *
370authorized_principals_file(struct passwd *pw) 364authorized_principals_file(struct passwd *pw)
371{ 365{
372 if (options.authorized_principals_file == NULL) 366 if (options.authorized_principals_file == NULL)