- markus@cvs.openbsd.org 2002/01/29 14:27:57

     [ssh-add.c]
     exit 2 if no agent, exit 1 if list fails; debian#61078; ok djm@

diff --git a/ChangeLog b/ChangeLog
index f99ab9621d7e7592135c13f2e17108eae5afa284..6724cd18a08ddb1a4c5721e7d56a4286dd46257a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@
    - stevesk@cvs.openbsd.org 2002/01/27 18:08:17
      [ssh.c]
      handle simple case to identify FamilyLocal display; ok markus@
+   - markus@cvs.openbsd.org 2002/01/29 14:27:57
+     [ssh-add.c]
+     exit 2 if no agent, exit 1 if list fails; debian#61078; ok djm@
 
 20020130
  - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@

diff --git a/ssh-add.c b/ssh-add.c
index 6d79357cce79ced05790b5a0e879ac07258b2096..b057a089205b09f71d3843a04e3c9fddf2ebb420 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.49 2001/12/24 07:29:43 deraadt Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.50 2002/01/29 14:27:57 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -187,7 +187,7 @@ update_card(AuthenticationConnection *ac, int add, const char *id)
        }
 }
 
-static void
+static int
 list_identities(AuthenticationConnection *ac, int do_fp)
 {
        Key *key;
@@ -215,8 +215,11 @@ list_identities(AuthenticationConnection *ac, int do_fp)
                        xfree(comment);
                }
        }
-       if (!had_identities)
+       if (!had_identities) {
                printf("The agent has no identities.\n");
+               return -1;
+       }
+       return 0;
 }
 
 static int
@@ -266,13 +269,14 @@ main(int argc, char **argv)
        ac = ssh_get_authentication_connection();
        if (ac == NULL) {
                fprintf(stderr, "Could not open a connection to your authentication agent.\n");
-               exit(1);
+               exit(2);
        }
        while ((ch = getopt(argc, argv, "lLdDe:s:")) != -1) {
                switch (ch) {
                case 'l':
                case 'L':
-                       list_identities(ac, ch == 'l' ? 1 : 0);
+                       if (list_identities(ac, ch == 'l' ? 1 : 0) == -1)
+                               ret = 1;
                        goto done;
                        break;
                case 'd':