Merge branch 'master' of github.com:neutrinolabs/xrdp

This commit is contained in:
Jay Sorg 2014-01-27 14:42:59 -08:00
commit ef00f6653b
3 changed files with 3 additions and 3 deletions

View File

@ -29,4 +29,4 @@ startscript_DATA = \
install-data-hook: install-data-hook:
chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh
chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp
sed -i 's|__BASE__|$(prefix)|' $(sysconfdir)/init.d/xrdp; sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp;

View File

@ -3,7 +3,7 @@
bitmap_cache=yes bitmap_cache=yes
bitmap_compression=yes bitmap_compression=yes
port=3389 port=3389
crypt_level=low crypt_level=high
allow_channels=true allow_channels=true
max_bpp=24 max_bpp=24
fork=yes fork=yes

View File

@ -184,7 +184,7 @@ mysend(int sck, const void* adata, int bytes)
* write data to client connection * write data to client connection
* *
* @return 0 on success, -1 on error * @return 0 on success, -1 on error
/*****************************************************************************/ *****************************************************************************/
int int
WTSVirtualChannelWrite(void *hChannelHandle, const char *Buffer, WTSVirtualChannelWrite(void *hChannelHandle, const char *Buffer,
unsigned int Length, unsigned int *pBytesWritten) unsigned int Length, unsigned int *pBytesWritten)