Skip to content

GitLab

Synchronet
Synchronet
Commit 06e558ec authored by Deuce's avatar Deuce 👌🏾
Browse files
Options

Merge remote-tracking branch 'origin/master' into leenooks/sbbs-master

parents 25a960f7 796c3db7
Pipeline #750 failed with stage
    in 32 minutes and 9 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 22 additions and 23 deletions
    src/sbbs3/echocfg.vcxproj
    View file @ 06e558ec
    ......@@ -97,7 +97,7 @@
    <DataExecutionPrevention>
    </DataExecutionPrevention>
    <TargetMachine>MachineX86</TargetMachine>
    <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <Bscmake>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    ......@@ -138,7 +138,7 @@
    <DataExecutionPrevention>
    </DataExecutionPrevention>
    <TargetMachine>MachineX86</TargetMachine>
    <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <Bscmake>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    ......
    src/sbbs3/ftpsrvr.vcxproj
    View file @ 06e558ec
    ......@@ -95,7 +95,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>wsock32.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.dll.release/ftpsrvr.dll</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <ProgramDatabaseFile>.\msvc.win32.dll.release/ftpsrvr.pdb</ProgramDatabaseFile>
    ......@@ -143,7 +143,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>wsock32.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.dll.debug/ftpsrvr.dll</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    ......
    src/sbbs3/jsexec.vcxproj
    View file @ 06e558ec
    ......@@ -93,7 +93,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>setargv.obj;wsock32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>setargv.obj;ws2_32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.exe.release/jsexec.exe</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <ProgramDatabaseFile>.\msvc.win32.exe.release/jsexec.pdb</ProgramDatabaseFile>
    ......@@ -133,7 +133,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>setargv.obj;wsock32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>setargv.obj;ws2_32.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.exe.debug/jsexec.exe</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    ......
    src/sbbs3/mailsrvr.vcxproj
    View file @ 06e558ec
    ......@@ -96,7 +96,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>wsock32.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.dll.debug/mailsrvr.dll</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    ......@@ -146,7 +146,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>wsock32.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>ws2_32.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.dll.release/mailsrvr.dll</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <ProgramDatabaseFile>.\msvc.win32.dll.release/mailsrvr.pdb</ProgramDatabaseFile>
    ......
    src/sbbs3/ntsvcs.vcxproj
    View file @ 06e558ec
    ......@@ -90,7 +90,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>msvc.win32.exe.debug/sbbsNTsvcs.exe</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    ......@@ -132,7 +132,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>msvc.win32.exe.release/sbbsNTsvcs.exe</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <ProgramDatabaseFile>.\msvc.win32.exe.release/sbbsNTsvcs.pdb</ProgramDatabaseFile>
    ......
    src/sbbs3/sbbscon.vcxproj
    View file @ 06e558ec
    ......@@ -86,7 +86,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>msvc.win32.exe.debug/sbbs.exe</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    ......@@ -129,7 +129,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>msvc.win32.exe.release/sbbs.exe</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <ProgramDatabaseFile>.\msvc.win32.exe.release/sbbs.pdb</ProgramDatabaseFile>
    ......
    src/sbbs3/sbbsecho.c
    View file @ 06e558ec
    ......@@ -3322,9 +3322,8 @@ int fmsgtosmsg(char* fbuf, fmsghdr_t* hdr, uint usernumber, uint subnum)
    lprintf(LOG_ERR, "Error %d reading user #%u", i, usernumber);
    return SMB_FAILURE;
    }
    uint16_t nettype;
    if((scfg.sys_misc&SM_FWDTONET) && (user.misc&NETMAIL)
    && (nettype = smb_netaddr_type(user.netmail)) >= NET_UNKNOWN) {
    if((scfg.sys_misc&SM_FWDTONET) && (user.misc&NETMAIL) && is_supported_netmail_addr(&scfg, user.netmail)) {
    uint16_t nettype = NET_UNKNOWN;
    smb_hfield_netaddr(&msg, RECIPIENTNETADDR, user.netmail, &nettype);
    smb_hfield_bin(&msg, RECIPIENTNETTYPE, nettype);
    } else {
    ......
    src/sbbs3/scfg/scfg.vcxproj
    View file @ 06e558ec
    ......@@ -88,7 +88,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.exe.debug/scfg.exe</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    ......@@ -131,7 +131,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.exe.release/scfg.exe</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <ProgramDatabaseFile>.\msvc.win32.exe.release/scfg.pdb</ProgramDatabaseFile>
    ......
    src/sbbs3/services.vcxproj
    View file @ 06e558ec
    ......@@ -95,7 +95,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.dll.debug/services.dll</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    ......@@ -145,7 +145,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.dll.release/services.dll</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <ProgramDatabaseFile>.\msvc.win32.dll.release/services.pdb</ProgramDatabaseFile>
    ......
    src/sbbs3/sexyz.vcxproj
    View file @ 06e558ec
    ......@@ -82,7 +82,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.exe.debug/sexyz.exe</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    ......@@ -126,7 +126,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.exe.release/sexyz.exe</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <ProgramDatabaseFile>.\msvc.win32.exe.release/sexyz.pdb</ProgramDatabaseFile>
    ......
    src/sbbs3/websrvr.vcxproj
    View file @ 06e558ec
    ......@@ -97,7 +97,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.dll.release/websrvr.dll</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <ProgramDatabaseFile>.\msvc.win32.dll.release/websrvr.pdb</ProgramDatabaseFile>
    ......@@ -145,7 +145,7 @@
    <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
    <OutputFile>.\msvc.win32.dll.debug/websrvr.dll</OutputFile>
    <SuppressStartupBanner>true</SuppressStartupBanner>
    <GenerateDebugInformation>true</GenerateDebugInformation>
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment