Merge 0.9.12-incubating changes back to master.

This commit is contained in:
James Muehlner 2017-02-28 10:32:49 -08:00
commit c4903a8e36
52 changed files with 93 additions and 93 deletions

View File

@ -18,7 +18,7 @@
# #
AC_PREREQ([2.61]) AC_PREREQ([2.61])
AC_INIT([guacamole-server], [0.9.11-incubating]) AC_INIT([guacamole-server], [0.9.12-incubating])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])

View File

@ -22,7 +22,7 @@
# #
PROJECT_NAME = libguac PROJECT_NAME = libguac
PROJECT_NUMBER = 0.9.11-incubating PROJECT_NUMBER = 0.9.12-incubating
# #
# Warn about undocumented parameters and return values, but do not fill output # Warn about undocumented parameters and return values, but do not fill output

View File

@ -23,18 +23,18 @@ ACLOCAL_AMFLAGS = -I m4
noinst_LTLIBRARIES = libguac_common_ssh.la noinst_LTLIBRARIES = libguac_common_ssh.la
libguac_common_ssh_la_SOURCES = \ libguac_common_ssh_la_SOURCES = \
guac_sftp.c \ buffer.c \
guac_ssh.c \ sftp.c \
guac_ssh_buffer.c \ ssh.c \
guac_ssh_key.c \ key.c \
guac_ssh_user.c user.c
noinst_HEADERS = \ noinst_HEADERS = \
guac_sftp.h \ common-ssh/buffer.h \
guac_ssh.h \ common-ssh/key.h \
guac_ssh_buffer.h \ common-ssh/sftp.h \
guac_ssh_key.h \ common-ssh/ssh.h \
guac_ssh_user.h common-ssh/user.h
libguac_common_ssh_la_CFLAGS = \ libguac_common_ssh_la_CFLAGS = \
-Werror -Wall -pedantic \ -Werror -Wall -pedantic \

View File

@ -21,7 +21,7 @@
#define GUAC_COMMON_SSH_SFTP_H #define GUAC_COMMON_SSH_SFTP_H
#include "common/json.h" #include "common/json.h"
#include "guac_ssh.h" #include "ssh.h"
#include <guacamole/object.h> #include <guacamole/object.h>
#include <guacamole/user.h> #include <guacamole/user.h>

View File

@ -20,7 +20,7 @@
#ifndef GUAC_COMMON_SSH_H #ifndef GUAC_COMMON_SSH_H
#define GUAC_COMMON_SSH_H #define GUAC_COMMON_SSH_H
#include "guac_ssh_user.h" #include "user.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <libssh2.h> #include <libssh2.h>

View File

@ -20,7 +20,7 @@
#ifndef GUAC_COMMON_SSH_USER_H #ifndef GUAC_COMMON_SSH_USER_H
#define GUAC_COMMON_SSH_USER_H #define GUAC_COMMON_SSH_USER_H
#include "guac_ssh_key.h" #include "key.h"
/** /**
* Data describing an SSH user, including their credentials. * Data describing an SSH user, including their credentials.

View File

@ -19,8 +19,8 @@
#include "config.h" #include "config.h"
#include "guac_ssh_buffer.h" #include "common-ssh/buffer.h"
#include "guac_ssh_key.h" #include "common-ssh/key.h"
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/bn.h> #include <openssl/bn.h>

View File

@ -17,8 +17,8 @@
* under the License. * under the License.
*/ */
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/object.h> #include <guacamole/object.h>

View File

@ -17,9 +17,9 @@
* under the License. * under the License.
*/ */
#include "guac_ssh.h" #include "common-ssh/key.h"
#include "guac_ssh_key.h" #include "common-ssh/ssh.h"
#include "guac_ssh_user.h" #include "common-ssh/user.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <libssh2.h> #include <libssh2.h>

View File

@ -17,8 +17,8 @@
* under the License. * under the License.
*/ */
#include "guac_ssh_key.h" #include "common-ssh/key.h"
#include "guac_ssh_user.h" #include "common-ssh/user.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@ -104,7 +104,7 @@ libguac_la_CFLAGS = \
-Werror -Wall -pedantic -Iguacamole -Werror -Wall -pedantic -Iguacamole
libguac_la_LDFLAGS = \ libguac_la_LDFLAGS = \
-version-info 12:1:0 \ -version-info 13:0:1 \
@CAIRO_LIBS@ \ @CAIRO_LIBS@ \
@JPEG_LIBS@ \ @JPEG_LIBS@ \
@PNG_LIBS@ \ @PNG_LIBS@ \

