Merge branch 'master' into devel

instfiles/Makefile.am

@@ -29,4 +29,4 @@ startscript_DATA = \
 install-data-hook:
 	chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh
 	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;

xrdp/xrdp.ini

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

xrdpapi/xrdpapi.c

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