tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- canacar@cvs.openbsd.org 2007/09/25 23:48:57 

[ssh-agent.c]
     When adding a key that already exists, update the properties
     (time, confirm, comment) instead of discarding them. ok djm@ markus@
This commit is contained in:
Damien Miller 2007-10-26 14:25:31 +10:00
parent 733124b5dd
commit 4c7728c651
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -16,6 +16,10 @@
These options have been in use for some years; These options have been in use for some years;
ok markus@ "no objection" millert@ ok markus@ "no objection" millert@
(NB. RCD ID sync only for portable) (NB. RCD ID sync only for portable)
- canacar@cvs.openbsd.org 2007/09/25 23:48:57
[ssh-agent.c]
When adding a key that already exists, update the properties
(time, confirm, comment) instead of discarding them. ok djm@ markus@
20070927 20070927
- (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if
@ -3287,4 +3291,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4763 2007/10/26 04:25:12 djm Exp $ $Id: ChangeLog,v 1.4764 2007/10/26 04:25:31 djm Exp $

15
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.156 2007/09/09 11:38:01 sobrado Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.157 2007/09/25 23:48:57 canacar Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -457,6 +457,7 @@ static void
process_add_identity(SocketEntry *e, int version) process_add_identity(SocketEntry *e, int version)
{ {
Idtab *tab = idtab_lookup(version); Idtab *tab = idtab_lookup(version);
Identity *id;
int type, success = 0, death = 0, confirm = 0; int type, success = 0, death = 0, confirm = 0;
char *type_name, *comment; char *type_name, *comment;
Key *k = NULL; Key *k = NULL;
@ -539,19 +540,19 @@ process_add_identity(SocketEntry *e, int version)
} }
if (lifetime && !death) if (lifetime && !death)
death = time(NULL) + lifetime; death = time(NULL) + lifetime;
if (lookup_identity(k, version) == NULL) { if ((id = lookup_identity(k, version)) == NULL) {
Identity *id = xmalloc(sizeof(Identity)); id = xmalloc(sizeof(Identity));
id->key = k; id->key = k;
id->comment = comment;
id->death = death;
id->confirm = confirm;
TAILQ_INSERT_TAIL(&tab->idlist, id, next); TAILQ_INSERT_TAIL(&tab->idlist, id, next);
/* Increment the number of identities. */ /* Increment the number of identities. */
tab->nentries++; tab->nentries++;
} else { } else {
key_free(k); key_free(k);
xfree(comment); xfree(id->comment);
} }
id->comment = comment;
id->death = death;
id->confirm = confirm;
send: send:
buffer_put_int(&e->output, 1); buffer_put_int(&e->output, 1);
buffer_put_char(&e->output, buffer_put_char(&e->output,