View File

@ -27,9 +27,9 @@
#include "user.h" #include "user.h"
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include <guac_sftp.h> #include "common-ssh/sftp.h"
#include <guac_ssh.h> #include "common-ssh/ssh.h"
#include <guac_ssh_user.h> #include "common-ssh/user.h"
#endif #endif
#include <freerdp/cache/cache.h> #include <freerdp/cache/cache.h>

View File

@ -41,9 +41,9 @@
#include "rdp_svc.h" #include "rdp_svc.h"
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include <guac_sftp.h> #include "common-ssh/sftp.h"
#include <guac_ssh.h> #include "common-ssh/ssh.h"
#include <guac_ssh_user.h> #include "common-ssh/user.h"
#endif #endif
#include <freerdp/cache/bitmap.h> #include <freerdp/cache/bitmap.h>

View File

@ -39,9 +39,9 @@
#include <guacamole/client.h> #include <guacamole/client.h>
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include "guac_ssh_user.h" #include "common-ssh/user.h"
#endif #endif
#include <pthread.h> #include <pthread.h>

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "rdp.h" #include "rdp.h"
#include "sftp.h" #include "sftp.h"

View File

@ -20,9 +20,9 @@
#include "config.h" #include "config.h"
#include "client.h" #include "client.h"
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "ssh.h" #include "ssh.h"
#include "terminal.h" #include "terminal/terminal.h"
#include "user.h" #include "user.h"
#include <langinfo.h> #include <langinfo.h>

View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "clipboard.h" #include "clipboard.h"
#include "ssh.h" #include "ssh.h"
#include "terminal.h" #include "terminal/terminal.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/stream.h> #include <guacamole/stream.h>

View File

@ -22,7 +22,7 @@
#include "common/cursor.h" #include "common/cursor.h"
#include "common/display.h" #include "common/display.h"
#include "ssh.h" #include "ssh.h"
#include "terminal.h" #include "terminal/terminal.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/user.h> #include <guacamole/user.h>

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "sftp.h" #include "sftp.h"
#include "ssh.h" #include "ssh.h"

View File

@ -20,12 +20,12 @@
#include "config.h" #include "config.h"
#include "common/recording.h" #include "common/recording.h"
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include "settings.h" #include "settings.h"
#include "sftp.h" #include "sftp.h"
#include "ssh.h" #include "ssh.h"
#include "terminal.h" #include "terminal/terminal.h"
#ifdef ENABLE_SSH_AGENT #ifdef ENABLE_SSH_AGENT
#include "ssh_agent.h" #include "ssh_agent.h"

View File

@ -22,11 +22,11 @@
#include "config.h" #include "config.h"
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include "guac_ssh_user.h" #include "common-ssh/user.h"
#include "settings.h" #include "settings.h"
#include "terminal.h" #include "terminal/terminal.h"
#ifdef ENABLE_SSH_AGENT #ifdef ENABLE_SSH_AGENT
#include "ssh_agent.h" #include "ssh_agent.h"

View File

@ -21,7 +21,7 @@
#include "client.h" #include "client.h"
#include "settings.h" #include "settings.h"
#include "telnet.h" #include "telnet.h"
#include "terminal.h" #include "terminal/terminal.h"
#include "user.h" #include "user.h"
#include <langinfo.h> #include <langinfo.h>

View File

@ -21,7 +21,7 @@
#define GUAC_TELNET__CLIENT_H #define GUAC_TELNET__CLIENT_H
#include "config.h" #include "config.h"
#include "terminal.h" #include "terminal/terminal.h"
#include <pthread.h> #include <pthread.h>
#include <regex.h> #include <regex.h>

View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "clipboard.h" #include "clipboard.h"
#include "telnet.h" #include "telnet.h"
#include "terminal.h" #include "terminal/terminal.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/stream.h> #include <guacamole/stream.h>

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "input.h" #include "input.h"
#include "terminal.h" #include "terminal/terminal.h"
#include "telnet.h" #include "telnet.h"
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "common/recording.h" #include "common/recording.h"
#include "telnet.h" #include "telnet.h"
#include "terminal.h" #include "terminal/terminal.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/protocol.h> #include <guacamole/protocol.h>

