diff options
| -rw-r--r-- | sesman/chansrv/chansrv.c | 8 | ||||
| -rwxr-xr-x | sesman/chansrv/pcsc/wrapper/winscard-funcs.h | 4 | ||||
| -rw-r--r-- | xrdp/xrdp_types.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c index 89040377..2d2160fc 100644 --- a/sesman/chansrv/chansrv.c +++ b/sesman/chansrv/chansrv.c @@ -1407,13 +1407,13 @@ get_log_path() memcpy(cp, log_path, strlen(log_path)); memcpy(cp + strlen(log_path), "/xrdp", strlen("/xrdp") + 1); if (g_directory_exist(cp) || g_mkdir(cp)) - { + { log_path = cp; - } + } else - { + { free(cp); - } + } } } } diff --git a/sesman/chansrv/pcsc/wrapper/winscard-funcs.h b/sesman/chansrv/pcsc/wrapper/winscard-funcs.h index 0a4198a3..d28e1445 100755 --- a/sesman/chansrv/pcsc/wrapper/winscard-funcs.h +++ b/sesman/chansrv/pcsc/wrapper/winscard-funcs.h @@ -107,7 +107,7 @@ typedef LONG WINAPI (*tSCardFreeMemory)(SCARDCONTEXT hContext, LPCVOID pvMem); typedef LONG WINAPI (*tSCardLocateCardsA)(SCARDCONTEXT hContext, LPCSTR mszCards, - LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders); + LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders); typedef LONG WINAPI (*tSCardLocateCardsW)(SCARDCONTEXT hContext, LPCWSTR mszCards, LPSCARD_READERSTATEW rgReaderStates, DWORD cReaders); @@ -160,7 +160,7 @@ typedef LONG WINAPI typedef LONG WINAPI (*tSCardControl)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, - DWORD nOutBufferSize, LPDWORD lpBytesReturned); + DWORD nOutBufferSize, LPDWORD lpBytesReturned); typedef LONG WINAPI (*tSCardGetAttrib)(SCARDHANDLE hCard, DWORD dwAttrId, LPBYTE pbAttr, LPDWORD pcbAttrLen); diff --git a/xrdp/xrdp_types.h b/xrdp/xrdp_types.h index 35835857..46a23ca1 100644 --- a/xrdp/xrdp_types.h +++ b/xrdp/xrdp_types.h @@ -592,7 +592,7 @@ struct xrdp_cfg_globals int ls_btn_cancel_y_pos; /* y pos for Cancel button */ int ls_btn_cancel_width; /* width of Cancel button */ int ls_btn_cancel_height; /* height of Cancel button */ - char ls_title[256]; /* loginscreen window title */ + char ls_title[256]; /* loginscreen window title */ }; struct xrdp_cfg_logging |