diff options
author | Jan Cholasta <jcholast@redhat.com> | 2012-03-14 07:54:16 -0400 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-03-15 14:18:18 -0400 |
commit | 0a5a81f3820158641e6472497bb4c2d829ae4803 (patch) | |
tree | 584d33b185eb25b9a254a3780206e0e2a0175b14 /src/sss_client/ssh/sss_ssh_client.c | |
parent | 2a30a449a87a2c400af5fea608269ef51dd4c1d1 (diff) | |
download | sssd-0a5a81f3820158641e6472497bb4c2d829ae4803.tar.gz sssd-0a5a81f3820158641e6472497bb4c2d829ae4803.tar.xz sssd-0a5a81f3820158641e6472497bb4c2d829ae4803.zip |
SSH: Allow clients to explicitly specify host alias
This change removes the need to canonicalize host names on the responder
side - the relevant code was removed.
Diffstat (limited to 'src/sss_client/ssh/sss_ssh_client.c')
-rw-r--r-- | src/sss_client/ssh/sss_ssh_client.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/sss_client/ssh/sss_ssh_client.c b/src/sss_client/ssh/sss_ssh_client.c index 41b20e76c..8520cd1b1 100644 --- a/src/sss_client/ssh/sss_ssh_client.c +++ b/src/sss_client/ssh/sss_ssh_client.c @@ -70,9 +70,13 @@ int set_locale(void) /* SSH public key request: * - * 0..3: flags (unsigned int, must be 0) + * 0..3: flags (unsigned int, must be 0 or 1) * 4..7: name length (unsigned int) * 8..(X-1): name (null-terminated UTF-8 string) + * if (flags & 1) { + * X..(X+3): alias length (unsigned int) + * (X+4)..Y: alias (null-terminated UTF-8 string) + * } * * SSH public key reply: * @@ -89,6 +93,7 @@ errno_t sss_ssh_get_ent(TALLOC_CTX *mem_ctx, enum sss_cli_command command, const char *name, + const char *alias, struct sss_ssh_ent **result) { TALLOC_CTX *tmp_ctx; @@ -96,6 +101,7 @@ sss_ssh_get_ent(TALLOC_CTX *mem_ctx, errno_t ret; uint32_t flags; uint32_t name_len; + uint32_t alias_len; size_t req_len; uint8_t *req = NULL; size_t c = 0; @@ -115,6 +121,12 @@ sss_ssh_get_ent(TALLOC_CTX *mem_ctx, name_len = strlen(name)+1; req_len = 2*sizeof(uint32_t) + name_len; + if (alias) { + flags |= 1; + alias_len = strlen(alias)+1; + req_len += sizeof(uint32_t) + alias_len; + } + req = talloc_array(tmp_ctx, uint8_t, req_len); if (!req) { ret = ENOMEM; @@ -124,6 +136,10 @@ sss_ssh_get_ent(TALLOC_CTX *mem_ctx, SAFEALIGN_SET_UINT32(req+c, flags, &c); SAFEALIGN_SET_UINT32(req+c, name_len, &c); safealign_memcpy(req+c, name, name_len, &c); + if (alias) { + SAFEALIGN_SET_UINT32(req+c, alias_len, &c); + safealign_memcpy(req+c, alias, alias_len, &c); + } /* send request */ rd.data = req; |