You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/01/25 00:39:43 UTC

[4/4] incubator-guacamole-server git commit: GUACAMOLE-175: Merge move of guacd core into library.

GUACAMOLE-175: Merge move of guacd core into library.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/5d2c9676
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/5d2c9676
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/5d2c9676

Branch: refs/heads/master
Commit: 5d2c9676f4681e49a95149ecb43176aba8a56528
Parents: 396eaa2 4c06d75
Author: James Muehlner <ja...@guac-dev.org>
Authored: Tue Jan 24 16:38:50 2017 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Tue Jan 24 16:38:50 2017 -0800

----------------------------------------------------------------------
 Makefile.am                        |   8 +-
 configure.ac                       |   5 +
 src/guacd/Makefile.am              |  18 +-
 src/guacd/connection.c             |   4 +-
 src/guacd/daemon.c                 |   2 +-
 src/guacd/log.c                    |  25 ---
 src/guacd/log.h                    |   8 -
 src/guacd/proc-map.c               |   2 +-
 src/guacd/proc-map.h               |   2 +-
 src/guacd/proc.c                   | 212 +--------------------
 src/guacd/socket-ssl.c             | 153 ---------------
 src/guacd/socket-ssl.h             |  71 -------
 src/guacd/user.c                   | 113 -----------
 src/guacd/user.h                   |  98 ----------
 src/libguacd/Makefile.am           |  50 +++++
 src/libguacd/libguacd/log.h        |  42 +++++
 src/libguacd/libguacd/socket-ssl.h |  71 +++++++
 src/libguacd/libguacd/user.h       | 113 +++++++++++
 src/libguacd/log.c                 |  72 +++++++
 src/libguacd/socket-ssl.c          | 153 +++++++++++++++
 src/libguacd/user.c                | 321 ++++++++++++++++++++++++++++++++
 21 files changed, 844 insertions(+), 699 deletions(-)
----------------------------------------------------------------------