From cc9a6832ff84ec9872a94c0201fce7f11bc54dc7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 23:21:32 -0600 Subject: Fix prior commit --- kuser/kglobal.cpp | 86 ----------------------------------------------------- kuser/tdeglobal.cpp | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 86 deletions(-) delete mode 100644 kuser/kglobal.cpp create mode 100644 kuser/tdeglobal.cpp (limited to 'kuser') diff --git a/kuser/kglobal.cpp b/kuser/kglobal.cpp deleted file mode 100644 index 287f475..0000000 --- a/kuser/kglobal.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 1998 Denis Perchine - * Copyright (c) 2004 Szombathelyi György - * Former maintainer: Adriaan de Groot - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License version 2 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - **/ - -#include - -#include "kglobal_.h" -#include "kuserfiles.h" -#include "kgroupfiles.h" -#include "kuserldap.h" -#include "kgroupldap.h" -#include "kusersystem.h" -#include "kgroupsystem.h" - -KUserGlobals::KUserGlobals() -{ - cfg = 0; - - users = 0; - groups = 0; -} - -void KUserGlobals::initCfg( const TQString &connection ) -{ - if ( cfg ) { - cfg->writeConfig(); - delete cfg; - } - cfg = new KUserPrefsBase( kapp->sharedConfig(), connection ); - cfg->readConfig(); -} - -void KUserGlobals::init() -{ - if ( users ) delete users; - if ( groups ) delete groups; - SID::setAlgRidBase( cfg->samridbase() ); - kdDebug() << "Algorithmic RID base: " << SID::getAlgRidBase() << endl; - switch ( cfg->source() ) { - case KUserPrefsBase::EnumSource::Files: - users = new KUserFiles( cfg ); - groups = new KGroupFiles( cfg ); - break; - case KUserPrefsBase::EnumSource::LDAP: - users = new KUserLDAP( cfg ); - groups = new KGroupLDAP( cfg ); - break; - case KUserPrefsBase::EnumSource::System: - users = new KUserSystem( cfg ); - groups = new KGroupSystem( cfg ); - break; - } -} - -KUserGlobals::~KUserGlobals() -{ - delete users; - delete groups; - delete cfg; -} - -KU::KUsers &KUserGlobals::getUsers() -{ - return (*users); -} - -KU::KGroups &KUserGlobals::getGroups() -{ - return (*groups); -} diff --git a/kuser/tdeglobal.cpp b/kuser/tdeglobal.cpp new file mode 100644 index 0000000..287f475 --- /dev/null +++ b/kuser/tdeglobal.cpp @@ -0,0 +1,86 @@ +/* + * Copyright (c) 1998 Denis Perchine + * Copyright (c) 2004 Szombathelyi György + * Former maintainer: Adriaan de Groot + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License version 2 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + **/ + +#include + +#include "kglobal_.h" +#include "kuserfiles.h" +#include "kgroupfiles.h" +#include "kuserldap.h" +#include "kgroupldap.h" +#include "kusersystem.h" +#include "kgroupsystem.h" + +KUserGlobals::KUserGlobals() +{ + cfg = 0; + + users = 0; + groups = 0; +} + +void KUserGlobals::initCfg( const TQString &connection ) +{ + if ( cfg ) { + cfg->writeConfig(); + delete cfg; + } + cfg = new KUserPrefsBase( kapp->sharedConfig(), connection ); + cfg->readConfig(); +} + +void KUserGlobals::init() +{ + if ( users ) delete users; + if ( groups ) delete groups; + SID::setAlgRidBase( cfg->samridbase() ); + kdDebug() << "Algorithmic RID base: " << SID::getAlgRidBase() << endl; + switch ( cfg->source() ) { + case KUserPrefsBase::EnumSource::Files: + users = new KUserFiles( cfg ); + groups = new KGroupFiles( cfg ); + break; + case KUserPrefsBase::EnumSource::LDAP: + users = new KUserLDAP( cfg ); + groups = new KGroupLDAP( cfg ); + break; + case KUserPrefsBase::EnumSource::System: + users = new KUserSystem( cfg ); + groups = new KGroupSystem( cfg ); + break; + } +} + +KUserGlobals::~KUserGlobals() +{ + delete users; + delete groups; + delete cfg; +} + +KU::KUsers &KUserGlobals::getUsers() +{ + return (*users); +} + +KU::KGroups &KUserGlobals::getGroups() +{ + return (*groups); +} -- cgit v1.2.1