diff options
| author | Koichiro IWAO <meta@vmeta.jp> | 2016-10-11 00:19:55 +0900 | 
|---|---|---|
| committer | Koichiro IWAO <meta@vmeta.jp> | 2016-10-24 15:19:23 +0900 | 
| commit | c654c862064db49766835c9af37f6fce9f2f8929 (patch) | |
| tree | f02d5f0b8074457797a2393fa431c7b01fd61ff8 /xrdp/lang.c | |
| parent | b79ad54bd3ecd624bf434f5e01b1496a93722297 (diff) | |
| download | xrdp-proprietary-c654c862064db49766835c9af37f6fce9f2f8929.tar.gz xrdp-proprietary-c654c862064db49766835c9af37f6fce9f2f8929.zip | |
Switch to 8 hex digit keymapfile
as the value keyboardLayout is actually 32-bit unsigned integer.
See [MS-RDPBCGR] - v20160714 p.45.
Diffstat (limited to 'xrdp/lang.c')
| -rw-r--r-- | xrdp/lang.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/xrdp/lang.c b/xrdp/lang.c index fa284112..ae577596 100644 --- a/xrdp/lang.c +++ b/xrdp/lang.c @@ -231,12 +231,12 @@ get_keymaps(int keylayout, struct xrdp_keymap *keymap)      filename = (char *)g_malloc(256, 0);      /* check if there is a keymap file */ -    g_snprintf(filename, 255, "%s/km-%4.4x.ini", XRDP_CFG_PATH, keylayout); +    g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, keylayout);      /* if the file does not exist, try again with 'en-us' as fallback */      if (!g_file_exist(filename))      { -        g_snprintf(filename, 255, "%s/km-0409.ini", XRDP_CFG_PATH); +        g_snprintf(filename, 255, "%s/km-00000409.ini", XRDP_CFG_PATH);      }      if (g_file_exist(filename)) @@ -263,7 +263,7 @@ get_keymaps(int keylayout, struct xrdp_keymap *keymap)              if (g_memcmp(lkeymap, keymap, sizeof(struct xrdp_keymap)) != 0)              {                  log_message(LOG_LEVEL_WARNING, -                            "local keymap file for 0x%4.4x found and doesn't match " +                            "local keymap file for 0x%08x found and doesn't match "                              "built in keymap, using local keymap file", keylayout);              } | 
