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 2016/03/29 06:14:56 UTC

[10/14] incubator-guacamole-server git commit: GUACAMOLE-1: Relicense C files.

GUACAMOLE-1: Relicense C files.


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/4da3bef4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/4da3bef4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/4da3bef4

Branch: refs/heads/master
Commit: 4da3bef4ec8ebaa50104fb3fcd6a474fa5c838c8
Parents: ecbb6fc
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Mar 25 12:59:40 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Mar 28 20:39:19 2016 -0700

----------------------------------------------------------------------
 src/common-ssh/guac_sftp.c                      | 35 +++++++++-----------
 src/common-ssh/guac_sftp.h                      | 35 +++++++++-----------
 src/common-ssh/guac_ssh.c                       | 31 ++++++++---------
 src/common-ssh/guac_ssh.h                       | 31 ++++++++---------
 src/common-ssh/guac_ssh_buffer.c                | 31 ++++++++---------
 src/common-ssh/guac_ssh_buffer.h                | 35 +++++++++-----------
 src/common-ssh/guac_ssh_key.c                   | 31 ++++++++---------
 src/common-ssh/guac_ssh_key.h                   | 31 ++++++++---------
 src/common-ssh/guac_ssh_user.c                  | 31 ++++++++---------
 src/common-ssh/guac_ssh_user.h                  | 31 ++++++++---------
 src/common/guac_blank_cursor.c                  | 31 ++++++++---------
 src/common/guac_blank_cursor.h                  | 31 ++++++++---------
 src/common/guac_clipboard.c                     | 31 ++++++++---------
 src/common/guac_clipboard.h                     | 31 ++++++++---------
 src/common/guac_cursor.c                        | 31 ++++++++---------
 src/common/guac_cursor.h                        | 35 +++++++++-----------
 src/common/guac_display.c                       | 31 ++++++++---------
 src/common/guac_display.h                       | 35 +++++++++-----------
 src/common/guac_dot_cursor.c                    | 31 ++++++++---------
 src/common/guac_dot_cursor.h                    | 31 ++++++++---------
 src/common/guac_ibar_cursor.c                   | 31 ++++++++---------
 src/common/guac_ibar_cursor.h                   | 31 ++++++++---------
 src/common/guac_iconv.c                         | 31 ++++++++---------
 src/common/guac_iconv.h                         | 31 ++++++++---------
 src/common/guac_io.c                            | 31 ++++++++---------
 src/common/guac_io.h                            | 31 ++++++++---------
 src/common/guac_json.c                          | 31 ++++++++---------
 src/common/guac_json.h                          | 35 +++++++++-----------
 src/common/guac_list.c                          | 31 ++++++++---------
 src/common/guac_list.h                          | 31 ++++++++---------
 src/common/guac_pointer_cursor.c                | 31 ++++++++---------
 src/common/guac_pointer_cursor.h                | 31 ++++++++---------
 src/common/guac_recording.c                     | 31 ++++++++---------
 src/common/guac_recording.h                     | 31 ++++++++---------
 src/common/guac_rect.c                          | 31 ++++++++---------
 src/common/guac_rect.h                          | 35 +++++++++-----------
 src/common/guac_string.c                        | 31 ++++++++---------
 src/common/guac_string.h                        | 31 ++++++++---------
 src/common/guac_surface.c                       | 31 ++++++++---------
 src/common/guac_surface.h                       | 31 ++++++++---------
 src/guacd/conf-args.c                           | 31 ++++++++---------
 src/guacd/conf-args.h                           | 31 ++++++++---------
 src/guacd/conf-file.c                           | 31 ++++++++---------
 src/guacd/conf-file.h                           | 31 ++++++++---------
 src/guacd/conf-parse.c                          | 31 ++++++++---------
 src/guacd/conf-parse.h                          | 31 ++++++++---------
 src/guacd/connection.c                          | 31 ++++++++---------
 src/guacd/connection.h                          | 31 ++++++++---------
 src/guacd/daemon.c                              | 31 ++++++++---------
 src/guacd/log.c                                 | 31 ++++++++---------
 src/guacd/log.h                                 | 31 ++++++++---------
 src/guacd/move-fd.c                             | 31 ++++++++---------
 src/guacd/move-fd.h                             | 35 +++++++++-----------
 src/guacd/proc-map.c                            | 31 ++++++++---------
 src/guacd/proc-map.h                            | 31 ++++++++---------
 src/guacd/proc.c                                | 31 ++++++++---------
 src/guacd/proc.h                                | 31 ++++++++---------
 src/guacd/socket-ssl.c                          | 31 ++++++++---------
 src/guacd/socket-ssl.h                          | 31 ++++++++---------
 src/guacd/user.c                                | 31 ++++++++---------
 src/guacd/user.h                                | 31 ++++++++---------
 src/guacenc/buffer.c                            | 31 ++++++++---------
 src/guacenc/buffer.h                            | 35 +++++++++-----------
 src/guacenc/display-buffers.c                   | 31 ++++++++---------
 src/guacenc/display-flatten.c                   | 31 ++++++++---------
 src/guacenc/display-image-streams.c             | 31 ++++++++---------
 src/guacenc/display-layers.c                    | 31 ++++++++---------
 src/guacenc/display-sync.c                      | 31 ++++++++---------
 src/guacenc/display.c                           | 31 ++++++++---------
 src/guacenc/display.h                           | 35 +++++++++-----------
 src/guacenc/encode.c                            | 31 ++++++++---------
 src/guacenc/encode.h                            | 31 ++++++++---------
 src/guacenc/ffmpeg-compat.c                     | 31 ++++++++---------
 src/guacenc/ffmpeg-compat.h                     | 31 ++++++++---------
 src/guacenc/guacenc.c                           | 31 ++++++++---------
 src/guacenc/guacenc.h                           | 31 ++++++++---------
 src/guacenc/image-stream.c                      | 31 ++++++++---------
 src/guacenc/image-stream.h                      | 35 +++++++++-----------
 src/guacenc/instruction-blob.c                  | 31 ++++++++---------
 src/guacenc/instruction-cfill.c                 | 31 ++++++++---------
 src/guacenc/instruction-copy.c                  | 31 ++++++++---------
 src/guacenc/instruction-cursor.c                | 31 ++++++++---------
 src/guacenc/instruction-dispose.c               | 31 ++++++++---------
 src/guacenc/instruction-end.c                   | 31 ++++++++---------
 src/guacenc/instruction-img.c                   | 31 ++++++++---------
 src/guacenc/instruction-move.c                  | 31 ++++++++---------
 src/guacenc/instruction-rect.c                  | 31 ++++++++---------
 src/guacenc/instruction-shade.c                 | 31 ++++++++---------
 src/guacenc/instruction-size.c                  | 31 ++++++++---------
 src/guacenc/instruction-sync.c                  | 31 ++++++++---------
 src/guacenc/instruction-transfer.c              | 31 ++++++++---------
 src/guacenc/instructions.c                      | 31 ++++++++---------
 src/guacenc/instructions.h                      | 31 ++++++++---------
 src/guacenc/jpeg.c                              | 31 ++++++++---------
 src/guacenc/jpeg.h                              | 31 ++++++++---------
 src/guacenc/layer.c                             | 31 ++++++++---------
 src/guacenc/layer.h                             | 31 ++++++++---------
 src/guacenc/log.c                               | 31 ++++++++---------
 src/guacenc/log.h                               | 31 ++++++++---------
 src/guacenc/parse.c                             | 31 ++++++++---------
 src/guacenc/parse.h                             | 31 ++++++++---------
 src/guacenc/png.c                               | 31 ++++++++---------
 src/guacenc/png.h                               | 31 ++++++++---------
 src/guacenc/video.c                             | 31 ++++++++---------
 src/guacenc/video.h                             | 31 ++++++++---------
 src/guacenc/webp.c                              | 31 ++++++++---------
 src/guacenc/webp.h                              | 31 ++++++++---------
 src/libguac/audio.c                             | 31 ++++++++---------
 src/libguac/client.c                            | 35 +++++++++-----------
 src/libguac/encode-jpeg.c                       | 31 ++++++++---------
 src/libguac/encode-jpeg.h                       | 31 ++++++++---------
 src/libguac/encode-png.c                        | 31 ++++++++---------
 src/libguac/encode-png.h                        | 31 ++++++++---------
 src/libguac/encode-webp.c                       | 31 ++++++++---------
 src/libguac/encode-webp.h                       | 35 +++++++++-----------
 src/libguac/error.c                             | 31 ++++++++---------
 src/libguac/guacamole/audio-fntypes.h           | 31 ++++++++---------
 src/libguac/guacamole/audio-types.h             | 31 ++++++++---------
 src/libguac/guacamole/audio.h                   | 35 +++++++++-----------
 src/libguac/guacamole/client-constants.h        | 31 ++++++++---------
 src/libguac/guacamole/client-fntypes.h          | 31 ++++++++---------
 src/libguac/guacamole/client-types.h            | 31 ++++++++---------
 src/libguac/guacamole/client.h                  | 35 +++++++++-----------
 src/libguac/guacamole/error-types.h             | 31 ++++++++---------
 src/libguac/guacamole/error.h                   | 31 ++++++++---------
 src/libguac/guacamole/hash.h                    | 31 ++++++++---------
 src/libguac/guacamole/layer-types.h             | 31 ++++++++---------
 src/libguac/guacamole/layer.h                   | 31 ++++++++---------
 src/libguac/guacamole/object-types.h            | 31 ++++++++---------
 src/libguac/guacamole/object.h                  | 31 ++++++++---------
 src/libguac/guacamole/parser-constants.h        | 31 ++++++++---------
 src/libguac/guacamole/parser-types.h            | 31 ++++++++---------
 src/libguac/guacamole/parser.h                  | 31 ++++++++---------
 src/libguac/guacamole/plugin-constants.h        | 31 ++++++++---------
 src/libguac/guacamole/plugin.h                  | 31 ++++++++---------
 src/libguac/guacamole/pool-types.h              | 31 ++++++++---------
 src/libguac/guacamole/pool.h                    | 31 ++++++++---------
 src/libguac/guacamole/protocol-types.h          | 31 ++++++++---------
 src/libguac/guacamole/protocol.h                | 35 +++++++++-----------
 src/libguac/guacamole/socket-constants.h        | 31 ++++++++---------
 src/libguac/guacamole/socket-fntypes.h          | 31 ++++++++---------
 src/libguac/guacamole/socket-types.h            | 31 ++++++++---------
 src/libguac/guacamole/socket.h                  | 35 +++++++++-----------
 src/libguac/guacamole/stream-types.h            | 31 ++++++++---------
 src/libguac/guacamole/stream.h                  | 31 ++++++++---------
 src/libguac/guacamole/timestamp-types.h         | 31 ++++++++---------
 src/libguac/guacamole/timestamp.h               | 31 ++++++++---------
 src/libguac/guacamole/unicode.h                 | 31 ++++++++---------
 src/libguac/guacamole/user-constants.h          | 31 ++++++++---------
 src/libguac/guacamole/user-fntypes.h            | 35 +++++++++-----------
 src/libguac/guacamole/user-types.h              | 31 ++++++++---------
 src/libguac/guacamole/user.h                    | 35 +++++++++-----------
 src/libguac/hash.c                              | 31 ++++++++---------
 src/libguac/id.c                                | 31 ++++++++---------
 src/libguac/id.h                                | 31 ++++++++---------
 src/libguac/palette.c                           | 31 ++++++++---------
 src/libguac/palette.h                           | 31 ++++++++---------
 src/libguac/parser.c                            | 31 ++++++++---------
 src/libguac/pool.c                              | 31 ++++++++---------
 src/libguac/protocol.c                          | 31 ++++++++---------
 src/libguac/raw_encoder.c                       | 31 ++++++++---------
 src/libguac/raw_encoder.h                       | 31 ++++++++---------
 src/libguac/socket-fd.c                         | 31 ++++++++---------
 src/libguac/socket-nest.c                       | 31 ++++++++---------
 src/libguac/socket-tee.c                        | 35 +++++++++-----------
 src/libguac/socket.c                            | 31 ++++++++---------
 src/libguac/timestamp.c                         | 31 ++++++++---------
 src/libguac/unicode.c                           | 31 ++++++++---------
 src/libguac/user-handlers.c                     | 31 ++++++++---------
 src/libguac/user-handlers.h                     | 31 ++++++++---------
 src/libguac/user.c                              | 31 ++++++++---------
 src/protocols/rdp/client.c                      | 31 ++++++++---------
 src/protocols/rdp/client.h                      | 31 ++++++++---------
 src/protocols/rdp/compat/client-cliprdr.h       | 31 ++++++++---------
 src/protocols/rdp/compat/rail.h                 | 31 ++++++++---------
 src/protocols/rdp/compat/winpr-stream.c         | 31 ++++++++---------
 src/protocols/rdp/compat/winpr-stream.h         | 31 ++++++++---------
 src/protocols/rdp/compat/winpr-wtypes.h         | 31 ++++++++---------
 .../rdp/guac_rdpdr/rdpdr_fs_messages.c          | 31 ++++++++---------
 .../rdp/guac_rdpdr/rdpdr_fs_messages.h          | 31 ++++++++---------
 .../rdp/guac_rdpdr/rdpdr_fs_messages_dir_info.c | 31 ++++++++---------
 .../rdp/guac_rdpdr/rdpdr_fs_messages_dir_info.h | 31 ++++++++---------
 .../guac_rdpdr/rdpdr_fs_messages_file_info.c    | 31 ++++++++---------
 .../guac_rdpdr/rdpdr_fs_messages_file_info.h    | 31 ++++++++---------
 .../rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.c | 31 ++++++++---------
 .../rdp/guac_rdpdr/rdpdr_fs_messages_vol_info.h | 31 ++++++++---------
 src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.c | 31 ++++++++---------
 src/protocols/rdp/guac_rdpdr/rdpdr_fs_service.h | 31 ++++++++---------
 src/protocols/rdp/guac_rdpdr/rdpdr_messages.c   | 31 ++++++++---------
 src/protocols/rdp/guac_rdpdr/rdpdr_messages.h   | 31 ++++++++---------
 src/protocols/rdp/guac_rdpdr/rdpdr_printer.c    | 31 ++++++++---------
 src/protocols/rdp/guac_rdpdr/rdpdr_printer.h    | 31 ++++++++---------
 src/protocols/rdp/guac_rdpdr/rdpdr_service.c    | 31 ++++++++---------
 src/protocols/rdp/guac_rdpdr/rdpdr_service.h    | 31 ++++++++---------
 src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.c | 31 ++++++++---------
 src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.h | 35 +++++++++-----------
 src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c  | 31 ++++++++---------
 src/protocols/rdp/guac_rdpsnd/rdpsnd_service.h  | 31 ++++++++---------
 src/protocols/rdp/guac_svc/svc_service.c        | 31 ++++++++---------
 src/protocols/rdp/guac_svc/svc_service.h        | 31 ++++++++---------
 src/protocols/rdp/input.c                       | 31 ++++++++---------
 src/protocols/rdp/input.h                       | 31 ++++++++---------
 src/protocols/rdp/rdp.c                         | 31 ++++++++---------
 src/protocols/rdp/rdp.h                         | 31 ++++++++---------
 src/protocols/rdp/rdp_bitmap.c                  | 31 ++++++++---------
 src/protocols/rdp/rdp_bitmap.h                  | 35 +++++++++-----------
 src/protocols/rdp/rdp_cliprdr.c                 | 31 ++++++++---------
 src/protocols/rdp/rdp_cliprdr.h                 | 31 ++++++++---------
 src/protocols/rdp/rdp_color.c                   | 31 ++++++++---------
 src/protocols/rdp/rdp_color.h                   | 31 ++++++++---------
 src/protocols/rdp/rdp_disp.c                    | 31 ++++++++---------
 src/protocols/rdp/rdp_disp.h                    | 35 +++++++++-----------
 src/protocols/rdp/rdp_fs.c                      | 31 ++++++++---------
 src/protocols/rdp/rdp_fs.h                      | 35 +++++++++-----------
 src/protocols/rdp/rdp_gdi.c                     | 31 ++++++++---------
 src/protocols/rdp/rdp_gdi.h                     | 35 +++++++++-----------
 src/protocols/rdp/rdp_glyph.c                   | 31 ++++++++---------
 src/protocols/rdp/rdp_glyph.h                   | 35 +++++++++-----------
 src/protocols/rdp/rdp_keymap.c                  | 31 ++++++++---------
 src/protocols/rdp/rdp_keymap.h                  | 31 ++++++++---------
 src/protocols/rdp/rdp_pointer.c                 | 31 ++++++++---------
 src/protocols/rdp/rdp_pointer.h                 | 31 ++++++++---------
 src/protocols/rdp/rdp_rail.c                    | 31 ++++++++---------
 src/protocols/rdp/rdp_rail.h                    | 31 ++++++++---------
 src/protocols/rdp/rdp_settings.c                | 31 ++++++++---------
 src/protocols/rdp/rdp_settings.h                | 31 ++++++++---------
 src/protocols/rdp/rdp_status.h                  | 31 ++++++++---------
 src/protocols/rdp/rdp_stream.c                  | 31 ++++++++---------
 src/protocols/rdp/rdp_stream.h                  | 31 ++++++++---------
 src/protocols/rdp/rdp_svc.c                     | 31 ++++++++---------
 src/protocols/rdp/rdp_svc.h                     | 35 +++++++++-----------
 src/protocols/rdp/resolution.c                  | 31 ++++++++---------
 src/protocols/rdp/resolution.h                  | 35 +++++++++-----------
 src/protocols/rdp/sftp.c                        | 31 ++++++++---------
 src/protocols/rdp/sftp.h                        | 35 +++++++++-----------
 src/protocols/rdp/unicode.c                     | 31 ++++++++---------
 src/protocols/rdp/unicode.h                     | 35 +++++++++-----------
 src/protocols/rdp/user.c                        | 31 ++++++++---------
 src/protocols/rdp/user.h                        | 31 ++++++++---------
 src/protocols/ssh/client.c                      | 31 ++++++++---------
 src/protocols/ssh/client.h                      | 31 ++++++++---------
 src/protocols/ssh/clipboard.c                   | 31 ++++++++---------
 src/protocols/ssh/clipboard.h                   | 31 ++++++++---------
 src/protocols/ssh/input.c                       | 31 ++++++++---------
 src/protocols/ssh/input.h                       | 31 ++++++++---------
 src/protocols/ssh/settings.c                    | 31 ++++++++---------
 src/protocols/ssh/settings.h                    | 31 ++++++++---------
 src/protocols/ssh/sftp.c                        | 31 ++++++++---------
 src/protocols/ssh/sftp.h                        | 31 ++++++++---------
 src/protocols/ssh/ssh.c                         | 31 ++++++++---------
 src/protocols/ssh/ssh.h                         | 31 ++++++++---------
 src/protocols/ssh/ssh_agent.c                   | 31 ++++++++---------
 src/protocols/ssh/ssh_agent.h                   | 31 ++++++++---------
 src/protocols/ssh/user.c                        | 31 ++++++++---------
 src/protocols/ssh/user.h                        | 31 ++++++++---------
 src/protocols/telnet/client.c                   | 31 ++++++++---------
 src/protocols/telnet/client.h                   | 31 ++++++++---------
 src/protocols/telnet/clipboard.c                | 31 ++++++++---------
 src/protocols/telnet/clipboard.h                | 31 ++++++++---------
 src/protocols/telnet/input.c                    | 31 ++++++++---------
 src/protocols/telnet/input.h                    | 31 ++++++++---------
 src/protocols/telnet/settings.c                 | 31 ++++++++---------
 src/protocols/telnet/settings.h                 | 31 ++++++++---------
 src/protocols/telnet/telnet.c                   | 31 ++++++++---------
 src/protocols/telnet/telnet.h                   | 31 ++++++++---------
 src/protocols/telnet/user.c                     | 31 ++++++++---------
 src/protocols/telnet/user.h                     | 31 ++++++++---------
 src/protocols/vnc/auth.c                        | 31 ++++++++---------
 src/protocols/vnc/auth.h                        | 31 ++++++++---------
 src/protocols/vnc/client.c                      | 31 ++++++++---------
 src/protocols/vnc/client.h                      | 31 ++++++++---------
 src/protocols/vnc/clipboard.c                   | 31 ++++++++---------
 src/protocols/vnc/clipboard.h                   | 31 ++++++++---------
 src/protocols/vnc/cursor.c                      | 31 ++++++++---------
 src/protocols/vnc/cursor.h                      | 35 +++++++++-----------
 src/protocols/vnc/display.c                     | 31 ++++++++---------
 src/protocols/vnc/display.h                     | 35 +++++++++-----------
 src/protocols/vnc/input.c                       | 31 ++++++++---------
 src/protocols/vnc/input.h                       | 31 ++++++++---------
 src/protocols/vnc/log.c                         | 31 ++++++++---------
 src/protocols/vnc/log.h                         | 31 ++++++++---------
 src/protocols/vnc/pulse.c                       | 31 ++++++++---------
 src/protocols/vnc/pulse.h                       | 31 ++++++++---------
 src/protocols/vnc/settings.c                    | 31 ++++++++---------
 src/protocols/vnc/settings.h                    | 31 ++++++++---------
 src/protocols/vnc/sftp.c                        | 31 ++++++++---------
 src/protocols/vnc/sftp.h                        | 31 ++++++++---------
 src/protocols/vnc/user.c                        | 31 ++++++++---------
 src/protocols/vnc/user.h                        | 31 ++++++++---------
 src/protocols/vnc/vnc.c                         | 31 ++++++++---------
 src/protocols/vnc/vnc.h                         | 31 ++++++++---------
 src/terminal/buffer.c                           | 31 ++++++++---------
 src/terminal/buffer.h                           | 31 ++++++++---------
 src/terminal/char_mappings.c                    | 31 ++++++++---------
 src/terminal/char_mappings.h                    | 31 ++++++++---------
 src/terminal/common.c                           | 31 ++++++++---------
 src/terminal/common.h                           | 31 ++++++++---------
 src/terminal/display.c                          | 31 ++++++++---------
 src/terminal/display.h                          | 31 ++++++++---------
 src/terminal/packet.c                           | 31 ++++++++---------
 src/terminal/packet.h                           | 31 ++++++++---------
 src/terminal/scrollbar.c                        | 31 ++++++++---------
 src/terminal/scrollbar.h                        | 35 +++++++++-----------
 src/terminal/terminal.c                         | 31 ++++++++---------
 src/terminal/terminal.h                         | 35 +++++++++-----------
 src/terminal/terminal_handlers.c                | 31 ++++++++---------
 src/terminal/terminal_handlers.h                | 35 +++++++++-----------
 src/terminal/types.h                            | 31 ++++++++---------
 src/terminal/typescript.c                       | 31 ++++++++---------
 src/terminal/typescript.h                       | 31 ++++++++---------
 tests/client/buffer_pool.c                      | 31 ++++++++---------
 tests/client/client_suite.c                     | 31 ++++++++---------
 tests/client/client_suite.h                     | 31 ++++++++---------
 tests/client/layer_pool.c                       | 31 ++++++++---------
 tests/common/common_suite.c                     | 31 ++++++++---------
 tests/common/common_suite.h                     | 31 ++++++++---------
 tests/common/guac_iconv.c                       | 31 ++++++++---------
 tests/common/guac_rect.c                        | 31 ++++++++---------
 tests/common/guac_string.c                      | 31 ++++++++---------
 tests/protocol/base64_decode.c                  | 31 ++++++++---------
 tests/protocol/instruction_parse.c              | 31 ++++++++---------
 tests/protocol/instruction_read.c               | 31 ++++++++---------
 tests/protocol/instruction_write.c              | 31 ++++++++---------
 tests/protocol/nest_write.c                     | 31 ++++++++---------
 tests/protocol/suite.c                          | 31 ++++++++---------
 tests/protocol/suite.h                          | 31 ++++++++---------
 tests/test_libguac.c                            | 31 ++++++++---------
 tests/util/guac_pool.c                          | 31 ++++++++---------
 tests/util/guac_unicode.c                       | 31 ++++++++---------
 tests/util/util_suite.c                         | 31 ++++++++---------
 tests/util/util_suite.h                         | 31 ++++++++---------
 331 files changed, 4704 insertions(+), 5697 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common-ssh/guac_sftp.c