View File

@ -22,7 +22,7 @@
#include "config.h" #include "config.h"
#include "settings.h" #include "settings.h"
#include "terminal.h" #include "terminal/terminal.h"
#include <libtelnet.h> #include <libtelnet.h>

View File

@ -23,7 +23,7 @@
#include "input.h" #include "input.h"
#include "settings.h" #include "settings.h"
#include "telnet.h" #include "telnet.h"
#include "terminal.h" #include "terminal/terminal.h"
#include "user.h" #include "user.h"
#include <guacamole/client.h> #include <guacamole/client.h>

View File

@ -24,9 +24,9 @@
#include "vnc.h" #include "vnc.h"
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include "sftp.h" #include "common-ssh/user.h"
#endif #endif
#ifdef ENABLE_PULSE #ifdef ENABLE_PULSE

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "sftp.h" #include "sftp.h"
#include "vnc.h" #include "vnc.h"

View File

@ -37,8 +37,8 @@
#endif #endif
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include "sftp.h" #include "sftp.h"
#endif #endif

View File

@ -37,9 +37,9 @@
#endif #endif
#ifdef ENABLE_COMMON_SSH #ifdef ENABLE_COMMON_SSH
#include "guac_sftp.h" #include "common-ssh/sftp.h"
#include "guac_ssh.h" #include "common-ssh/ssh.h"
#include "guac_ssh_user.h" #include "common-ssh/user.h"
#endif #endif
#include <pthread.h> #include <pthread.h>

View File

@ -22,16 +22,16 @@ ACLOCAL_AMFLAGS = -I m4
noinst_LTLIBRARIES = libguac_terminal.la noinst_LTLIBRARIES = libguac_terminal.la
noinst_HEADERS = \ noinst_HEADERS = \
buffer.h \ terminal/buffer.h \
char_mappings.h \ terminal/char_mappings.h \
common.h \ terminal/common.h \
display.h \ terminal/display.h \
scrollbar.h \ terminal/scrollbar.h \
terminal.h \ terminal/terminal.h \
terminal_handlers.h \ terminal/terminal_handlers.h \
types.h \ terminal/types.h \
typescript.h terminal/typescript.h
libguac_terminal_la_SOURCES = \ libguac_terminal_la_SOURCES = \
buffer.c \ buffer.c \

View File

@ -19,8 +19,8 @@
#include "config.h" #include "config.h"
#include "buffer.h" #include "terminal/buffer.h"
#include "common.h" #include "terminal/common.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "types.h" #include "terminal/types.h"
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>

View File

@ -19,10 +19,10 @@
#include "config.h" #include "config.h"
#include "common.h"
#include "common/surface.h" #include "common/surface.h"
#include "display.h" #include "terminal/common.h"
#include "types.h" #include "terminal/display.h"
#include "terminal/types.h"
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "scrollbar.h" #include "terminal/scrollbar.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/layer.h> #include <guacamole/layer.h>

View File

@ -19,15 +19,15 @@
#include "config.h" #include "config.h"
#include "buffer.h"
#include "common.h"
#include "common/clipboard.h" #include "common/clipboard.h"
#include "common/cursor.h" #include "common/cursor.h"
#include "display.h" #include "terminal/buffer.h"
#include "terminal.h" #include "terminal/common.h"
#include "terminal_handlers.h" #include "terminal/display.h"
#include "types.h" #include "terminal/terminal.h"
#include "typescript.h" #include "terminal/terminal_handlers.h"
#include "terminal/types.h"
#include "terminal/typescript.h"
#include <errno.h> #include <errno.h>
#include <pthread.h> #include <pthread.h>

View File

@ -19,10 +19,10 @@
#include "config.h" #include "config.h"
#include "char_mappings.h" #include "terminal/char_mappings.h"
#include "terminal.h" #include "terminal/terminal.h"
#include "terminal_handlers.h" #include "terminal/terminal_handlers.h"
#include "types.h" #include "terminal/types.h"
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/protocol.h> #include <guacamole/protocol.h>

View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "common/io.h" #include "common/io.h"
#include "typescript.h" #include "terminal/typescript.h"
#include <guacamole/timestamp.h> #include <guacamole/timestamp.h>