[BACK]Return to ssh-add.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-add.c between version 1.120 and 1.121

version 1.120, 2015/02/21 21:46:57 version 1.121, 2015/03/25 19:29:58
Line 156 
Line 156 
 {  {
         int ret = -1;          int ret = -1;
   
         if (ssh_remove_all_identities(agent_fd, 1) == 0)          if (ssh_remove_all_identities(agent_fd, 2) == 0)
                 ret = 0;                  ret = 0;
         /* ignore error-code for ssh2 */          /* ignore error-code for ssh1 */
         /* XXX revisit */          ssh_remove_all_identities(agent_fd, 1);
         ssh_remove_all_identities(agent_fd, 2);  
   
         if (ret == 0)          if (ret == 0)
                 fprintf(stderr, "All identities removed.\n");                  fprintf(stderr, "All identities removed.\n");
Line 356 
Line 355 
 list_identities(int agent_fd, int do_fp)  list_identities(int agent_fd, int do_fp)
 {  {
         char *fp;          char *fp;
         int version, r, had_identities = 0;          int r, had_identities = 0;
         struct ssh_identitylist *idlist;          struct ssh_identitylist *idlist;
         size_t i;          size_t i;
   #ifdef WITH_SSH1
           int version = 1;
   #else
           int version = 2;
   #endif
   
         for (version = 1; version <= 2; version++) {          for (; version <= 2; version++) {
                 if ((r = ssh_fetch_identitylist(agent_fd, version,                  if ((r = ssh_fetch_identitylist(agent_fd, version,
                     &idlist)) != 0) {                      &idlist)) != 0) {
                         if (r != SSH_ERR_AGENT_NO_IDENTITIES)                          if (r != SSH_ERR_AGENT_NO_IDENTITIES)
Legend:
Removed from v.1.120  
changed lines
  Added in v.1.121