summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-02-24 17:17:58 +1100
committerDamien Miller <djm@mindrot.org>2010-02-24 17:17:58 +1100
commita80f1404bb8f9164f65daacd246231e7a476d7b9 (patch)
treeef72ecb02cf8c4dc88a201af8571854b0f99f0b7
parent05abd2c96876b959f4a2f71671652064fcedda0d (diff)
- djm@cvs.openbsd.org 2010/02/11 20:37:47
[pathnames.h] correct comment
-rw-r--r--ChangeLog4
-rw-r--r--pathnames.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ac08efa4b..27a99d72f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
120100224 120100224
2 - (djm) [pkcs11.h ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c] 2 - (djm) [pkcs11.h ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c]
3 [ssh-pkcs11.h] Add $OpenBSD$ RCS idents so we can sync portable 3 [ssh-pkcs11.h] Add $OpenBSD$ RCS idents so we can sync portable
4 - (djm) OpenBSD CVS Sync
5 - djm@cvs.openbsd.org 2010/02/11 20:37:47
6 [pathnames.h]
7 correct comment
4 8
520100212 920100212
6 - (djm) OpenBSD CVS Sync 10 - (djm) OpenBSD CVS Sync
diff --git a/pathnames.h b/pathnames.h
index 32b9e065b..9e50950fe 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: pathnames.h,v 1.18 2010/02/08 10:50:20 markus Exp $ */ 1/* $OpenBSD: pathnames.h,v 1.19 2010/02/11 20:37:47 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -125,7 +125,7 @@
125#define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign" 125#define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign"
126#endif 126#endif
127 127
128/* Location of ssh-keysign for hostbased authentication */ 128/* Location of ssh-pkcs11-helper to support keys in tokens */
129#ifndef _PATH_SSH_PKCS11_HELPER 129#ifndef _PATH_SSH_PKCS11_HELPER
130#define _PATH_SSH_PKCS11_HELPER "/usr/libexec/ssh-pkcs11-helper" 130#define _PATH_SSH_PKCS11_HELPER "/usr/libexec/ssh-pkcs11-helper"
131#endif 131#endif