Skip to content

Commit a4c8d14

Browse files
asfernandesasfernandes
committed
Remove legacy user manager.
1 parent a20b7d9 commit a4c8d14

File tree

12 files changed

+3
-1122
lines changed

12 files changed

+3
-1122
lines changed

‎builds/install/arch-specific/win32/BuildExecutableInstall.bat‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
254254
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\yvalve\fbclient.pdb %FB_OUTPUT_DIR%\ > nul
255255
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\engine\engine*.pdb %FB_OUTPUT_DIR%\plugins\ > nul
256256
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\fbtrace\fbtrace.pdb %FB_OUTPUT_DIR%\plugins\ > nul
257-
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\legacy_usermanager\legacy_usermanager.pdb %FB_OUTPUT_DIR%\plugins\ > nul
258257
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\srp\srp.pdb %FB_OUTPUT_DIR%\plugins\ > nul
259258
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\udr_engine\udr_engine.pdb %FB_OUTPUT_DIR%\plugins\ > nul
260259
)

‎builds/install/misc/firebird.conf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,7 @@
444444

445445
# ----------------------------
446446
# UserManager sets the plugins used to work with the security database. If more than
447-
# one plugin is given, the first plugin from the list is used by default. If you
448-
# need to manage legacy logins using legacy tools set it to Legacy_UserManager.
447+
# one plugin is given, the first plugin from the list is used by default.
449448
# Other managers may be chosen in create/alter/drop user commands.
450449
#
451450
# Per-database configurable.

‎builds/posix/Makefile.in‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -619,9 +619,8 @@ $(NBACKUP): $(NBACKUP_Objects) $(COMMON_LIB)
619619
# plugins - some of them are required to build examples, use separate entry for them
620620
#
621621

622-
.PHONY: udr legacy_user_management trace auth_debug udf_compat chacha profiler
622+
.PHONY: udr trace auth_debug udf_compat chacha profiler
623623
UDR_PLUGIN = $(call makePluginName,udr_engine)
624-
LEGACY_USER_MANAGER = $(call makePluginName,Legacy_UserManager)
625624
SRP_USER_MANAGER = $(call makePluginName,Srp)
626625
FBTRACE = $(call makePluginName,fbtrace)
627626
AUTH_DEBUGGER = $(call makePluginName,Auth_Debug)
@@ -635,7 +634,7 @@ ifeq ($(TARGET),Debug)
635634
BUILD_DEBUG:=auth_debug
636635
endif
637636

638-
plugins: udr legacy_user_management srp_user_management trace $(BUILD_DEBUG) udf_compat chacha profiler
637+
plugins: udr srp_user_management trace $(BUILD_DEBUG) udf_compat chacha profiler
639638

640639
udr: $(UDR_PLUGIN) $(PLUGINS)/udr_engine.conf
641640

@@ -646,12 +645,6 @@ $(UDR_PLUGIN): $(UDRENG_Objects) $(COMMON_LIB)
646645
$(LINK_UDRENG) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_UDRENG_LIBS) $(FIREBIRD_LIBRARY_LINK)\
647646
$(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libudr_engine.$(SHRLIB_EXT))
648647

649-
legacy_user_management: $(LEGACY_USER_MANAGER)
650-
651-
$(LEGACY_USER_MANAGER): $(LEGACY_USERS_MANAGE_Objects) $(COMMON_LIB)
652-
$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(RE2LIB) $(FIREBIRD_LIBRARY_LINK)\
653-
$(call LIB_LINK_DARWIN_INSTALL_NAME,plugins/libLegacy_UserManager.$(SHRLIB_EXT))
654-
655648
chacha: $(CHACHA)
656649

657650
$(CHACHA): $(Chacha_Objects) $(COMMON_LIB)

‎builds/posix/make.shared.variables‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,6 @@ ISQL_Test_Objects:= $(call dirObjects,isql/tests)
184184
AllObjects += $(ISQL_Objects) $(ISQL_Test_Objects)
185185

186186

187-
# Legacy users management in security database
188-
LEGACY_USERS_MANAGE_Objects:= $(call makeObjects,auth/SecurityDatabase,LegacyManagement.epp)
189-
190-
AllObjects += $(LEGACY_USERS_MANAGE_Objects)
191-
192-
193187
# SRP-based users management in security database
194188
SRP_USERS_MANAGE_Objects:= $(call dirObjects,auth/SecureRemotePassword/manage) \
195189
$(call dirObjects,auth/SecureRemotePassword)

