summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-02-15 15:33:17 +1100
committerDamien Miller <djm@mindrot.org>2001-02-15 15:33:17 +1100
commit09214548336357cccc2c01459ea3f42ff436ad9f (patch)
tree0e33f4427951272fdf99cd4d63b32b234619aaff
parent0a7e354f646169bd53ee85ab72f17ccf5ad81570 (diff)
- (djm) Move to Jim's 1.2.0 X11 askpass program
-rw-r--r--ChangeLog7
-rw-r--r--contrib/caldera/openssh.spec2
-rw-r--r--contrib/redhat/openssh.spec2
3 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a0b9cb30..ccf30971c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,8 +36,9 @@
36 [sftp-client.c sftp-int.c sftp.1] 36 [sftp-client.c sftp-int.c sftp.1]
37 Fix and document 'preserve modes & times' option ('-p' flag in sftp); 37 Fix and document 'preserve modes & times' option ('-p' flag in sftp);
38 ok markus@ 38 ok markus@
39 - replaced PATH_MAX in sftp-int.c w/ MAXPATHLEN. 39 - (bal) replaced PATH_MAX in sftp-int.c w/ MAXPATHLEN.
40 40 - (djm) Move to Jim's 1.2.0 X11 askpass program
41
4120010214 4220010214
42 - (djm) Don't try to close PAM session or delete credentials if the 43 - (djm) Don't try to close PAM session or delete credentials if the
43 session has not been open or credentials not set. Based on patch from 44 session has not been open or credentials not set. Based on patch from
@@ -3965,4 +3966,4 @@
3965 - Wrote replacements for strlcpy and mkdtemp 3966 - Wrote replacements for strlcpy and mkdtemp
3966 - Released 1.0pre1 3967 - Released 1.0pre1
3967 3968
3968$Id: ChangeLog,v 1.770 2001/02/15 03:50:49 mouring Exp $ 3969$Id: ChangeLog,v 1.771 2001/02/15 04:33:17 djm Exp $
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 57a52b49f..5fdf47e79 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -2,7 +2,7 @@
2%define oversion 2.3.2p1 2%define oversion 2.3.2p1
3 3
4# Version of ssh-askpass 4# Version of ssh-askpass
5%define aversion 1.1.1 5%define aversion 1.2.0
6 6
7# Do we want to disable building of x11-askpass? (1=yes 0=no) 7# Do we want to disable building of x11-askpass? (1=yes 0=no)
8%define no_x11_askpass 0 8%define no_x11_askpass 0
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index dc0954abb..4e49d9cff 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -2,7 +2,7 @@
2%define oversion 2.3.2p1 2%define oversion 2.3.2p1
3 3
4# Version of ssh-askpass 4# Version of ssh-askpass
5%define aversion 1.1.1 5%define aversion 1.2.0
6 6
7# Do we want to disable building of x11-askpass? (1=yes 0=no) 7# Do we want to disable building of x11-askpass? (1=yes 0=no)
8%define no_x11_askpass 0 8%define no_x11_askpass 0