View | Details | Raw Unified | Return to bug 1612 | Differences between
and this patch

Collapse All | Expand All

(-)authfd.c (-6 lines)
Lines 543-554 ssh_add_identity_constrained(Authenticat Link Here
543
	return decode_reply(type);
543
	return decode_reply(type);
544
}
544
}
545
545
546
int
547
ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment)
548
{
549
	return ssh_add_identity_constrained(auth, key, comment, 0, 0);
550
}
551
552
/*
546
/*
553
 * Removes an identity from the authentication server.  This call is not
547
 * Removes an identity from the authentication server.  This call is not
554
 * meant to be used by normal applications.
548
 * meant to be used by normal applications.
(-)authfd.h (-1 lines)
Lines 75-81 void ssh_close_authentication_connection Link Here
75
int	 ssh_get_num_identities(AuthenticationConnection *, int);
75
int	 ssh_get_num_identities(AuthenticationConnection *, int);
76
Key	*ssh_get_first_identity(AuthenticationConnection *, char **, int);
76
Key	*ssh_get_first_identity(AuthenticationConnection *, char **, int);
77
Key	*ssh_get_next_identity(AuthenticationConnection *, char **, int);
77
Key	*ssh_get_next_identity(AuthenticationConnection *, char **, int);
78
int	 ssh_add_identity(AuthenticationConnection *, Key *, const char *);
79
int	 ssh_add_identity_constrained(AuthenticationConnection *, Key *,
78
int	 ssh_add_identity_constrained(AuthenticationConnection *, Key *,
80
    const char *, u_int, u_int);
79
    const char *, u_int, u_int);
81
int	 ssh_remove_identity(AuthenticationConnection *, Key *);
80
int	 ssh_remove_identity(AuthenticationConnection *, Key *);
(-)ssh-add.c (-3 lines)
Lines 191-199 add_file(AuthenticationConnection *ac, c Link Here
191
		if (confirm != 0)
191
		if (confirm != 0)
192
			fprintf(stderr,
192
			fprintf(stderr,
193
			    "The user has to confirm each use of the key\n");
193
			    "The user has to confirm each use of the key\n");
194
	} else if (ssh_add_identity(ac, private, comment)) {
195
		fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
196
		ret = 0;
197
	} else {
194
	} else {
198
		fprintf(stderr, "Could not add identity: %s\n", filename);
195
		fprintf(stderr, "Could not add identity: %s\n", filename);
199
	}
196
	}

Return to bug 1612