[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.112 and 1.113

version 1.112, 2014/07/03 03:15:01 version 1.113, 2014/07/09 14:15:56
Line 199 
Line 199 
         if ((r = sshkey_parse_private_fileblob(&keyblob, "", filename,          if ((r = sshkey_parse_private_fileblob(&keyblob, "", filename,
             &private, &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE)              &private, &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE)
                 fatal("Cannot parse %s: %s", filename, ssh_err(r));                  fatal("Cannot parse %s: %s", filename, ssh_err(r));
         if (comment == NULL)  
                 comment = xstrdup(filename);  
         /* try last */          /* try last */
         if (private == NULL && pass != NULL) {          if (private == NULL && pass != NULL) {
                 if ((r = sshkey_parse_private_fileblob(&keyblob, pass, filename,                  if ((r = sshkey_parse_private_fileblob(&keyblob, pass, filename,
Line 208 
Line 206 
                     r != SSH_ERR_KEY_WRONG_PASSPHRASE)                      r != SSH_ERR_KEY_WRONG_PASSPHRASE)
                         fatal("Cannot parse %s: %s", filename, ssh_err(r));                          fatal("Cannot parse %s: %s", filename, ssh_err(r));
         }          }
           if (comment == NULL)
                   comment = xstrdup(filename);
         if (private == NULL) {          if (private == NULL) {
                 /* clear passphrase since it did not work */                  /* clear passphrase since it did not work */
                 clear_pass();                  clear_pass();
Legend:
Removed from v.1.112  
changed lines
  Added in v.1.113