- markus@cvs.openbsd.org 2001/06/26 04:07:06

     [ssh-agent.1 ssh-agent.c]
     add debug flag

diff --git a/ChangeLog b/ChangeLog
index 2ecf10d54ed04e17fe53f23651017f0bd2359c12..e7f4accedfafd4d54479270da9a00c7a24bbdc69 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
    - markus@cvs.openbsd.org 2001/06/26 02:47:07
      [ssh-keygen.c]
      allow loading a private RSA key to a cyberflex card.
+   - markus@cvs.openbsd.org 2001/06/26 04:07:06
+     [ssh-agent.1 ssh-agent.c]
+     add debug flag
 
 20010629
  - (bal) Removed net_aton() since we don't use it any more

diff --git a/ssh-agent.1 b/ssh-agent.1
index 1d214698d723b84c8d5661ac239241489cf7455b..0aecfc0f062878b79c261c21d4e9badafe67a8e0 100644 (file)
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.24 2001/04/10 09:13:21 itojun Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.25 2001/06/26 04:07:06 markus Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -48,6 +48,8 @@
 .Op Fl c Li | Fl s
 .Nm ssh-agent
 .Fl k
+.Nm ssh-agent
+.Fl d
 .Sh DESCRIPTION
 .Nm
 is a program to hold private keys used for public key authentication
@@ -80,6 +82,10 @@ does not look like it's a csh style of shell.
 Kill the current agent (given by the
 .Ev SSH_AGENT_PID
 environment variable).
+.It Fl d
+Debug mode.  When this option is specified
+.Nm
+will fork.
 .El
 .Pp
 If a commandline is given, this is executed as a subprocess of the agent.

diff --git a/ssh-agent.c b/ssh-agent.c
index 54b375fcec8de24d05a2f76afa66e093292c38b7..573efaf89148922c941ea718a53e8bb244db53f3 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ssh-agent.c,v 1.56 2001/06/25 08:25:40 markus Exp $   */
+/*     $OpenBSD: ssh-agent.c,v 1.57 2001/06/26 04:07:06 markus Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.56 2001/06/25 08:25:40 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.57 2001/06/26 04:07:06 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -706,7 +706,7 @@ usage(void)
 int
 main(int ac, char **av)
 {
-       int sock, c_flag = 0, k_flag = 0, s_flag = 0, ch;
+       int sock, c_flag = 0, d_flag = 0, k_flag = 0, s_flag = 0, ch;
        struct sockaddr_un sunaddr;
 #ifdef HAVE_SETRLIMIT
        struct rlimit rlim;
@@ -726,9 +726,9 @@ main(int ac, char **av)
        seed_rng();
 
 #ifdef __GNU_LIBRARY__
-       while ((ch = getopt(ac, av, "+cks")) != -1) {
+       while ((ch = getopt(ac, av, "+cdks")) != -1) {
 #else /* __GNU_LIBRARY__ */
-       while ((ch = getopt(ac, av, "cks")) != -1) {
+       while ((ch = getopt(ac, av, "cdks")) != -1) {
 #endif /* __GNU_LIBRARY__ */
                switch (ch) {
                case 'c':
@@ -744,6 +744,11 @@ main(int ac, char **av)
                                usage();
                        s_flag++;
                        break;
+               case 'd':
+                       if (d_flag)
+                               usage();
+                       d_flag++;
+                       break;
                default:
                        usage();
                }
@@ -751,10 +756,10 @@ main(int ac, char **av)
        ac -= optind;
        av += optind;
 
-       if (ac > 0 && (c_flag || k_flag || s_flag))
+       if (ac > 0 && (c_flag || k_flag || s_flag || d_flag))
                usage();
 
-       if (ac == 0 && !c_flag && !k_flag && !s_flag) {
+       if (ac == 0 && !c_flag && !k_flag && !s_flag && !d_flag) {
                shell = getenv("SHELL");
                if (shell != NULL && strncmp(shell + strlen(shell) - 3, "csh", 3) == 0)
                        c_flag = 1;
@@ -827,6 +832,14 @@ main(int ac, char **av)
         * Fork, and have the parent execute the command, if any, or present
         * the socket data.  The child continues as the authentication agent.
         */
+       if (d_flag) {
+               log_init(__progname, SYSLOG_LEVEL_DEBUG1, SYSLOG_FACILITY_AUTH, 1);
+               format = c_flag ? "setenv %s %s;\n" : "%s=%s; export %s;\n";
+               printf(format, SSH_AUTHSOCKET_ENV_NAME, socket_name,
+                   SSH_AUTHSOCKET_ENV_NAME);
+               printf("echo Agent pid %d;\n", parent_pid);
+               goto skip;
+       }
        pid = fork();
        if (pid == -1) {
                perror("fork");
@@ -869,6 +882,8 @@ main(int ac, char **av)
                perror("setsid");
                cleanup_exit(1);
        }
+
+skip:
        if (atexit(cleanup_socket) < 0) {
                perror("atexit");
                cleanup_exit(1);
@@ -879,8 +894,10 @@ main(int ac, char **av)
                alarm(10);
        }
        idtab_init();
-       signal(SIGINT, SIG_IGN);
-       signal(SIGPIPE, SIG_IGN);
+       if (!d_flag) {
+               signal(SIGINT, SIG_IGN);
+               signal(SIGPIPE, SIG_IGN);
+       }
        signal(SIGHUP, cleanup_handler);
        signal(SIGTERM, cleanup_handler);
        while (1) {