From c208c5a8997d0456cc55e86edd12174ee35310a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Mon, 5 Mar 2012 17:11:15 -0500 Subject: [PATCH] libfreerdp-sspi: rename from libfreerdp-auth --- CMakeLists.txt | 2 +- cunit/CMakeLists.txt | 2 +- cunit/test_ntlm.c | 6 +++--- libfreerdp-core/CMakeLists.txt | 2 +- .../CMakeLists.txt | 16 ++++++++-------- .../Kerberos/kerberos.c | 0 .../Kerberos/kerberos.h | 0 .../Kerberos/kerberos_crypto.c | 0 .../Kerberos/kerberos_crypto.h | 0 .../Kerberos/kerberos_decode.c | 0 .../Kerberos/kerberos_decode.h | 0 .../Kerberos/kerberos_encode.c | 0 .../Kerberos/kerberos_encode.h | 0 {libfreerdp-auth => libfreerdp-sspi}/NTLM/ntlm.c | 0 {libfreerdp-auth => libfreerdp-sspi}/NTLM/ntlm.h | 0 .../NTLM/ntlm_compute.c | 0 .../NTLM/ntlm_compute.h | 0 .../NTLM/ntlm_message.c | 0 .../NTLM/ntlm_message.h | 0 .../Negotiate/negotiate.c | 0 .../Negotiate/negotiate.h | 0 {libfreerdp-auth => libfreerdp-sspi}/credssp.c | 0 {libfreerdp-auth => libfreerdp-sspi}/sspi.c | 0 {libfreerdp-auth => libfreerdp-sspi}/sspi.h | 0 server/X11/CMakeLists.txt | 2 +- 25 files changed, 15 insertions(+), 15 deletions(-) rename {libfreerdp-auth => libfreerdp-sspi}/CMakeLists.txt (79%) rename {libfreerdp-auth => libfreerdp-sspi}/Kerberos/kerberos.c (100%) rename {libfreerdp-auth => libfreerdp-sspi}/Kerberos/kerberos.h (100%) rename {libfreerdp-auth => libfreerdp-sspi}/Kerberos/kerberos_crypto.c (100%) rename {libfreerdp-auth => libfreerdp-sspi}/Kerberos/kerberos_crypto.h (100%) rename {libfreerdp-auth => libfreerdp-sspi}/Kerberos/kerberos_decode.c (100%) rename {libfreerdp-auth => libfreerdp-sspi}/Kerberos/kerberos_decode.h (100%) rename {libfreerdp-auth => libfreerdp-sspi}/Kerberos/kerberos_encode.c (100%) rename {libfreerdp-auth => libfreerdp-sspi}/Kerberos/kerberos_encode.h (100%) rename {libfreerdp-auth => libfreerdp-sspi}/NTLM/ntlm.c (100%) rename {libfreerdp-auth => libfreerdp-sspi}/NTLM/ntlm.h (100%) rename {libfreerdp-auth => libfreerdp-sspi}/NTLM/ntlm_compute.c (100%) rename {libfreerdp-auth => libfreerdp-sspi}/NTLM/ntlm_compute.h (100%) rename {libfreerdp-auth => libfreerdp-sspi}/NTLM/ntlm_message.c (100%) rename {libfreerdp-auth => libfreerdp-sspi}/NTLM/ntlm_message.h (100%) rename {libfreerdp-auth => libfreerdp-sspi}/Negotiate/negotiate.c (100%) rename {libfreerdp-auth => libfreerdp-sspi}/Negotiate/negotiate.h (100%) rename {libfreerdp-auth => libfreerdp-sspi}/credssp.c (100%) rename {libfreerdp-auth => libfreerdp-sspi}/sspi.c (100%) rename {libfreerdp-auth => libfreerdp-sspi}/sspi.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0aa25a788..c62494732 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,7 @@ add_subdirectory(libfreerdp-rail) add_subdirectory(libfreerdp-cache) add_subdirectory(libfreerdp-codec) add_subdirectory(libfreerdp-crypto) -add_subdirectory(libfreerdp-auth) +add_subdirectory(libfreerdp-sspi) add_subdirectory(libfreerdp-channels) add_subdirectory(libfreerdp-locale) add_subdirectory(libfreerdp-core) diff --git a/cunit/CMakeLists.txt b/cunit/CMakeLists.txt index 5d80931ec..493afe18e 100644 --- a/cunit/CMakeLists.txt +++ b/cunit/CMakeLists.txt @@ -78,6 +78,6 @@ target_link_libraries(test_freerdp freerdp-utils) target_link_libraries(test_freerdp freerdp-channels) target_link_libraries(test_freerdp freerdp-codec) target_link_libraries(test_freerdp freerdp-crypto) -target_link_libraries(test_freerdp freerdp-auth) +target_link_libraries(test_freerdp freerdp-sspi) add_test(CUnitTests ${EXECUTABLE_OUTPUT_PATH}/test_freerdp) diff --git a/cunit/test_ntlm.c b/cunit/test_ntlm.c index 236576c5e..9680ff164 100644 --- a/cunit/test_ntlm.c +++ b/cunit/test_ntlm.c @@ -22,9 +22,9 @@ #include #include -#include "libfreerdp-auth/NTLM/ntlm.h" -#include "libfreerdp-auth/NTLM/ntlm_compute.h" -#include "libfreerdp-auth/NTLM/ntlm_message.h" +#include "libfreerdp-sspi/NTLM/ntlm.h" +#include "libfreerdp-sspi/NTLM/ntlm_compute.h" +#include "libfreerdp-sspi/NTLM/ntlm_message.h" #include "test_ntlm.h" diff --git a/libfreerdp-core/CMakeLists.txt b/libfreerdp-core/CMakeLists.txt index 34d55e6be..db7e2c1f0 100644 --- a/libfreerdp-core/CMakeLists.txt +++ b/libfreerdp-core/CMakeLists.txt @@ -98,7 +98,7 @@ endif() target_link_libraries(freerdp-core freerdp-utils) target_link_libraries(freerdp-core freerdp-codec) target_link_libraries(freerdp-core freerdp-crypto) -target_link_libraries(freerdp-core freerdp-auth) +target_link_libraries(freerdp-core freerdp-sspi) target_link_libraries(freerdp-core freerdp-locale) target_link_libraries(freerdp-core ${OPENSSL_LIBRARIES}) diff --git a/libfreerdp-auth/CMakeLists.txt b/libfreerdp-sspi/CMakeLists.txt similarity index 79% rename from libfreerdp-auth/CMakeLists.txt rename to libfreerdp-sspi/CMakeLists.txt index 32c44792f..7cc950dbb 100644 --- a/libfreerdp-auth/CMakeLists.txt +++ b/libfreerdp-sspi/CMakeLists.txt @@ -1,5 +1,5 @@ # FreeRDP: A Remote Desktop Protocol Client -# libfreerdp-auth cmake build script +# libfreerdp-sspi cmake build script # # Copyright 2011 O.S. Systems Software Ltda. # Copyright 2011 Otavio Salvador @@ -39,7 +39,7 @@ set(FREERDP_SSPI_NEGOTIATE_SRCS Negotiate/negotiate.c Negotiate/negotiate.h) -set(FREERDP_AUTH_SRCS +set(FREERDP_SSPI_SRCS ${FREERDP_SSPI_NTLM_SRCS} ${FREERDP_SSPI_KERBEROS_SRCS} ${FREERDP_SSPI_NEGOTIATE_SRCS} @@ -47,16 +47,16 @@ set(FREERDP_AUTH_SRCS sspi.h credssp.c) -add_library(freerdp-auth ${FREERDP_AUTH_SRCS}) +add_library(freerdp-sspi ${FREERDP_SSPI_SRCS}) include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${ZLIB_INCLUDE_DIRS}) -set_target_properties(freerdp-auth PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") +set_target_properties(freerdp-sspi PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") -target_link_libraries(freerdp-auth freerdp-utils) -target_link_libraries(freerdp-auth freerdp-crypto) -target_link_libraries(freerdp-auth ${ZLIB_LIBRARIES}) +target_link_libraries(freerdp-sspi freerdp-utils) +target_link_libraries(freerdp-sspi freerdp-crypto) +target_link_libraries(freerdp-sspi ${ZLIB_LIBRARIES}) -install(TARGETS freerdp-auth DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(TARGETS freerdp-sspi DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/libfreerdp-auth/Kerberos/kerberos.c b/libfreerdp-sspi/Kerberos/kerberos.c similarity index 100% rename from libfreerdp-auth/Kerberos/kerberos.c rename to libfreerdp-sspi/Kerberos/kerberos.c diff --git a/libfreerdp-auth/Kerberos/kerberos.h b/libfreerdp-sspi/Kerberos/kerberos.h similarity index 100% rename from libfreerdp-auth/Kerberos/kerberos.h rename to libfreerdp-sspi/Kerberos/kerberos.h diff --git a/libfreerdp-auth/Kerberos/kerberos_crypto.c b/libfreerdp-sspi/Kerberos/kerberos_crypto.c similarity index 100% rename from libfreerdp-auth/Kerberos/kerberos_crypto.c rename to libfreerdp-sspi/Kerberos/kerberos_crypto.c diff --git a/libfreerdp-auth/Kerberos/kerberos_crypto.h b/libfreerdp-sspi/Kerberos/kerberos_crypto.h similarity index 100% rename from libfreerdp-auth/Kerberos/kerberos_crypto.h rename to libfreerdp-sspi/Kerberos/kerberos_crypto.h diff --git a/libfreerdp-auth/Kerberos/kerberos_decode.c b/libfreerdp-sspi/Kerberos/kerberos_decode.c similarity index 100% rename from libfreerdp-auth/Kerberos/kerberos_decode.c rename to libfreerdp-sspi/Kerberos/kerberos_decode.c diff --git a/libfreerdp-auth/Kerberos/kerberos_decode.h b/libfreerdp-sspi/Kerberos/kerberos_decode.h similarity index 100% rename from libfreerdp-auth/Kerberos/kerberos_decode.h rename to libfreerdp-sspi/Kerberos/kerberos_decode.h diff --git a/libfreerdp-auth/Kerberos/kerberos_encode.c b/libfreerdp-sspi/Kerberos/kerberos_encode.c similarity index 100% rename from libfreerdp-auth/Kerberos/kerberos_encode.c rename to libfreerdp-sspi/Kerberos/kerberos_encode.c diff --git a/libfreerdp-auth/Kerberos/kerberos_encode.h b/libfreerdp-sspi/Kerberos/kerberos_encode.h similarity index 100% rename from libfreerdp-auth/Kerberos/kerberos_encode.h rename to libfreerdp-sspi/Kerberos/kerberos_encode.h diff --git a/libfreerdp-auth/NTLM/ntlm.c b/libfreerdp-sspi/NTLM/ntlm.c similarity index 100% rename from libfreerdp-auth/NTLM/ntlm.c rename to libfreerdp-sspi/NTLM/ntlm.c diff --git a/libfreerdp-auth/NTLM/ntlm.h b/libfreerdp-sspi/NTLM/ntlm.h similarity index 100% rename from libfreerdp-auth/NTLM/ntlm.h rename to libfreerdp-sspi/NTLM/ntlm.h diff --git a/libfreerdp-auth/NTLM/ntlm_compute.c b/libfreerdp-sspi/NTLM/ntlm_compute.c similarity index 100% rename from libfreerdp-auth/NTLM/ntlm_compute.c rename to libfreerdp-sspi/NTLM/ntlm_compute.c diff --git a/libfreerdp-auth/NTLM/ntlm_compute.h b/libfreerdp-sspi/NTLM/ntlm_compute.h similarity index 100% rename from libfreerdp-auth/NTLM/ntlm_compute.h rename to libfreerdp-sspi/NTLM/ntlm_compute.h diff --git a/libfreerdp-auth/NTLM/ntlm_message.c b/libfreerdp-sspi/NTLM/ntlm_message.c similarity index 100% rename from libfreerdp-auth/NTLM/ntlm_message.c rename to libfreerdp-sspi/NTLM/ntlm_message.c diff --git a/libfreerdp-auth/NTLM/ntlm_message.h b/libfreerdp-sspi/NTLM/ntlm_message.h similarity index 100% rename from libfreerdp-auth/NTLM/ntlm_message.h rename to libfreerdp-sspi/NTLM/ntlm_message.h diff --git a/libfreerdp-auth/Negotiate/negotiate.c b/libfreerdp-sspi/Negotiate/negotiate.c similarity index 100% rename from libfreerdp-auth/Negotiate/negotiate.c rename to libfreerdp-sspi/Negotiate/negotiate.c diff --git a/libfreerdp-auth/Negotiate/negotiate.h b/libfreerdp-sspi/Negotiate/negotiate.h similarity index 100% rename from libfreerdp-auth/Negotiate/negotiate.h rename to libfreerdp-sspi/Negotiate/negotiate.h diff --git a/libfreerdp-auth/credssp.c b/libfreerdp-sspi/credssp.c similarity index 100% rename from libfreerdp-auth/credssp.c rename to libfreerdp-sspi/credssp.c diff --git a/libfreerdp-auth/sspi.c b/libfreerdp-sspi/sspi.c similarity index 100% rename from libfreerdp-auth/sspi.c rename to libfreerdp-sspi/sspi.c diff --git a/libfreerdp-auth/sspi.h b/libfreerdp-sspi/sspi.h similarity index 100% rename from libfreerdp-auth/sspi.h rename to libfreerdp-sspi/sspi.h diff --git a/server/X11/CMakeLists.txt b/server/X11/CMakeLists.txt index 127cb5bd1..441869a39 100644 --- a/server/X11/CMakeLists.txt +++ b/server/X11/CMakeLists.txt @@ -65,6 +65,6 @@ target_link_libraries(xfreerdp-server freerdp-codec) target_link_libraries(xfreerdp-server freerdp-utils) target_link_libraries(xfreerdp-server freerdp-gdi) target_link_libraries(xfreerdp-server freerdp-crypto) -target_link_libraries(xfreerdp-server freerdp-auth) +target_link_libraries(xfreerdp-server freerdp-sspi) target_link_libraries(xfreerdp-server freerdp-locale) target_link_libraries(xfreerdp-server ${X11_LIBRARIES})