- Merge fixes from Debian patch from Phil Hands <phil@hands.com>

  - Allow setting of PAM service name through CFLAGS (SSHD_PAM_SERVICE)
  - Use vhangup to clean up Linux ttys
  - Force posix getopt processing on GNU libc systems

1 files changed, 4 insertions, 0 deletions

diff --git a/ssh-agent.c b/ssh-agent.c
index 5a265e6b8..c9a84a4a0 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -511,7 +511,11 @@ main(int ac, char **av)
                         __progname);
                 exit(1);
         }
+#ifdef __GNU_LIBRARY__
+        while ((ch = getopt(ac, av, "+cks")) != -1) {
+#else /* __GNU_LIBRARY__ */
         while ((ch = getopt(ac, av, "cks")) != -1) {
+#endif /* __GNU_LIBRARY__ */
                 switch (ch) {
                 case 'c':
                         if (s_flag)