summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in1
-rw-r--r--openssh.spec6
-rw-r--r--ssh-agent.c4
4 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index df11b662a..047c5b70b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
119991110
2 - Merged several minor fixed:
3 - ssh-agent commandline parsing
4 - RPM spec file now installs ssh setuid root
5 - Makefile creates libdir
6
119991109 719991109
2 - Autodetection of SSL/Crypto library location via autoconf 8 - Autodetection of SSL/Crypto library location via autoconf
3 - Fixed location of ssh-askpass to follow autoconf 9 - Fixed location of ssh-askpass to follow autoconf
diff --git a/Makefile.in b/Makefile.in
index e76d74158..0d239e882 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,6 +64,7 @@ install: all
64 install -d $(mandir) 64 install -d $(mandir)
65 install -d $(mandir)/man1 65 install -d $(mandir)/man1
66 install -d $(mandir)/man8 66 install -d $(mandir)/man8
67 install -d $(libdir)
67 install -d $(libdir)/ssh 68 install -d $(libdir)/ssh
68 install -s -c ssh $(bindir)/ssh 69 install -s -c ssh $(bindir)/ssh
69 ln -sf ssh $(bindir)/slogin 70 ln -sf ssh $(bindir)/slogin
diff --git a/openssh.spec b/openssh.spec
index 113a90cfa..dc063e942 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -124,18 +124,18 @@ fi
124%defattr(-,root,root) 124%defattr(-,root,root)
125%doc COPYING.Ylonen ChangeLog ChangeLog.Ylonen OVERVIEW 125%doc COPYING.Ylonen ChangeLog ChangeLog.Ylonen OVERVIEW
126%doc README README.Ylonen 126%doc README README.Ylonen
127%attr(0755,root,root) /usr/bin/ssh 127%attr(4755,root,root) /usr/bin/ssh
128%attr(0755,root,root) /usr/bin/ssh-agent 128%attr(0755,root,root) /usr/bin/ssh-agent
129%attr(0755,root,root) /usr/bin/ssh-keygen 129%attr(0755,root,root) /usr/bin/ssh-keygen
130%attr(0755,root,root) /usr/bin/ssh-add 130%attr(0755,root,root) /usr/bin/ssh-add
131%attr(0755,root,root) /usr/bin/scp 131%attr(0755,root,root) /usr/bin/scp
132%attr(0755,root,root) /usr/bin/slogin 132%attr(-,root,root) /usr/bin/slogin
133%attr(0644,root,root) /usr/man/man1/ssh.1 133%attr(0644,root,root) /usr/man/man1/ssh.1
134%attr(0644,root,root) /usr/man/man1/ssh-agent.1 134%attr(0644,root,root) /usr/man/man1/ssh-agent.1
135%attr(0644,root,root) /usr/man/man1/ssh-keygen.1 135%attr(0644,root,root) /usr/man/man1/ssh-keygen.1
136%attr(0644,root,root) /usr/man/man1/ssh-add.1 136%attr(0644,root,root) /usr/man/man1/ssh-add.1
137%attr(0644,root,root) /usr/man/man1/scp.1 137%attr(0644,root,root) /usr/man/man1/scp.1
138%attr(0644,root,root) /usr/man/man1/slogin.1 138%attr(-,root,root) /usr/man/man1/slogin.1
139%attr(0644,root,root) %config /etc/ssh/ssh_config 139%attr(0644,root,root) %config /etc/ssh/ssh_config
140 140
141%files server 141%files server
diff --git a/ssh-agent.c b/ssh-agent.c
index 96bd021eb..7f4543e92 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -531,7 +531,11 @@ main(int ac, char **av)
531 exit(1); 531 exit(1);
532 } 532 }
533 533
534#if defined(__GNU_LIBRARY__)
535 while ((ch = getopt(ac, av, "+cks")) != -1)
536#else
534 while ((ch = getopt(ac, av, "cks")) != -1) 537 while ((ch = getopt(ac, av, "cks")) != -1)
538#endif /* defined(__GNU_LIBRARY__) */
535 { 539 {
536 switch (ch) 540 switch (ch)
537 { 541 {