Skip to content

Commit

Permalink
Resolve CORE-6011 - Remove option to support addition of legacy_auth …
Browse files Browse the repository at this point in the history
…from windows installer.
  • Loading branch information
reevespaul committed May 13, 2020
1 parent c9cb780 commit 2af22cb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 35 deletions.
13 changes: 0 additions & 13 deletions builds/install/arch-specific/win32/FirebirdInstall.iss
Expand Up @@ -365,7 +365,6 @@ Name: AutoStartTask; Description: {cm:AutoStartTask}; Components: ServerComponen
;Copying of client libs to <sys>
Name: CopyFbClientToSysTask; Description: {cm:CopyFbClientToSysTask}; Components: ClientComponent; MinVersion: 4,4; Check: ShowCopyFbClientLibTask;
Name: CopyFbClientAsGds32Task; Description: {cm:CopyFbClientAsGds32Task}; Components: ClientComponent; MinVersion: 4,4; Flags: Unchecked; Check: ShowCopyGds32Task;
Name: EnableLegacyClientAuth; Description: {cm:EnableLegacyClientAuth}; Components: ClientComponent; MinVersion: 4,4; Flags: Unchecked; Check: ConfigureAuthentication;


[Run]
Expand Down Expand Up @@ -854,9 +853,6 @@ begin
AStringList := TStringList.create;
with AStringList do begin
Add( 'create user ' + GetAdminUserName + ' password ''' + GetAdminUserPassword + ''' using plugin Srp;' );
if WizardIsTaskSelected('EnableLegacyClientAuth') then
if ( ( uppercase( GetAdminUserName ) <> 'SYSDBA' ) or ( GetAdminUserPassword <> 'masterkey' ) ) then
Add( 'create or alter user ' + GetAdminUserName + ' password ''' + GetAdminUserPassword + ''' using plugin Legacy_UserManager;' );
Add( 'commit;' ); //Technically exit implies a commit so this not necessary. OTOH, explicitly committing makes for more readable code.
Add( 'exit;' );
SaveToFile( Tempdir +'\temp.sql' );
Expand Down Expand Up @@ -930,8 +926,6 @@ procedure UpdateFirebirdConf;
// Update firebird conf.
// If user has deselected the guardian we should update firebird.conf accordingly.
// We also test if user has asked for classic or super server
// If EnableLegacyClientAuth has ben selected we update the file.......
// Otherwise we leave the file unchanged.
begin
//There is no simple, foolproof and futureproof way to check whether
//we are doing a server install, so the easiest way is to see if a
Expand All @@ -957,13 +951,6 @@ begin
if WizardIsTaskSelected('UseSuperServerTask') then
ReplaceLine(GetAppPath+'\firebird.conf','ServerMode = ','ServerMode = Super','#');
if WizardIsTaskSelected('EnableLegacyClientAuth') then begin
ReplaceLine(GetAppPath+'\firebird.conf','AuthServer = ','AuthServer = Legacy_Auth, Srp, Win_Sspi','#');
ReplaceLine(GetAppPath+'\firebird.conf','AuthClient = ','AuthClient = Legacy_Auth, Srp, Win_Sspi','#');
ReplaceLine(GetAppPath+'\firebird.conf','UserManager = ','UserManager = Legacy_UserManager, Srp','#');
ReplaceLine(GetAppPath+'\firebird.conf','WireCrypt = ','WireCrypt = enabled','#');
end;
end;
end;
Expand Down
23 changes: 4 additions & 19 deletions builds/install/arch-specific/win32/installation_readme.txt
Expand Up @@ -37,20 +37,6 @@ fbclient.dll and gds32.dll are removed from <system32>.
See the UNINSTALL section below for more info on this.



Deployment of gds32.dll
-----------------------

This compatibility library is no longer deployed into
the windows system directory by default. We cannot
guarantee that the required MSVC runtimes will be
available. However it remains an option at install
time, along with system deployment of fbclient.dll.

Be sure to check that your target system has the
appropriate MSVC12 runtimes if you use these options.


Installation of the Guardian
----------------------------

Expand All @@ -64,11 +50,10 @@ it is offered but not selected by default.
Re-installation of Firebird
---------------------------

The binary installer does its best to detect and
preserve a previous install. If the installer detects
firebird.conf or security4.fdb it will not offer the
option to install legacy_auth. Neither will it offer
the option to set the SYSDBA username and password.
The binary installer does its best to detect and
preserve a previous install. If the installer detects
firebird.conf or security4.fdb it will not offer the
option to set the SYSDBA username and password.


Known installation problems
Expand Down
4 changes: 1 addition & 3 deletions builds/install/arch-specific/win32/installation_scripted.txt
Expand Up @@ -95,7 +95,6 @@ HELP
AutoStartTask
CopyFbClientToSysTask
CopyFbClientAsGds32Task
EnableLegacyClientAuth


Only the specified tasks (and their children) will be selected; the rest
Expand Down Expand Up @@ -167,9 +166,8 @@ they will probably be combined with options such as /SILENT, /LOG,
1/ Full server install of super server architecture
o Change SYSDBA password from default masterkey,
o deploy gds32 to <SYS>
o enable legacy authentication for older clients

/MERGETASKS="CopyFbClientAsGds32Task,EnableLegacyClientAuth" /SYSDBAPASSWORD="mypassword"
/MERGETASKS="CopyFbClientAsGds32Task" /SYSDBAPASSWORD="mypassword"

2/ Deploy Classic Server and keep other default tasks

Expand Down

0 comments on commit 2af22cb

Please sign in to comment.