From b77870fa7341d95024e55a116a3454e9bfe2f21e Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 10 Nov 1999 12:48:08 +1100
Subject: [PATCH]  - Merged several minor fixed:    - ssh-agent commandline
 parsing    - RPM spec file now installs ssh setuid root    - Makefile creates
 libdir

---
 ChangeLog    | 6 ++++++
 Makefile.in  | 1 +
 openssh.spec | 6 +++---
 ssh-agent.c  | 4 ++++
 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 @@
+19991110
+ - Merged several minor fixed:
+   - ssh-agent commandline parsing
+   - RPM spec file now installs ssh setuid root
+   - Makefile creates libdir
+
 19991109
  - Autodetection of SSL/Crypto library location via autoconf
  - 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
 	install -d $(mandir)
 	install -d $(mandir)/man1
 	install -d $(mandir)/man8
+	install -d $(libdir)
 	install -d $(libdir)/ssh
 	install -s -c ssh $(bindir)/ssh
 	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
 %defattr(-,root,root)
 %doc COPYING.Ylonen ChangeLog ChangeLog.Ylonen OVERVIEW 
 %doc README README.Ylonen
-%attr(0755,root,root) /usr/bin/ssh
+%attr(4755,root,root) /usr/bin/ssh
 %attr(0755,root,root) /usr/bin/ssh-agent
 %attr(0755,root,root) /usr/bin/ssh-keygen
 %attr(0755,root,root) /usr/bin/ssh-add
 %attr(0755,root,root) /usr/bin/scp
-%attr(0755,root,root) /usr/bin/slogin
+%attr(-,root,root) /usr/bin/slogin
 %attr(0644,root,root) /usr/man/man1/ssh.1
 %attr(0644,root,root) /usr/man/man1/ssh-agent.1
 %attr(0644,root,root) /usr/man/man1/ssh-keygen.1
 %attr(0644,root,root) /usr/man/man1/ssh-add.1
 %attr(0644,root,root) /usr/man/man1/scp.1
-%attr(0644,root,root) /usr/man/man1/slogin.1
+%attr(-,root,root) /usr/man/man1/slogin.1
 %attr(0644,root,root) %config /etc/ssh/ssh_config
 
 %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)
     exit(1);
   }
 
+#if defined(__GNU_LIBRARY__)
+  while ((ch = getopt(ac, av, "+cks")) != -1)
+#else 
   while ((ch = getopt(ac, av, "cks")) != -1)
+#endif /* defined(__GNU_LIBRARY__) */
     {
       switch (ch)
 	{