Commit e389626d authored by jan.koester's avatar jan.koester
Browse files

trest

parent 720011d7

.gitignore

+1 −0
Changes for .gitignore: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
build/*

/.vs

/out/build/x64-Debug

out/*
 
 No newline at end of file

CMakeLists.txt

+5 −1
Changes for CMakeLists.txt: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD 20) 
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)



add_definitions(-D${CMAKE_HOST_SYSTEM_NAME} -DDATAPATH="${CMAKE_INSTALL_PREFIX}/data")

add_definitions(-D${CMAKE_HOST_SYSTEM_NAME} -DDATAPATH="${CMAKE_INSTALL_PREFIX}/share/authdb/data")



message(STATUS "System: ${CMAKE_HOST_SYSTEM_NAME}")
@@ -18,6 +18,8 @@ set(version 0.1) 


set(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake" )



link_directories("lib")



find_package(libconfplus REQUIRED)

find_package(libcmdplus REQUIRED)

find_package(libnetplus REQUIRED)
@@ -34,3 +36,5 @@ add_subdirectory(src) 
add_subdirectory(client)

add_subdirectory(cli)

add_subdirectory(bindings)



install(DIRECTORY data DESTINATION share/authdb)
 
 No newline at end of file

data/config_win.yaml

+1 −1
Changes for data/config_win.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ AUTHDB: 
    BIND: "0.0.0.0"

    MAXCONN: 1024

    ADMINDB:

        PATH: ".\admin.db"
 
        PATH: "C:\\Users\\jan.koester\\admin.db"

src/CMakeLists.txt

+7 −2
Changes for src/CMakeLists.txt: 7 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -63,5 +63,10 @@ target_link_libraries(authdb PUBLIC authobj) 


install(FILES session.h authdb.h backend.h types.h group.h user.h DESTINATION include/authdb)



install(TARGETS fback DESTINATION lib EXPORT authdbTargets)

install(TARGETS authdb DESTINATION bin)
 
install(TARGETS fback EXPORT authdbTargets DESTINATION LIBRARY DESTINATION RUNTIMES )

install(TARGETS authdb DESTINATION bin RUNTIME_DEPENDENCY_SET authdyn)



#install(RUNTIME_DEPENDENCY_SET authdyn     

#    PRE_EXCLUDE_REGEXES [=[api-ms-]=] [=[ext-ms-]=]

#    POST_EXCLUDE_REGEXES [=[.*\\\\System32\\\\.*\\.dll]=]

#)
 
 No newline at end of file

src/backends/file.cpp

+6 −3
Changes for src/backends/file.cpp: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -42,10 +42,13 @@ 
authdb::File::File(const char* path,size_t version,const char *domain){

#ifdef Windows

    // Attempt to open the file.

    _FileDes = CreateFileA(

    _FileDes = INVALID_HANDLE_VALUE;

	_LockDes = INVALID_HANDLE_VALUE;



    _FileDes = CreateFile(

        path,                  // File path

        GENERIC_READ | GENERIC_WRITE, // Desired access: read and write

        FILE_SHARE_READ,       // Share mode: allow other processes to read

        FILE_SHARE_READ | FILE_SHARE_WRITE,       // Share mode: allow other processes to read

        NULL,                  // Security attributes (use default)

        OPEN_EXISTING,         // Creation disposition: open existing file

        FILE_ATTRIBUTE_NORMAL, // File attributes
@@ -54,7 +57,7 @@ authdb::File::File(const char* path,size_t version,const char *domain){ 
    // Check if opening the file succeeded.

    if (_FileDes == INVALID_HANDLE_VALUE) {

        // File does not exist, so try to create it.

        _FileDes = CreateFileA(

        _FileDes = CreateFile(

            path,

            GENERIC_READ | GENERIC_WRITE,

            FILE_SHARE_READ,