----------------------------------------------------------------------
diff --git a/src/common-ssh/guac_sftp.c b/src/common-ssh/guac_sftp.c
index 71f1e5b..e7314d2 100644
--- a/src/common-ssh/guac_sftp.c
+++ b/src/common-ssh/guac_sftp.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "guac_sftp.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common-ssh/guac_sftp.h
----------------------------------------------------------------------
diff --git a/src/common-ssh/guac_sftp.h b/src/common-ssh/guac_sftp.h
index a1f4e33..c43c00c 100644
--- a/src/common-ssh/guac_sftp.h
+++ b/src/common-ssh/guac_sftp.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef GUAC_COMMON_SSH_SFTP_H

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common-ssh/guac_ssh.c
----------------------------------------------------------------------
diff --git a/src/common-ssh/guac_ssh.c b/src/common-ssh/guac_ssh.c
index 79682f7..2c59e1d 100644
--- a/src/common-ssh/guac_ssh.c
+++ b/src/common-ssh/guac_ssh.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "guac_ssh.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common-ssh/guac_ssh.h
----------------------------------------------------------------------
diff --git a/src/common-ssh/guac_ssh.h b/src/common-ssh/guac_ssh.h
index e7a35fa..36ad176 100644
--- a/src/common-ssh/guac_ssh.h
+++ b/src/common-ssh/guac_ssh.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef GUAC_COMMON_SSH_H

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common-ssh/guac_ssh_buffer.c
----------------------------------------------------------------------
diff --git a/src/common-ssh/guac_ssh_buffer.c b/src/common-ssh/guac_ssh_buffer.c
index 0390c40..b3d8d57 100644
--- a/src/common-ssh/guac_ssh_buffer.c
+++ b/src/common-ssh/guac_ssh_buffer.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "config.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common-ssh/guac_ssh_buffer.h
----------------------------------------------------------------------
diff --git a/src/common-ssh/guac_ssh_buffer.h b/src/common-ssh/guac_ssh_buffer.h
index 0c77bba..b42a2ac 100644
--- a/src/common-ssh/guac_ssh_buffer.h
+++ b/src/common-ssh/guac_ssh_buffer.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef GUAC_COMMON_SSH_BUFFER_H

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common-ssh/guac_ssh_key.c
----------------------------------------------------------------------
diff --git a/src/common-ssh/guac_ssh_key.c b/src/common-ssh/guac_ssh_key.c
index 6c374e3..7594b84 100644
--- a/src/common-ssh/guac_ssh_key.c
+++ b/src/common-ssh/guac_ssh_key.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "config.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common-ssh/guac_ssh_key.h
----------------------------------------------------------------------
diff --git a/src/common-ssh/guac_ssh_key.h b/src/common-ssh/guac_ssh_key.h
index e76ac06..1754dea 100644
--- a/src/common-ssh/guac_ssh_key.h
+++ b/src/common-ssh/guac_ssh_key.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef GUAC_COMMON_SSH_KEY_H

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common-ssh/guac_ssh_user.c
----------------------------------------------------------------------
diff --git a/src/common-ssh/guac_ssh_user.c b/src/common-ssh/guac_ssh_user.c
index c9691b1..73319c0 100644
--- a/src/common-ssh/guac_ssh_user.c
+++ b/src/common-ssh/guac_ssh_user.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "guac_ssh_key.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common-ssh/guac_ssh_user.h
----------------------------------------------------------------------
diff --git a/src/common-ssh/guac_ssh_user.h b/src/common-ssh/guac_ssh_user.h
index 760523a..eeaa460 100644
--- a/src/common-ssh/guac_ssh_user.h
+++ b/src/common-ssh/guac_ssh_user.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef GUAC_COMMON_SSH_USER_H

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_blank_cursor.c
----------------------------------------------------------------------
diff --git a/src/common/guac_blank_cursor.c b/src/common/guac_blank_cursor.c
index d0d6508..c65db0c 100644
--- a/src/common/guac_blank_cursor.c
+++ b/src/common/guac_blank_cursor.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "config.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_blank_cursor.h
----------------------------------------------------------------------
diff --git a/src/common/guac_blank_cursor.h b/src/common/guac_blank_cursor.h
index 591a58d..86a4a9f 100644
--- a/src/common/guac_blank_cursor.h
+++ b/src/common/guac_blank_cursor.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef GUAC_COMMON_BLANK_CURSOR_H

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_clipboard.c
----------------------------------------------------------------------
diff --git a/src/common/guac_clipboard.c b/src/common/guac_clipboard.c
index 12ae2ae..15cdd84 100644
--- a/src/common/guac_clipboard.c
+++ b/src/common/guac_clipboard.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2014 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "config.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_clipboard.h
----------------------------------------------------------------------
diff --git a/src/common/guac_clipboard.h b/src/common/guac_clipboard.h
index cdcded6..5ebb261 100644
--- a/src/common/guac_clipboard.h
+++ b/src/common/guac_clipboard.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2014 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef __GUAC_CLIPBOARD_H

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_cursor.c
----------------------------------------------------------------------
diff --git a/src/common/guac_cursor.c b/src/common/guac_cursor.c
index 7c309b9..e376ab0 100644
--- a/src/common/guac_cursor.c
+++ b/src/common/guac_cursor.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2014 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "guac_blank_cursor.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_cursor.h
----------------------------------------------------------------------
diff --git a/src/common/guac_cursor.h b/src/common/guac_cursor.h
index 154ade2..ae359b7 100644
--- a/src/common/guac_cursor.h
+++ b/src/common/guac_cursor.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2014 Glyptodon LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_display.c
----------------------------------------------------------------------
diff --git a/src/common/guac_display.c b/src/common/guac_display.c
index 4ea9652..a81ff24 100644
--- a/src/common/guac_display.c
+++ b/src/common/guac_display.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2014 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "guac_cursor.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_display.h
----------------------------------------------------------------------
diff --git a/src/common/guac_display.h b/src/common/guac_display.h
index ada5d11..4bac8ea 100644
--- a/src/common/guac_display.h
+++ b/src/common/guac_display.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2014 Glyptodon LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef GUAC_COMMON_DISPLAY_H

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_dot_cursor.c
----------------------------------------------------------------------
diff --git a/src/common/guac_dot_cursor.c b/src/common/guac_dot_cursor.c
index f328ec9..fde79b0 100644
--- a/src/common/guac_dot_cursor.c
+++ b/src/common/guac_dot_cursor.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2013 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "config.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_dot_cursor.h
----------------------------------------------------------------------
diff --git a/src/common/guac_dot_cursor.h b/src/common/guac_dot_cursor.h
index d02f9ef..034d044 100644
--- a/src/common/guac_dot_cursor.h
+++ b/src/common/guac_dot_cursor.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2013 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_ibar_cursor.c
----------------------------------------------------------------------
diff --git a/src/common/guac_ibar_cursor.c b/src/common/guac_ibar_cursor.c
index 1c6f048..6494591 100644
--- a/src/common/guac_ibar_cursor.c
+++ b/src/common/guac_ibar_cursor.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "config.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_ibar_cursor.h
----------------------------------------------------------------------
diff --git a/src/common/guac_ibar_cursor.h b/src/common/guac_ibar_cursor.h
index beb87f1..ae11fff 100644
--- a/src/common/guac_ibar_cursor.h
+++ b/src/common/guac_ibar_cursor.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef GUAC_COMMON_IBAR_CURSOR_H

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_iconv.c
----------------------------------------------------------------------
diff --git a/src/common/guac_iconv.c b/src/common/guac_iconv.c
index 3ef377d..f918226 100644
--- a/src/common/guac_iconv.c
+++ b/src/common/guac_iconv.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2013 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "config.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_iconv.h
----------------------------------------------------------------------
diff --git a/src/common/guac_iconv.h b/src/common/guac_iconv.h
index d6f758b..6381b0a 100644
--- a/src/common/guac_iconv.h
+++ b/src/common/guac_iconv.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2013 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef __GUAC_COMMON_ICONV_H

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_io.c
----------------------------------------------------------------------
diff --git a/src/common/guac_io.c b/src/common/guac_io.c
index b4c87d6..0cefd7a 100644
--- a/src/common/guac_io.c
+++ b/src/common/guac_io.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2013 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "config.h"

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_io.h
----------------------------------------------------------------------
diff --git a/src/common/guac_io.h b/src/common/guac_io.h
index fc8269e..832fc2b 100644
--- a/src/common/guac_io.h
+++ b/src/common/guac_io.h
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2013 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef __GUAC_COMMON_IO_H

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4da3bef4/src/common/guac_json.c
----------------------------------------------------------------------
diff --git a/src/common/guac_json.c b/src/common/guac_json.c
index de5a57e..4bd1140 100644
--- a/src/common/guac_json.c
+++ b/src/common/guac_json.c
@@ -1,23 +1,20 @@
 /*
- * Copyright (C) 2015 Glyptodon LLC
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #include "config.h"