‎builds/win32/msvc15/Firebird.sln‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ EndProject
3131
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpre", "gpre.vcxproj", "{D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0}"
3232
EndProject
3333
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsec", "gsec.vcxproj", "{7043CC61-DEC1-4C6B-86B9-0E911D1094C9}"
34-
ProjectSection(ProjectDependencies) = postProject
35-
{D836FBF5-071E-4E04-8D63-C7EB6701B296} = {D836FBF5-071E-4E04-8D63-C7EB6701B296}
36-
EndProjectSection
3734
EndProject
3835
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsplit", "gsplit.vcxproj", "{B7F22B7F-9937-4874-9A8B-6AB4E36E74A5}"
3936
EndProject
@@ -72,8 +69,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpre_common", "gpre_common.
7269
EndProject
7370
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yvalve", "yvalve.vcxproj", "{4FE03933-98CD-4879-A135-FD9430087A6B}"
7471
EndProject
75-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "legacy_usermanager", "legacy_usermanager.vcxproj", "{D836FBF5-071E-4E04-8D63-C7EB6701B296}"
76-
EndProject
7772
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srp", "srp.vcxproj", "{BD00D28E-6667-414E-A4B1-6BEFC07ADB42}"
7873
EndProject
7974
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "udf_compat", "udf_compat.vcxproj", "{6794EB8C-6425-422D-A3B0-14EED54C0E98}"
@@ -333,14 +328,6 @@ Global
333328
{4FE03933-98CD-4879-A135-FD9430087A6B}.Release|Win32.Build.0 = Release|Win32
334329
{4FE03933-98CD-4879-A135-FD9430087A6B}.Release|x64.ActiveCfg = Release|x64
335330
{4FE03933-98CD-4879-A135-FD9430087A6B}.Release|x64.Build.0 = Release|x64
336-
{D836FBF5-071E-4E04-8D63-C7EB6701B296}.Debug|Win32.ActiveCfg = Debug|Win32
337-
{D836FBF5-071E-4E04-8D63-C7EB6701B296}.Debug|Win32.Build.0 = Debug|Win32
338-
{D836FBF5-071E-4E04-8D63-C7EB6701B296}.Debug|x64.ActiveCfg = Debug|x64
339-
{D836FBF5-071E-4E04-8D63-C7EB6701B296}.Debug|x64.Build.0 = Debug|x64
340-
{D836FBF5-071E-4E04-8D63-C7EB6701B296}.Release|Win32.ActiveCfg = Release|Win32
341-
{D836FBF5-071E-4E04-8D63-C7EB6701B296}.Release|Win32.Build.0 = Release|Win32
342-
{D836FBF5-071E-4E04-8D63-C7EB6701B296}.Release|x64.ActiveCfg = Release|x64
343-
{D836FBF5-071E-4E04-8D63-C7EB6701B296}.Release|x64.Build.0 = Release|x64
344331
{BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Debug|Win32.ActiveCfg = Debug|Win32
345332
{BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Debug|Win32.Build.0 = Debug|Win32
346333
{BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Debug|x64.ActiveCfg = Debug|x64
@@ -446,7 +433,6 @@ Global
446433
{20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B} = {5A1544E3-A87E-4F78-B197-528C12A64C7D}
447434
{2925B855-5975-44AE-BB00-1217A2A4E511} = {DA5015E4-8349-4DAB-A1E5-18BDBDDA3022}
448435
{4FE03933-98CD-4879-A135-FD9430087A6B} = {5A1544E3-A87E-4F78-B197-528C12A64C7D}
449-
{D836FBF5-071E-4E04-8D63-C7EB6701B296} = {5A1544E3-A87E-4F78-B197-528C12A64C7D}
450436
{BD00D28E-6667-414E-A4B1-6BEFC07ADB42} = {5A1544E3-A87E-4F78-B197-528C12A64C7D}
451437
{6794EB8C-6425-422D-A3B0-14EED54C0E98} = {5A1544E3-A87E-4F78-B197-528C12A64C7D}
452438
{F2E1A852-5A4B-4162-9DA8-0363805FCFD0} = {5A1544E3-A87E-4F78-B197-528C12A64C7D}

‎builds/win32/msvc15/legacy_usermanager.vcxproj‎

Lines changed: 0 additions & 203 deletions
This file was deleted.

‎builds/win32/msvc15/legacy_usermanager.vcxproj.filters‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎builds/win32/preprocess.bat‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ goto :EOF
7373
:MASTER_PROCESS
7474
@set GPRE=%FB_BIN_DIR%\gpre
7575
@for %%i in (alice_meta) do @call :PREPROCESS alice %%i
76-
@for %%i in (LegacyManagement) do @call :PREPROCESS auth/SecurityDatabase %%i
7776
@for %%i in (backup, restore, OdsDetection) do @call :PREPROCESS burp %%i -ocxx -m
7877
@for %%i in (metd) do @call :PREPROCESS dsql %%i -gds_cxx
7978
@for %%i in (DdlNodes, PackageNodes) do @call :PREPROCESS dsql %%i -gds_cxx

0 commit comments

Comments
 (0)