[Fedora-directory-commits] ldapserver/ldap/clients/dsgw Versiongw.c, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13082/ldap/clients/dsgw
Modified Files:
Versiongw.c
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro MCC_HTTPD (Comment #14)
Index: Versiongw.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/Versiongw.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Versiongw.c 9 Oct 2006 20:38:37 -0000 1.5
+++ Versiongw.c 10 Nov 2006 01:42:38 -0000 1.6
@@ -36,10 +36,6 @@
* All rights reserved.
--- END COPYRIGHT BLOCK --- */
-#if defined( XP_WIN32 )
-#undef MCC_HTTPD
-#endif
-
#include "netsite.h" /* to get MAGNUS_VERSION_STRING */
#ifdef MAGNUS_VERSION_STRING
17 years, 5 months
[Fedora-directory-commits] ldapserver/include/base systems.h, 1.6, 1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/include/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13082/include/base
Modified Files:
systems.h
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro MCC_HTTPD (Comment #14)
Index: systems.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/base/systems.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- systems.h 19 Apr 2005 22:06:44 -0000 1.6
+++ systems.h 10 Nov 2006 01:42:37 -0000 1.7
@@ -509,7 +509,7 @@
/* NS_MAIL builds sec-key.c which calls systhread_init, which requires */
/* that USE_NSPR is defined when systhr.c is compiled. --lachman */
/* MCC_PROXY does the same thing now --nbreslow -- LIKE HELL --ari */
-#if (defined(MCC_HTTPD) || defined(MCC_ADMSERV) || defined(MCC_PROXY) || defined(NS_MAIL)) && defined(XP_UNIX)
+#if defined(XP_UNIX)
#define USE_NSPR
/* XXXrobm This is UNIX-only for the moment */
#define LOG_BUFFERING
@@ -520,10 +520,10 @@
#ifdef IRIX
#undef SEM_FLOCK
#define SEM_IRIX
-#endif
-#endif
+#endif /* IRIX */
+#endif /* SW_THREADS */
#define THREAD_ANY
-#endif
+#endif /* XP_UNIX */
/* --- End the great debate --- */
17 years, 5 months
[Fedora-directory-commits] ldapserver/include/libaccess nsauth.h, 1.4, 1.5 nsautherr.h, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/include/libaccess
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13040/include/libaccess
Modified Files:
nsauth.h nsautherr.h
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro CLIENT_AUTH (Comment #12)
Index: nsauth.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/libaccess/nsauth.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsauth.h 19 Apr 2005 22:06:45 -0000 1.4
+++ nsauth.h 10 Nov 2006 01:40:44 -0000 1.5
@@ -48,16 +48,9 @@
* into and out of authentication interface functions.
*/
-#ifdef CLIENT_AUTH
-
#include "ssl.h"
-#if 0
-/* Removed for new ns security */
-#include "sec.h" /* SECCertificate */
-#endif
#include "cert.h" /* CERTCertificate for new ns security bin */
-#endif /* CLIENT_AUTH */
#include "usi.h" /* identifier list support */
#include "attrec.h" /* attribute record types */
@@ -308,13 +301,7 @@
char * cla_dns; /* DNS name string pointer */
UserObj_t * cla_uoptr; /* authenticated user object pointer */
GroupObj_t * cla_goptr; /* pointer to list of group objects */
-#ifdef CLIENT_AUTH
-#if 0
- /* Removed for new ns security */
- SECCertificate * cla_cert; /* certificate from SSL client auth */
-#endif
CERTCertificate * cla_cert; /* certificate from SSL client auth */
-#endif /* CLIENT_AUTH */
};
#endif /* __nsauth_h */
Index: nsautherr.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/libaccess/nsautherr.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsautherr.h 19 Apr 2005 22:06:45 -0000 1.4
+++ nsautherr.h 10 Nov 2006 01:40:44 -0000 1.5
@@ -71,7 +71,6 @@
#define NSAUERR3320 3320 /* insufficient dynamic memory */
#define NSAUERR3340 3340 /* error opening group database */
-#if defined(CLIENT_AUTH)
/* nsadbOpenClients() */
#define NSAUERR3400 3400 /* invalid function argument */
#define NSAUERR3420 3420 /* insufficient dynamic memory */
@@ -94,8 +93,6 @@
/* nsadbRemoveCertUser() */
#define NSAUERR3900 3900 /* error deleting entry in database */
-#endif /* defined(CLIENT_AUTH) */
-
/* Define error ids generated by nsamgmt.c */
/* nsadbRemoveUser() */
17 years, 5 months
[Fedora-directory-commits] ldapserver/lib/ldaputil Makefile, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/lib/ldaputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13007/lib/ldaputil
Modified Files:
Makefile
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro LDAPDB_THREAD_SAFE (Comment #11)
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 15 Sep 2006 19:33:43 -0000 1.7
+++ Makefile 10 Nov 2006 01:39:03 -0000 1.8
@@ -80,7 +80,7 @@
)
MODULE_CFLAGS+= $(TESTFLAGS)
-MODULE_CFLAGS+= -DLDAPDB_THREAD_SAFE -I.
+MODULE_CFLAGS+= -I.
ifeq ($(LDAP_NO_LIBLCACHE),1)
MODULE_CFLAGS+=-DNO_LIBLCACHE
17 years, 5 months
[Fedora-directory-commits] ldapserver/include/ldaputil ldapdb.h, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/include/ldaputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12969/include/ldaputil
Modified Files:
ldapdb.h
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro LDAPDB_THREAD_SAFE (Comment #10)
Index: ldapdb.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/ldaputil/ldapdb.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ldapdb.h 19 Apr 2005 22:06:45 -0000 1.4
+++ ldapdb.h 10 Nov 2006 01:37:46 -0000 1.5
@@ -39,17 +39,10 @@
#define _LDAPU_LDAPDB_H
#include <ldap.h>
-/* removed for LDAPSDK31 integration
-#include <lcache.h>
-*/
-#ifdef LDAPDB_THREAD_SAFE
/* In the past, we used CRITICAL objects from lib/base/crit.cpp.
* Now we use PRMonitor to avoid ldapu to depend on lib/base.
*/
#include <prmon.h>
-#else
-#define PRMonitor void
-#endif /* LDAPDB_THREAD_SAFE */
#ifndef NSAPI_PUBLIC
#ifdef XP_WIN32
17 years, 5 months
[Fedora-directory-commits] ldapserver/lib/libaccess/utest ustubs.cpp, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/lib/libaccess/utest
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854/lib/libaccess/utest
Modified Files:
ustubs.cpp
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #8)
Index: ustubs.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/libaccess/utest/ustubs.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ustubs.cpp 19 Apr 2005 22:07:48 -0000 1.5
+++ ustubs.cpp 10 Nov 2006 01:34:17 -0000 1.6
@@ -47,11 +47,7 @@
#include <libaccess/aclproto.h>
#include <libaccess/ldapacl.h>
#include <ldaputil/dbconf.h>
-#ifdef NSPR20
#include <prprf.h>
-#else
-#include <nspr/prprf.h>
-#endif
NSPR_BEGIN_EXTERN_C
extern char * ACL_Program;
17 years, 5 months
[Fedora-directory-commits] ldapserver/lib/libaccess aclerror.cpp, 1.6, 1.7 authdb.cpp, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/lib/libaccess
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854/lib/libaccess
Modified Files:
aclerror.cpp authdb.cpp
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #8)
Index: aclerror.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/libaccess/aclerror.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aclerror.cpp 19 Apr 2005 22:07:47 -0000 1.6
+++ aclerror.cpp 10 Nov 2006 01:34:16 -0000 1.7
@@ -45,11 +45,7 @@
#include "base/systems.h"
#include "public/nsapi.h"
-#ifdef NSPR20
#include "prprf.h"
-#else
-#include "nspr/prprf.h"
-#endif
#include "prlog.h"
#include "libaccess/nserror.h"
#include "libaccess/nsautherr.h"
Index: authdb.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/libaccess/authdb.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- authdb.cpp 11 Apr 2006 02:14:53 -0000 1.5
+++ authdb.cpp 10 Nov 2006 01:34:16 -0000 1.6
@@ -231,11 +231,7 @@
if (ACLDbNameHash) {
info = (AuthdbInfo_t *)PR_HashTableLookup(ACLDbNameHash,
-#ifdef NSPR20
name
-#else
- (char *)name
-#endif
);
if (info) {
17 years, 5 months
[Fedora-directory-commits] ldapserver/lib/base systhr.cpp,1.7,1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/lib/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854/lib/base
Modified Files:
systhr.cpp
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #8)
Index: systhr.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/base/systhr.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- systhr.cpp 28 Feb 2006 03:00:14 -0000 1.7
+++ systhr.cpp 10 Nov 2006 01:34:11 -0000 1.8
@@ -216,20 +216,6 @@
NSAPI_PUBLIC void systhread_dummy(void)
{
-#ifndef NSPR20
- /* nspr/gc.c */
- PR_InitGC(0,0);
- /* nspr/prsystem.c */
- PR_GetSystemInfo(PR_SI_SYSNAME, 0, 0);
- /* nspr/linker.c */
- PR_GetLibName(0, 0);
- /* nspr/file.c */
- PR_Mkdir(0, 0);
- /* nspr/prnetdb.c */
- PR_gethostbyname(0, 0, 0, 0, 0);
- /* nspr/longlong.c */
- LL_TO_S(LL_ZERO, 0, NULL, 0);
-#endif /* NSPR20 */
}
#elif defined(THREAD_WIN32)
17 years, 5 months
[Fedora-directory-commits] ldapserver/lib/ldaputil ldapdb.c, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/lib/ldaputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854/lib/ldaputil
Modified Files:
ldapdb.c
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #8)
Index: ldapdb.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/ldaputil/ldapdb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ldapdb.c 19 Apr 2005 22:07:45 -0000 1.4
+++ ldapdb.c 10 Nov 2006 01:34:10 -0000 1.5
@@ -44,14 +44,9 @@
#include <string.h>
#include <malloc.h>
-#ifdef LDAPDB_THREAD_SAFE
#include <nspr.h>
#include <prthread.h>
#include <prmon.h>
-/* removed for new ns security integration
-#include <xp_error.h>
-*/
-#endif /* LDAPDB_THREAD_SAFE */
#include "ldaputil/errors.h"
#include "ldaputil/certmap.h"
@@ -72,16 +67,7 @@
#define LDAPDB_PREFIX_WITH_SLASHES "ldapdb://"
#define LDAPDB_PREFIX_WITH_SLASHES_LEN 9
-#ifndef LDAPDB_THREAD_SAFE
-#define ldb_crit_init(x)
-#define ldb_crit_enter(x)
-#define ldb_crit_exit(x)
-#else
-#ifdef NSPR20
uintn tsdindex;
-#else
-int32 tsdindex;
-#endif
static void ldb_crit_init (LDAPDatabase_t *ldb)
{
@@ -109,15 +95,11 @@
{
struct ldap_error *le;
-#ifdef NSPR20
if (!(le = (struct ldap_error *) PR_GetThreadPrivate(tsdindex))) {
le = (struct ldap_error *) malloc(sizeof(struct ldap_error));
memset((void *)le, 0, sizeof(struct ldap_error));
PR_SetThreadPrivate(tsdindex, (void *)le);
}
-#else
- le = (struct ldap_error *) PR_GetThreadPrivate( PR_CurrentThread(), tsdindex );
-#endif
le->le_errno = err;
if ( le->le_matched != NULL ) {
ldap_memfree( le->le_matched );
@@ -133,11 +115,7 @@
{
struct ldap_error *le;
-#ifdef NSPR20
le = (struct ldap_error *) PR_GetThreadPrivate( tsdindex);
-#else
- le = (struct ldap_error *) PR_GetThreadPrivate( PR_CurrentThread(), tsdindex );
-#endif
if ( matched != NULL ) {
*matched = le->le_matched;
}
@@ -191,7 +169,6 @@
return( (LDAPHostEnt *)PR_GetError() );
}
#endif /* LDAP_OPT_DNS_FN_PTRS */
-#endif /* LDAPDB_THREAD_SAFE */
static void unescape_ldap_basedn (char *str)
@@ -460,15 +437,10 @@
return LDAPU_ERR_LDAP_INIT_FAILED;
}
-#ifdef LDAPDB_THREAD_SAFE
{
struct ldap_thread_fns tfns;
-#ifdef NSPR20
PR_NewThreadPrivateIndex(&tsdindex, NULL);
-#else
- tsdindex = PR_NewThreadPrivateID();
-#endif
/* set mutex pointers */
memset( &tfns, '\0', sizeof(struct ldap_thread_fns) );
@@ -502,7 +474,6 @@
}
}
#endif /* LDAP_OPT_DNS_FN_PTRS */
-#endif /* LDAPDB_THREAD_SAFE */
if (ldapu_is_local_db(ldb)) {
/* No more Local db support, force error! */
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd detach.c, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12854/ldap/servers/slapd
Modified Files:
detach.c
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NSPR20 (Comment #8)
Index: detach.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/detach.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- detach.c 19 Apr 2005 22:07:36 -0000 1.4
+++ detach.c 10 Nov 2006 01:34:09 -0000 1.5
@@ -85,7 +85,7 @@
#ifndef _WIN32
if ( should_detach ) {
for ( i = 0; i < 5; i++ ) {
-#if defined( sunos5 ) && ( defined( THREAD_SUNOS5_LWP ) || defined( NSPR20 ))
+#if defined( sunos5 )
switch ( fork1() ) {
#else
switch ( fork() ) {
17 years, 5 months