Skip to content

Commit

Permalink
fix for cygwin 1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
ganaware committed Oct 14, 2011
1 parent db07b74 commit 78cf1c1
Show file tree
Hide file tree
Showing 12 changed files with 312 additions and 197 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*~
*.o
*.res
*.exe
*.tgz
35 changes: 19 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,25 @@ install: win-ssh-agent win-ssh-askpass
distrib: all
strip win-ssh-agent.exe
strip win-ssh-askpass.exe
tar cvzf ../win-ssh-askpass-1.05.tgz \
Makefile \
README.txt \
README-ja.txt \
agent.cpp \
agent.ico \
agent.rc \
agentrc.h \
askpass.cpp \
askpass.ico \
askpass.rc \
askpassrc.h \
misc.cpp \
misc.h \
win-ssh-agent.exe \
win-ssh-askpass.exe
tar cvzfC win-ssh-askpass-1.06.tgz .. \
win-ssh-askpass/.gitignore \
win-ssh-askpass/Makefile \
win-ssh-askpass/README-ja.txt \
win-ssh-askpass/README.txt \
win-ssh-askpass/agent.cpp \
win-ssh-askpass/agent.ico \
win-ssh-askpass/agent.manifest \
win-ssh-askpass/agent.rc \
win-ssh-askpass/agentrc.h \
win-ssh-askpass/askpass.cpp \
win-ssh-askpass/askpass.ico \
win-ssh-askpass/askpass.manifest \
win-ssh-askpass/askpass.rc \
win-ssh-askpass/askpassrc.h \
win-ssh-askpass/misc.cpp \
win-ssh-askpass/misc.h \
win-ssh-askpass/win-ssh-agent.exe \
win-ssh-askpass/win-ssh-askpass.exe

clean:
-$(RM) win-ssh-askpass.exe win-ssh-agent.exe
Expand Down
18 changes: 11 additions & 7 deletions README-ja.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@

�f�t�H���g�ł� -I - ���ÖقɎw�肳��Ă��܂��BFILENAME
�Ƃ��� - ���w�肷��ƁAssh-add �������Ȃ��Ŏ��s������
���Ɠ����t�@�C�� (~/.ssh/id_rsa, ~/.ssh/id_dsa
~/.ssh/identity) ���w�肵�����ƂɂȂ�܂��B
���Ɠ����t�@�C�� (~/.ssh/id_rsa, ~/.ssh/id_dsa,
~/.ssh/id_ecdsa, ~/.ssh/identity) ���w�肵�����ƂɂȂ�
�܂��B

--no-default-identity

Expand All @@ -100,14 +101,14 @@

-a BIND_ADDRESS

Bind the agent to the unix-domain socket bind_address. The
default is /tmp/ssh-XXXXXXXX/agent.<ppid>.
Bind the agent to the UNIX-domain socket bind_address. The
default is $TMPDIR/ssh-XXXXXXXXXX/agent.<ppid>.

-t LIFE

Set a default value for the maximum lifetime of identities
added to the agent. The lifetime may be specified in seconds
or in a time format specified in sshd(8). A lifetime
or in a time format specified in sshd_config(5). A lifetime
specified for an identity with ssh-add(1) overrides this
value. Without this option the default maximum lifetime is
forever.
Expand All @@ -126,12 +127,12 @@

5. �T�|�[�g

http://www.ganaware.jp/S/win-ssh-askpass/
https://github.com/ganaware/win-ssh-askpass


6. Copyright

Copyright (c) 2001-2006, TAGA Nayuta <nayuta@ganaware.jp>
Copyright (c) 2001-2006, 2011 TAGA Nayuta <nayuta@ganaware.jp>
All rights reserved.

Redistribution and use in source and binary forms, with or
Expand Down Expand Up @@ -169,6 +170,9 @@

7. ����

2011/10/14 1.06
* cygwin 1.7 �p�̏C��

2006/04/02 1.05
* DISPLAY �‹��ϐ��ɐݒ肷��l�� :0 �ɂ����B(�ȑO��
localhost:0 ������)
Expand Down
15 changes: 9 additions & 6 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
If - is specified as a FILENAME, the same identity
files are considerd to be specified as the ssh-add
with no-options uses. (i.e. ~/.ssh/id_rsa,
~/.ssh/id_dsa, ~/.ssh/identity)
~/.ssh/id_dsa, ~/.ssh/id_ecdsa, ~/.ssh/identity)

--no-default-identity

Expand All @@ -112,14 +112,14 @@

-a BIND_ADDRESS

Bind the agent to the unix-domain socket bind_address. The
default is /tmp/ssh-XXXXXXXX/agent.<ppid>.
Bind the agent to the UNIX-domain socket bind_address. The
default is $TMPDIR/ssh-XXXXXXXXXX/agent.<ppid>.

-t LIFE

Set a default value for the maximum lifetime of identities
added to the agent. The lifetime may be specified in seconds
or in a time format specified in sshd(8). A lifetime
or in a time format specified in sshd_config(5). A lifetime
specified for an identity with ssh-add(1) overrides this
value. Without this option the default maximum lifetime is
forever.
Expand All @@ -138,12 +138,12 @@

5. Support

http://www.ganaware.jp/S/win-ssh-askpass/
https://github.com/ganaware/win-ssh-askpass


6. Copyright

Copyright (c) 2001-2006, TAGA Nayuta <nayuta@ganaware.jp>
Copyright (c) 2001-2006, 2011, TAGA Nayuta <nayuta@ganaware.jp>
All rights reserved.

Redistribution and use in source and binary forms, with or
Expand Down Expand Up @@ -181,6 +181,9 @@

7. History

2011/10/14 1.06
* fix for cygwin 1.7

2006/04/02 1.05
* Now, win-ssh-agent set up an environment variable
DISPLAY to :0 instead of localhost:0.
Expand Down
Loading

0 comments on commit 78cf1c1

Please sign in to comment.