|
From: <ale...@us...> - 2013-10-30 12:23:48
|
Revision: 58736
http://sourceforge.net/p/firebird/code/58736
Author: alexpeshkoff
Date: 2013-10-30 12:23:45 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
Cleanup - "Authentication" parameter from firebird.conf is overriden by "AuthServer"
Modified Paths:
--------------
firebird/trunk/builds/install/misc/firebird.conf.in
firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
firebird/trunk/src/common/config/config.cpp
firebird/trunk/src/common/config/config.h
Modified: firebird/trunk/builds/install/misc/firebird.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.conf.in 2013-10-30 12:11:40 UTC (rev 58735)
+++ firebird/trunk/builds/install/misc/firebird.conf.in 2013-10-30 12:23:45 UTC (rev 58736)
@@ -188,19 +188,6 @@
# ----------------------------
-# Which authentication method(s) should be used.
-# "native" means use of only traditional interbase/firebird
-# authentication with security database.
-# "trusted" (Windows Only) makes use of window trusted authentication,
-# and in some aspects this is the most secure way to authenticate.
-# "mixed" means both methods may be used.
-#
-# Type: string
-#
-#Authentication = native
-
-
-# ----------------------------
# Trace configuration file for system audit
#
# Empty value means that system audit is turned off.
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2013-10-30 12:11:40 UTC (rev 58735)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2013-10-30 12:23:45 UTC (rev 58736)
@@ -302,21 +302,6 @@
int SecurityDatabase::verify(IWriter* authBlock, IServerBlock* sBlock)
{
- static AmCache useNative = AM_UNKNOWN;
-
- if (useNative == AM_UNKNOWN)
- {
- // We use PathName for string comparison using platform filename comparison
- // rules (case-sensitive or case-insensitive).
- const PathName authMethod(Config::getAuthMethod());
- useNative = (authMethod == AmNative || authMethod == AmMixed) ? AM_ENABLED : AM_DISABLED;
- }
-
- if (useNative == AM_DISABLED)
- {
- return AUTH_CONTINUE;
- }
-
const char* user = sBlock->getLogin();
string login(user ? user : "");
Modified: firebird/trunk/src/common/config/config.cpp
===================================================================
--- firebird/trunk/src/common/config/config.cpp 2013-10-30 12:11:40 UTC (rev 58735)
+++ firebird/trunk/src/common/config/config.cpp 2013-10-30 12:23:45 UTC (rev 58736)
@@ -117,11 +117,7 @@
const char* GCPolicyBackground = "background";
const char* GCPolicyCombined = "combined";
-const char* AmNative = "native";
-const char* AmTrusted = "trusted";
-const char* AmMixed = "mixed";
-
const Config::ConfigEntry Config::entries[MAX_CONFIG_KEY] =
{
{TYPE_INTEGER, "TempBlockSize", (ConfigValue) 1048576}, // bytes
@@ -167,7 +163,6 @@
{TYPE_BOOLEAN, "LegacyHash", (ConfigValue) true}, // let use old passwd hash verification
{TYPE_STRING, "GCPolicy", (ConfigValue) NULL}, // garbage collection policy
{TYPE_BOOLEAN, "Redirection", (ConfigValue) false},
- {TYPE_STRING, "Authentication", (ConfigValue) AmNative}, // use native, trusted or mixed
{TYPE_INTEGER, "DatabaseGrowthIncrement", (ConfigValue) 128 * 1048576}, // bytes
{TYPE_INTEGER, "FileSystemCacheThreshold", (ConfigValue) 65536}, // page buffers
{TYPE_BOOLEAN, "RelaxedAliasChecking", (ConfigValue) false}, // if true relax strict alias checking rules in DSQL a bit
@@ -608,11 +603,6 @@
return (bool) getDefaultConfig()->values[KEY_REDIRECTION];
}
-const char *Config::getAuthMethod()
-{
- return (const char*) getDefaultConfig()->values[KEY_AUTH_METHOD];
-}
-
int Config::getDatabaseGrowthIncrement() const
{
return get<int>(KEY_DATABASE_GROWTH_INCREMENT);
Modified: firebird/trunk/src/common/config/config.h
===================================================================
--- firebird/trunk/src/common/config/config.h 2013-10-30 12:11:40 UTC (rev 58735)
+++ firebird/trunk/src/common/config/config.h 2013-10-30 12:23:45 UTC (rev 58736)
@@ -123,7 +123,6 @@
KEY_LEGACY_HASH,
KEY_GC_POLICY,
KEY_REDIRECTION,
- KEY_AUTH_METHOD,
KEY_DATABASE_GROWTH_INCREMENT,
KEY_FILESYSTEM_CACHE_THRESHOLD,
KEY_RELAXED_ALIAS_CHECKING,
@@ -312,9 +311,6 @@
// Redirection
static bool getRedirection();
- // Use native, trusted or mixed authentication
- static const char* getAuthMethod();
-
int getDatabaseGrowthIncrement() const;
int getFileSystemCacheThreshold() const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|