Monotone-Parent: 7a136eaa02ec3a94eb1e5d03db3079470f49374e
Monotone-Revision: c465e35fc5f42324c08780dae83f7d225dca6e6a Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-09-25T16:28:22 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
6a97972f2a
commit
9edd16c0f4
|
@ -1,3 +1,9 @@
|
||||||
|
2008-09-25 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* SoObjects/SOGo/SOGoLDAPUserDefaults.[hm]: new class module
|
||||||
|
designed to substitute the system NSUserDefaults system with
|
||||||
|
access to an LDAP directory.
|
||||||
|
|
||||||
2008-09-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2008-09-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
* SoObjects/Mailer/SOGoMailFolder.m ([SOGoMailFolder
|
* SoObjects/Mailer/SOGoMailFolder.m ([SOGoMailFolder
|
||||||
|
|
|
@ -28,6 +28,10 @@
|
||||||
|
|
||||||
#import <NGObjWeb/SoApplication.h>
|
#import <NGObjWeb/SoApplication.h>
|
||||||
|
|
||||||
|
#if defined(LDAP_CONFIG)
|
||||||
|
#import <SOGo/SOGoLDAPUserDefaults.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
int
|
int
|
||||||
main (int argc, char **argv, char **env)
|
main (int argc, char **argv, char **env)
|
||||||
{
|
{
|
||||||
|
@ -38,6 +42,10 @@ main (int argc, char **argv, char **env)
|
||||||
|
|
||||||
pool = [NSAutoreleasePool new];
|
pool = [NSAutoreleasePool new];
|
||||||
|
|
||||||
|
#if defined(LDAP_CONFIG)
|
||||||
|
[SOGoLDAPUserDefaults poseAsClass: [NSUserDefaults class]];
|
||||||
|
#endif
|
||||||
|
|
||||||
rc = -1;
|
rc = -1;
|
||||||
|
|
||||||
if (getuid() > 0)
|
if (getuid() > 0)
|
||||||
|
|
|
@ -106,6 +106,11 @@ SOGo_OBJC_FILES = \
|
||||||
SOGo_RESOURCE_FILES = \
|
SOGo_RESOURCE_FILES = \
|
||||||
DAVReportMap.plist
|
DAVReportMap.plist
|
||||||
|
|
||||||
|
ifeq ($(ldap_config),yes)
|
||||||
|
SOGo_OBJC_FILES += SOGoLDAPUserDefaults.m
|
||||||
|
SOGo_HEADER_FILES += SOGoLDAPUserDefaults.h
|
||||||
|
endif
|
||||||
|
|
||||||
# tools
|
# tools
|
||||||
|
|
||||||
sogo_email2uid_OBJC_FILES += sogo_email2uid.m
|
sogo_email2uid_OBJC_FILES += sogo_email2uid.m
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
/* SOGoLDAPUserDefaults.h - this file is part of SOGo
|
||||||
|
*
|
||||||
|
* Copyright (C) 2008 Inverse groupe conseil
|
||||||
|
*
|
||||||
|
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
*
|
||||||
|
* This file is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This file 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 General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; see the file COPYING. If not, write to
|
||||||
|
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#import <Foundation/NSUserDefaults.h>
|
||||||
|
|
||||||
|
@interface SOGoLDAPUserDefaults : NSUserDefaults
|
||||||
|
|
||||||
|
@end
|
|
@ -0,0 +1,27 @@
|
||||||
|
/* SOGoLDAPUserDefaults.m - this file is part of SOGo
|
||||||
|
*
|
||||||
|
* Copyright (C) 2008 Inverse groupe conseil
|
||||||
|
*
|
||||||
|
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
*
|
||||||
|
* This file is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
|
*
|
||||||
|
* This file 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 General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; see the file COPYING. If not, write to
|
||||||
|
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#import "SOGoLDAPUserDefaults.h"
|
||||||
|
|
||||||
|
@implementation SOGoLDAPUserDefaults
|
||||||
|
|
||||||
|
@end
|
|
@ -18,6 +18,7 @@ ARG_GSMAKE=`gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null`
|
||||||
ARG_CFGMAKE="$PWD/config.make"
|
ARG_CFGMAKE="$PWD/config.make"
|
||||||
ARG_WITH_DEBUG=1
|
ARG_WITH_DEBUG=1
|
||||||
ARG_WITH_STRIP=1
|
ARG_WITH_STRIP=1
|
||||||
|
ARG_WITH_LDAP_CONFIG=0
|
||||||
|
|
||||||
GNUSTEP_INSTALLATION_DOMAIN="LOCAL"
|
GNUSTEP_INSTALLATION_DOMAIN="LOCAL"
|
||||||
|
|
||||||
|
@ -58,6 +59,8 @@ Installation directories:
|
||||||
--enable-debug turn on debugging and compile time warnings
|
--enable-debug turn on debugging and compile time warnings
|
||||||
--enable-strip turn on stripping of debug symbols
|
--enable-strip turn on stripping of debug symbols
|
||||||
|
|
||||||
|
--enable-ldap-config enable LDAP based configuration of SOGo
|
||||||
|
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
exit 0;
|
exit 0;
|
||||||
|
@ -266,6 +269,10 @@ genConfigMake() {
|
||||||
cfgwrite "LIBRARY_COMBO=$LIBRARY_COMBO"
|
cfgwrite "LIBRARY_COMBO=$LIBRARY_COMBO"
|
||||||
cfgwrite ""
|
cfgwrite ""
|
||||||
|
|
||||||
|
if test $ARG_WITH_LDAP_CONFIG = 1; then
|
||||||
|
cfgwrite "ADDITIONAL_CPPFLAGS += -DLDAP_CONFIG=1"
|
||||||
|
cfgwrite "ldap_config:=yes"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
checkLinking() {
|
checkLinking() {
|
||||||
|
@ -373,6 +380,13 @@ processOption() {
|
||||||
ARG_WITH_STRIP=0
|
ARG_WITH_STRIP=0
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
"x--enable-ldap-config")
|
||||||
|
ARG_WITH_LDAP_CONFIG=1
|
||||||
|
;;
|
||||||
|
"x--disable-ldap-config")
|
||||||
|
ARG_WITH_LDAP_CONFIG=0
|
||||||
|
;;
|
||||||
|
|
||||||
*) echo "error: cannot process argument: $1"; exit 1; ;;
|
*) echo "error: cannot process argument: $1"; exit 1; ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue