[Fedora-directory-commits] ldapserver/ldap/servers/slapd errormap.c, 1.4, 1.5 prerrstrs.h, 1.4, 1.5 secerrstrs.h, 1.4, 1.5 sslerrstrs.h, 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-serv10493/ldap/servers/slapd
Modified Files:
errormap.c prerrstrs.h secerrstrs.h sslerrstrs.h
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NS_DS (Comment #2, #3)
Index: errormap.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/errormap.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- errormap.c 19 Apr 2005 22:07:36 -0000 1.4
+++ errormap.c 10 Nov 2006 01:05:04 -0000 1.5
@@ -114,9 +114,6 @@
* Netscape Certificate Server team on 27-March-1998.
* Taken from the file ns/security/cmd/lib/secerror.c on NSS_1_BRANCH.
* Last updated from there: 24-July-1998 by Mark Smith <mcs>
- *
- * All of the Directory Server specific changes are enclosed inside
- * #ifdef NS_DS.
****************************************************************************
*/
#include "nspr.h"
@@ -137,17 +134,11 @@
static const tuple_str errStrings[] = {
/* keep this list in ascending order of error numbers */
-#ifdef NS_DS
#include "dberrstrs.h"
#include "sslerrstrs.h"
#include "secerrstrs.h"
#include "prerrstrs.h"
#include "disconnect_error_strings.h"
-#else /* NS_DS */
-#include "SSLerrs.h"
-#include "SECerrs.h"
-#include "NSPRerrs.h"
-#endif /* NS_DS */
};
@@ -156,10 +147,7 @@
/* Returns a UTF-8 encoded constant error string for "errNum".
* Returns NULL of errNum is unknown.
*/
-#ifdef NS_DS
-static
-#endif /* NS_DS */
-const char *
+static const char *
SECU_Strerror(PRErrorCode errNum) {
PRInt32 low = 0;
PRInt32 high = numStrings - 1;
@@ -175,7 +163,6 @@
for (i = low + 1; i <= high; ++i) {
num = errStrings[i].errNum;
if (num <= lastNum) {
-#ifdef NS_DS
LDAPDebug( LDAP_DEBUG_ANY,
"sequence error in error strings at item %d\n"
"error %d (%s)\n",
@@ -184,15 +171,6 @@
"should come after \n"
"error %d (%s)\n",
num, errStrings[i].errString, 0 );
-#else /* NS_DS */
- fprintf(stderr,
-"sequence error in error strings at item %d\n"
-"error %d (%s)\n"
-"should come after \n"
-"error %d (%s)\n",
- i, lastNum, errStrings[i-1].errString,
- num, errStrings[i].errString);
-#endif /* NS_DS */
}
lastNum = num;
}
Index: prerrstrs.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/prerrstrs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- prerrstrs.h 19 Apr 2005 22:07:36 -0000 1.4
+++ prerrstrs.h 10 Nov 2006 01:05:04 -0000 1.5
@@ -42,13 +42,8 @@
/*
****************************************************************************
- * The code below this point was provided by Nelson Bolyard <nelsonb> of the
- * Netscape Certificate Server team on 27-March-1998.
- * Taken from the file ns/security/cmd/lib/NSPRerrs.h on NSS_1_BRANCH.
- * Last updated from there: 24-July-1998 by Mark Smith <mcs>
- *
- * All of the Directory Server specific changes are enclosed inside
- * #ifdef NS_DS.
+ * The code below this point was taken from the file
+ * mozilla/security/nss/security/nss/cmd/lib/NSPRerrs.h on NSS_3_11_3_RTM.
****************************************************************************
*/
/* General NSPR 2.0 errors */
@@ -138,16 +133,34 @@
ER2( PR_END_OF_FILE_ERROR, "Encountered end of file." )
ER2( PR_FILE_SEEK_ERROR, "Seek error." )
ER2( PR_FILE_IS_BUSY_ERROR, "The file is busy." )
-ER2( PR_OPERATION_ABORTED_ERROR, "The I/O operation was aborted" )
ER2( PR_IN_PROGRESS_ERROR,
"Operation is still in progress (probably a non-blocking connect)." )
ER2( PR_ALREADY_INITIATED_ERROR,
"Operation has already been initiated (probably a non-blocking connect)." )
+
+#ifdef PR_GROUP_EMPTY_ERROR
ER2( PR_GROUP_EMPTY_ERROR, "The wait group is empty." )
+#endif
+
+#ifdef PR_INVALID_STATE_ERROR
ER2( PR_INVALID_STATE_ERROR, "Object state improper for request." )
-ER2( PR_NETWORK_DOWN_ERROR, "Network is down" )
-ER2( PR_SOCKET_SHUTDOWN_ERROR, "Socket shutdown" )
-ER2( PR_CONNECT_ABORTED_ERROR, "Connection aborted" )
-ER2( PR_HOST_UNREACHABLE_ERROR, "Host is unreachable" )
+#endif
+
+#ifdef PR_NETWORK_DOWN_ERROR
+ER2( PR_NETWORK_DOWN_ERROR, "Network is down." )
+#endif
+
+#ifdef PR_SOCKET_SHUTDOWN_ERROR
+ER2( PR_SOCKET_SHUTDOWN_ERROR, "The socket was previously shut down." )
+#endif
+
+#ifdef PR_CONNECT_ABORTED_ERROR
+ER2( PR_CONNECT_ABORTED_ERROR, "TCP Connection aborted." )
+#endif
+
+#ifdef PR_HOST_UNREACHABLE_ERROR
+ER2( PR_HOST_UNREACHABLE_ERROR, "Host is unreachable." )
+#endif
+/* always last */
ER2( PR_MAX_ERROR, "Placeholder for the end of the list" )
Index: secerrstrs.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/secerrstrs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- secerrstrs.h 19 Apr 2005 22:07:37 -0000 1.4
+++ secerrstrs.h 10 Nov 2006 01:05:04 -0000 1.5
@@ -42,20 +42,14 @@
/*
****************************************************************************
- * The code below this point was provided by Nelson Bolyard <nelsonb> of the
- * Netscape Certificate Server team on 27-March-1998.
- * Taken from the file ns/security/cmd/lib/SECerrs.h on NSS_1_BRANCH.
- * Last updated from there: 24-July-1998 by Mark Smith <mcs>
- *
- * All of the Directory Server specific changes are enclosed inside
- * #ifdef NS_DS.
+ * The code below this point was taken from the file
+ * mozilla/security/nss/security/nss/cmd/lib/SECerrs.h on NSS_3_11_3_RTM.
****************************************************************************
*/
/* General security error codes */
/* Caller must #include "secerr.h" */
-
ER3(SEC_ERROR_IO, SEC_ERROR_BASE + 0,
"An I/O error occurred during security authorization.")
@@ -377,7 +371,8 @@
ER3(SEC_ERROR_NOT_FORTEZZA_ISSUER, (SEC_ERROR_BASE + 104),
"Peer FORTEZZA chain has a non-FORTEZZA Certificate.")
-/* ER3(SEC_ERROR_UNKNOWN, (SEC_ERROR_BASE + 105), */
+ER3(SEC_ERROR_CANNOT_MOVE_SENSITIVE_KEY, (SEC_ERROR_BASE + 105),
+"A sensitive key cannot be moved to the slot where it is needed.")
ER3(SEC_ERROR_JS_INVALID_MODULE_NAME, (SEC_ERROR_BASE + 106),
"Invalid module name.")
@@ -461,3 +456,74 @@
ER3(SEC_ERROR_OCSP_OLD_RESPONSE, (SEC_ERROR_BASE + 132),
"The OCSP response contains out-of-date information.")
+
+ER3(SEC_ERROR_DIGEST_NOT_FOUND, (SEC_ERROR_BASE + 133),
+"The CMS or PKCS #7 Digest was not found in signed message.")
+
+ER3(SEC_ERROR_UNSUPPORTED_MESSAGE_TYPE, (SEC_ERROR_BASE + 134),
+"The CMS or PKCS #7 Message type is unsupported.")
+
+ER3(SEC_ERROR_MODULE_STUCK, (SEC_ERROR_BASE + 135),
+"PKCS #11 module could not be removed because it is still in use.")
+
+ER3(SEC_ERROR_BAD_TEMPLATE, (SEC_ERROR_BASE + 136),
+"Could not decode ASN.1 data. Specified template was invalid.")
+
+ER3(SEC_ERROR_CRL_NOT_FOUND, (SEC_ERROR_BASE + 137),
+"No matching CRL was found.")
+
+ER3(SEC_ERROR_REUSED_ISSUER_AND_SERIAL, (SEC_ERROR_BASE + 138),
+"You are attempting to import a cert with the same issuer/serial as \
+an existing cert, but that is not the same cert.")
+
+ER3(SEC_ERROR_BUSY, (SEC_ERROR_BASE + 139),
+"NSS could not shutdown. Objects are still in use.")
+
+ER3(SEC_ERROR_EXTRA_INPUT, (SEC_ERROR_BASE + 140),
+"DER-encoded message contained extra unused data.")
+
+ER3(SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE, (SEC_ERROR_BASE + 141),
+"Unsupported elliptic curve.")
+
+ER3(SEC_ERROR_UNSUPPORTED_EC_POINT_FORM, (SEC_ERROR_BASE + 142),
+"Unsupported elliptic curve point form.")
+
+ER3(SEC_ERROR_UNRECOGNIZED_OID, (SEC_ERROR_BASE + 143),
+"Unrecognized Object IDentifier.")
+
+ER3(SEC_ERROR_OCSP_INVALID_SIGNING_CERT, (SEC_ERROR_BASE + 144),
+"Invalid OCSP signing certificate in OCSP response.")
+
+ER3(SEC_ERROR_REVOKED_CERTIFICATE_CRL, (SEC_ERROR_BASE + 145),
+"Certificate is revoked in issuer's certificate revocation list.")
+
+ER3(SEC_ERROR_REVOKED_CERTIFICATE_OCSP, (SEC_ERROR_BASE + 146),
+"Issuer's OCSP responder reports certificate is revoked.")
+
+ER3(SEC_ERROR_CRL_INVALID_VERSION, (SEC_ERROR_BASE + 147),
+"Issuer's Certificate Revocation List has an unknown version number.")
+
+ER3(SEC_ERROR_CRL_V1_CRITICAL_EXTENSION, (SEC_ERROR_BASE + 148),
+"Issuer's V1 Certificate Revocation List has a critical extension.")
+
+ER3(SEC_ERROR_CRL_UNKNOWN_CRITICAL_EXTENSION, (SEC_ERROR_BASE + 149),
+"Issuer's V2 Certificate Revocation List has an unknown critical extension.")
+
+ER3(SEC_ERROR_UNKNOWN_OBJECT_TYPE, (SEC_ERROR_BASE + 150),
+"Unknown object type specified.")
+
+ER3(SEC_ERROR_INCOMPATIBLE_PKCS11, (SEC_ERROR_BASE + 151),
+"PKCS #11 driver violates the spec in an incompatible way.")
+
+ER3(SEC_ERROR_NO_EVENT, (SEC_ERROR_BASE + 152),
+"No new slot event is available at this time.")
+
+ER3(SEC_ERROR_CRL_ALREADY_EXISTS, (SEC_ERROR_BASE + 153),
+"CRL already exists.")
+
+ER3(SEC_ERROR_NOT_INITIALIZED, (SEC_ERROR_BASE + 154),
+"NSS is not initialized.")
+
+ER3(SEC_ERROR_TOKEN_NOT_LOGGED_IN, (SEC_ERROR_BASE + 155),
+"The operation failed because the PKCS#11 token is not logged in.")
+
Index: sslerrstrs.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sslerrstrs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sslerrstrs.h 19 Apr 2005 22:07:37 -0000 1.4
+++ sslerrstrs.h 10 Nov 2006 01:05:04 -0000 1.5
@@ -42,13 +42,8 @@
/*
****************************************************************************
- * The code below this point was provided by Nelson Bolyard <nelsonb> of the
- * Netscape Certificate Server team on 27-March-1998.
- * Taken from the file ns/security/cmd/lib/SSLerrs.h on NSS_1_BRANCH.
- * Last updated from there: 24-July-1998 by Mark Smith <mcs>
- *
- * All of the Directory Server specific changes are enclosed inside
- * #ifdef NS_DS.
+ * The code below this point was taken from the file
+ * mozilla/security/nss/security/nss/cmd/lib/SSLerrs.h on NSS_3_11_3_RTM.
****************************************************************************
*/
@@ -385,3 +380,20 @@
ER3(SSL_ERROR_NO_RENEGOTIATION_ALERT , (SSL_ERROR_BASE + 102),
"Peer does not permit renegotiation of SSL security parameters.")
+ER3(SSL_ERROR_SERVER_CACHE_NOT_CONFIGURED , (SSL_ERROR_BASE + 103),
+"SSL server cache not configured and not disabled for this socket.")
+
+ER3(SSL_ERROR_UNSUPPORTED_EXTENSION_ALERT , (SSL_ERROR_BASE + 104),
+"SSL peer does not support requested TLS hello extension.")
+
+ER3(SSL_ERROR_CERTIFICATE_UNOBTAINABLE_ALERT , (SSL_ERROR_BASE + 105),
+"SSL peer could not obtain your certificate from the supplied URL.")
+
+ER3(SSL_ERROR_UNRECOGNIZED_NAME_ALERT , (SSL_ERROR_BASE + 106),
+"SSL peer has no certificate for the requested DNS name.")
+
+ER3(SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT , (SSL_ERROR_BASE + 107),
+"SSL peer was unable to get an OCSP response for its certificate.")
+
+ER3(SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT , (SSL_ERROR_BASE + 108),
+"SSL peer reported bad certificate hash value.")
17 years, 5 months
[Fedora-directory-commits] ldapserver/lib/libsi18n makstrdb.c, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/lib/libsi18n
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10493/lib/libsi18n
Modified Files:
makstrdb.c
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NS_DS (Comment #2, #3)
Index: makstrdb.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/libsi18n/makstrdb.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- makstrdb.c 11 Apr 2006 02:14:54 -0000 1.7
+++ makstrdb.c 10 Nov 2006 01:05:06 -0000 1.8
@@ -52,10 +52,8 @@
/* Begin: Application dependent information */
/********************************************/
-#ifdef NS_DS
#include "gsslapd.h"
#define GSXXX_H_INCLUDED
-#endif
#ifdef buildAnotherServer
#include "gsanother.h"
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/clients/dsgw dsgwutil.c, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10493/ldap/clients/dsgw
Modified Files:
dsgwutil.c
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NS_DS (Comment #2, #3)
Index: dsgwutil.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/dsgwutil.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dsgwutil.c 22 May 2006 17:28:36 -0000 1.7
+++ dsgwutil.c 10 Nov 2006 01:05:03 -0000 1.8
@@ -42,11 +42,7 @@
#include <limits.h> /* PATH_MAX */
#include "dsgw.h"
#include "dbtdsgw.h"
-#ifdef NS_DS
#include "../lib/libsi18n/gsslapd.h"
-#else /* Admin Server */
-#include "../lib/libsi18n/gsadmserv.h"
-#endif
#ifdef DSGW_DEBUG
#include <time.h>
@@ -96,11 +92,7 @@
/* initialize the string database */
XP_InitStringDatabase(
-#ifdef NS_DS
SERVER_ROOT_PATH "/bin/slapd/property" /* Directory Server Gateway */
-#else
- SERVER_ROOT_PATH "/admin" /* Admin Server */
-#endif
, DATABASE_NAME);
/* set default default languages for string database */
SetLanguage(CLIENT_LANGUAGE, "");
17 years, 5 months
[Fedora-directory-commits] ldapserver/include/nt regparms.h, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/include/nt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10493/include/nt
Modified Files:
regparms.h
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NS_DS (Comment #2, #3)
Index: regparms.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/nt/regparms.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- regparms.h 29 Oct 2005 02:26:01 -0000 1.7
+++ regparms.h 10 Nov 2006 01:05:00 -0000 1.8
@@ -91,10 +91,8 @@
#define ADM_DIR_ROOT "admin"
#define ADM_NAME_UNINSTALL "Uninstall Administration Server 1.0"
-#if defined( NS_DS )
#define ADMIN_SERVICE_NAME "Admin Server"
#define ADMIN_ICON_NAME "Administer Netscape Servers"
-#endif
/* Enterprise IDs */
#define ENT_ID_PRODUCT "https"
17 years, 5 months
[Fedora-directory-commits] ldapserver nsconfig.mk,1.25,1.26
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10359
Modified Files:
nsconfig.mk
Log Message:
Resolves: #214728
Summary: Cleaning up obsolete macros in the build
Changes: eliminated macro NS_DS (Comment #3, #5, #9, #13, #15, #17)
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsconfig.mk,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nsconfig.mk 15 Sep 2006 14:59:47 -0000 1.25
+++ nsconfig.mk 10 Nov 2006 01:03:54 -0000 1.26
@@ -382,8 +382,6 @@
MAKE=gmake $(BUILDOPT) NO_JAVA=1
-export NSPR20=1
-
LWDEFS = LIVEWIRE=1
JSDEFS = JSFILE=1 JS_THREADSAFE=1
@@ -425,15 +423,15 @@
ifdef PRODUCT_IS_DIRECTORY_SERVER
ifeq ($(SECURITY), export)
- MCC_SERVER=-DMCC_HTTPD -DNS_EXPORT -DNET_SSL -DCLIENT_AUTH $(NSPR_DEFINES)
+ MCC_SERVER=-DNS_EXPORT $(NSPR_DEFINES)
endif
ifeq ($(SECURITY), domestic)
- MCC_SERVER=-DMCC_HTTPD -DNS_DOMESTIC -DNET_SSL -DCLIENT_AUTH $(NSPR_DEFINES)
+ MCC_SERVER=$(NSPR_DEFINES)
endif
ifeq ($(SECURITY), none)
- MCC_SERVER=-DMCC_HTTPD -DNS_UNSECURE $(NSPR_DEFINES)
+ MCC_SERVER=-DNS_UNSECURE $(NSPR_DEFINES)
endif
- DS_SERVER_DEFS = -DNS_DS
+ DS_SERVER_DEFS =
ifeq ($(BUILD_DEBUG),full)
MODULE_CFLAGS += -DDEBUG
endif
@@ -444,7 +442,7 @@
endif
endif
-MCC_SERVER += -DSPAPI20 -DBUILD_NUM=$(GET_BUILD_NUM)
+MCC_SERVER += -DBUILD_NUM=$(GET_BUILD_NUM)
# ----------- Default Flags, may be overridden below ------------
@@ -534,7 +532,6 @@
else
DL_LIB =-ldl
endif
-NSPR_DEFINES += -DNSPR20
RWTOOLS_VERSION = latest
#HTTPDSO_NAME=libdsnshttpd
PEER_ARCH=aix
@@ -650,7 +647,7 @@
NSAPI_CAPABLE=true
VERITY_ARCH=_hp800
USE_PTHREADS=1
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_PR_USECPU -D_REENTRANT
+NSPR_DEFINES += -D_PR_NTHREAD -D_PR_USECPU -D_REENTRANT
LINK_DLL=$(CCC) $(DLL_LDFLAGS) $(ARCH_CFLAGS) -o $@
PEER_ARCH=hp
RWTOOLS_VERSION = latest
@@ -688,7 +685,7 @@
ifeq (6.5,$(OSVERSION))
ARCH_CFLAGS+=-DIRIX6_5 -mips3
endif
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_SGI_MP_SOURCE
+NSPR_DEFINES += -D_PR_NTHREAD -D_SGI_MP_SOURCE
LINK_DLL=$(CCC) $(DLL_LDFLAGS) -o $@
PEER_ARCH=irix
@@ -708,7 +705,6 @@
RANLIB=ranlib
DLL_LDFLAGS=-shared
LINK_DLL=$(CC) $(DLL_LDFLAGS) -o $@
-NSPR_DEFINES += -DNSPR20
NLIST=-lelf
NSAPI_CAPABLE=true
EXTRA_LIBS=-ldl -lcrypt -lpthread
@@ -759,7 +755,6 @@
NO_MSOFT_OBJ=1
BUILD_WEBPUB=no
BUILD_IIOPLIB=no
-NSPR_DEFINES += -DNSPR20
PEER_ARCH=unixware
export NO_INFORMIX=1
@@ -821,7 +816,6 @@
NO_MSOFT_OBJ=1
BUILD_WEBPUB=no
BUILD_IIOPLIB=no
-NSPR_DEFINES += -DNSPR20
PEER_ARCH=unixware5
DB_VERSION=oem
@@ -857,7 +851,6 @@
AUTOCATALOG_VERSION = oem
BUILD_WEBPUB = no
NO_MSOFT_OBJ = 1
-NSPR_DEFINES += -DNSPR20
PEER_ARCH=sco
else
@@ -916,7 +909,6 @@
BUILD_WEBPUB = no
BUILD_IIOPLIB = no
DL_LIB =-ldl
-NSPR_DEFINES += -DNSPR20
# svr4-x86 compatible
PEER_ARCH=unixware
@@ -1037,7 +1029,6 @@
#this is no longer needed
#NEED_NSPR_MALLOC=yes
-NSPR_DEFINES += -DNSPR20
PEER_ARCH=reliantunix
RWTOOLS_VERSION = latest
@@ -1073,7 +1064,6 @@
#EXTRA_LIBS=-lcxxstd -lcxx
endif
USE_PTHREADS=1
-NSPR_DEFINES += -DNSPR20
RWTOOLS_VERSION = latest
PEER_ARCH=osf
PEERDIR=$(DEVROOT)/osf/dev
@@ -1156,7 +1146,7 @@
NSAPI_CAPABLE=true
NLIST=-lelf
VERITY_ARCH=_solaris
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_REENTRANT
+NSPR_DEFINES += -D_PR_NTHREAD -D_REENTRANT
PEER_ARCH=solaris
ifndef NS_USE_NATIVE
NSPR_DEFINES += -DSOLARIS_GCC
@@ -1200,7 +1190,7 @@
NO_MSOFT_OBJ=1
BUILD_WEBPUB=no
BUILD_IIOPLIB=no
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_REENTRANT
+NSPR_DEFINES += -D_PR_NTHREAD -D_REENTRANT
export NO_INFORMIX=1
export NO_ORACLE=1
export NO_SYBASE=1
@@ -1269,7 +1259,7 @@
NONSHARED_FLAG=
NSAPI_CAPABLE=true
NO_MSOFT_OBJ=1
-NSPR_DEFINES += -DNSPR20 -D_PR_NTHREAD -D_PR_USECPU
+NSPR_DEFINES += -D_PR_NTHREAD -D_PR_USECPU
else
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.33, 1.34
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15347
Modified Files:
create_instance.c
Log Message:
Resolves: #214840
Summary: modify sasl_path to accept the string set in the inf file
Changes:
If sasl_path is set in [slapd] section in the inf file, it's put in dse.ldif
like this:
dn: cn=config
[...]
nsslapd-saslpath: /usr/local/lib
If the inf file does not have the line, the default path
<prefix>/usr/lib/<brand_ds>/sasl2 is put in dse.ldif on non-Linux platform.
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- create_instance.c 6 Nov 2006 19:33:41 -0000 1.33
+++ create_instance.c 9 Nov 2006 18:24:52 -0000 1.34
@@ -305,18 +305,20 @@
conf->disable_schema_checking = NULL;
conf->install_ldif_file = NULL;
- conf->sysconfdir = NULL;
+ conf->bak_dir = NULL;
+ conf->config_dir = NULL;
conf->datadir = NULL;
+ conf->db_dir = NULL;
conf->docdir = NULL;
conf->inst_dir = NULL;
- conf->config_dir = NULL;
- conf->schema_dir = NULL;
+ conf->ldif_dir = NULL;
conf->lock_dir = NULL;
conf->log_dir = NULL;
+ conf->plugin_dir = NULL;
conf->run_dir = NULL;
- conf->db_dir = NULL;
- conf->bak_dir = NULL;
- conf->ldif_dir = NULL;
+ conf->sasl_path = NULL;
+ conf->schema_dir = NULL;
+ conf->sysconfdir = NULL;
conf->tmp_dir = NULL;
}
@@ -2342,7 +2344,6 @@
t = CREATE_DB2BAK();
if(t) return t;
-#if defined(UPGRADEDB)
t = gen_script(cs_path, "db2index.bat",
"@echo off\n"
"setlocal\n"
@@ -2375,7 +2376,6 @@
"exit /b %%rc%%\n",
server, cs_path, server, cs_path, server, cs_path);
if(t) return t;
-#endif
t = gen_script(cs_path, "vlvindex.bat",
"@echo off\n"
@@ -2431,7 +2431,6 @@
server, cs_path, server, cs_path);
if(t) return t;
-#if defined(UPGRADEDB)
t = gen_script(cs_path, "upgradedb.bat",
"@echo off\n"
"setlocal\n"
@@ -2455,7 +2454,6 @@
"exit /b %%rc%%\n",
server, cs_path, server, cs_path);
if(t) return t;
-#endif
t = CREATE_BAK2DB();
if(t) return t;
@@ -2701,9 +2699,9 @@
fprintf(f, "nsslapd-tmpdir: %s\n", cf->tmp_dir);
fprintf(f, "nsslapd-certdir: %s\n", cf->cert_dir);
/* We use the system SASL by default on Linux, so we don't need to set sasl path */
-#if !defined( LINUX )
- fprintf(f, "nsslapd-saslpath: %s\n", cf->sasl_path);
-#endif
+ if (NULL != cf->sasl_path) {
+ fprintf(f, "nsslapd-saslpath: %s\n", cf->sasl_path);
+ }
fprintf(f, "nsslapd-accesslog-logging-enabled: on\n");
fprintf(f, "nsslapd-accesslog-maxlogsperdir: 10\n");
fprintf(f, "nsslapd-accesslog-mode: 600\n");
@@ -3412,13 +3410,11 @@
fprintf(f, "cn: restore\n");
fprintf(f, "\n");
-#if defined(UPGRADEDB)
fprintf(f, "dn: cn=upgradedb,cn=tasks,cn=config\n");
fprintf(f, "objectclass: top\n");
fprintf(f, "objectclass: extensibleObject\n");
fprintf(f, "cn: upgradedb\n");
fprintf(f, "\n");
-#endif
/* END of tasks */
@@ -4347,7 +4343,20 @@
cf->sroot = PR_smprintf("%s%cusr%clib%c%s",
prefix, FILE_PATHSEP, FILE_PATHSEP, FILE_PATHSEP, cf->brand_ds);
- cf->sasl_path = PR_smprintf("%s%csasl2", cf->sroot, FILE_PATHSEP);
+ temp = ds_a_get_cgi_var("sasl_path", NULL, NULL);
+ if (NULL != temp) {
+ /* if sasl_path is given, we set it in the conf file regardless of
+ * the platform. */
+ cf->sasl_path = PL_strdup(temp);
+ }
+#if !defined( LINUX )
+ /* if not linux, we package sasl2 with DS,
+ and always set it in the conf file. */
+ else
+ {
+ cf->sasl_path = PR_smprintf("%s%csasl2", cf->sroot, FILE_PATHSEP);
+ }
+#endif
cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP);
if (!(cf->servname = ds_a_get_cgi_var("servname", "Server Name",
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/admin/src ds_newinst.pl, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3366
Modified Files:
ds_newinst.pl
Log Message:
Bug: 214733
Description: be able to pass in all configurable paths to ds_newinst
Reviewed by: nhosoi (Thanks!)
Fix Description: Just add all of the paths that are set-able in create_instance.c to
ds_newinst.pl. The paths will be parsed from the input .inf file e.g.
config_dir= /path/to/config
sysconfdir= /path/to/sysconf
etc.
in the [slapd] section.
I also added sasl_path as suggested by Noriko:
+ $cgiargs{"sasl_path"} = $table{"slapd"}->{"sasl_path"};
Tested on: RHEL4
Index: ds_newinst.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ds_newinst.pl 25 Oct 2006 00:04:41 -0000 1.9
+++ ds_newinst.pl 9 Nov 2006 15:41:40 -0000 1.10
@@ -179,6 +179,25 @@
# the following items are optional
+$cgiargs{"prefix"} = $table{"slapd"}->{"prefix"};
+$cgiargs{"lock_dir"} = $table{"slapd"}->{"lock_dir"};
+$cgiargs{"log_dir"} = $table{"slapd"}->{"log_dir"};
+$cgiargs{"run_dir"} = $table{"slapd"}->{"run_dir"};
+$cgiargs{"db_dir"} = $table{"slapd"}->{"db_dir"};
+$cgiargs{"bak_dir"} = $table{"slapd"}->{"bak_dir"};
+$cgiargs{"ldif_dir"} = $table{"slapd"}->{"ldif_dir"};
+$cgiargs{"tmp_dir"} = $table{"slapd"}->{"tmp_dir"};
+$cgiargs{"cert_dir"} = $table{"slapd"}->{"cert_dir"};
+$cgiargs{"localstatedir"} = $table{"slapd"}->{"localstatedir"};
+$cgiargs{"sysconfdir"} = $table{"slapd"}->{"sysconfdir"};
+$cgiargs{"bindir"} = $table{"slapd"}->{"bindir"};
+$cgiargs{"datadir"} = $table{"slapd"}->{"datadir"};
+$cgiargs{"docdir"} = $table{"slapd"}->{"docdir"};
+$cgiargs{"inst_dir"} = $table{"slapd"}->{"inst_dir"};
+$cgiargs{"config_dir"} = $table{"slapd"}->{"config_dir"};
+$cgiargs{"schema_dir"} = $table{"slapd"}->{"schema_dir"};
+$cgiargs{"sasl_path"} = $table{"slapd"}->{"sasl_path"};
+
# port number for Admin Server - used to configure some web apps
$cgiargs{adminport} = $table{admin}->{Port};
17 years, 5 months
[Fedora-directory-commits] ldapserver/lib/libaccess lasdns.cpp, 1.6, 1.7
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/lib/libaccess
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv561
Modified Files:
lasdns.cpp
Log Message:
Resolves: 214682
Summary: Fixed usage of PL_strncpyz that was causing DNS-based ACIs to behave incorrectly.
Index: lasdns.cpp
===================================================================
RCS file: /cvs/dirsec/ldapserver/lib/libaccess/lasdns.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lasdns.cpp 11 Apr 2006 02:14:53 -0000 1.6
+++ lasdns.cpp 8 Nov 2006 21:23:42 -0000 1.7
@@ -168,7 +168,7 @@
if (delimiter >= maxsize) {
delimiter = maxsize-1;
}
- PL_strncpyz(token, attr_pattern, delimiter);
+ PL_strncpyz(token, attr_pattern, delimiter + 1);
token[delimiter] = '\0';
/* Skip any white space after the token */
17 years, 5 months
[Fedora-directory-commits] dsbuild/ds/adminutil checksums,1.9,1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1077
Modified Files:
checksums
Log Message:
updated for 1.0.4
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- checksums 6 Nov 2006 21:54:25 -0000 1.9
+++ checksums 8 Nov 2006 04:13:41 -0000 1.10
@@ -1 +1 @@
-e98dd6f0f4f812f2fc4418edb4bed326 download/fedora-adminutil-1.0.4.tar.gz
+8bafc54cdc08e3886b6a68d0ac9367a0 download/fedora-adminutil-1.0.4.tar.gz
17 years, 5 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd add.c, 1.8, 1.9
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31377
Modified Files:
add.c
Log Message:
Resolves: 214463
Summary: Corrected ACI checking for userPassword during an add operation.
Index: add.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/add.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- add.c 31 Aug 2006 22:52:07 -0000 1.8
+++ add.c 7 Nov 2006 19:59:02 -0000 1.9
@@ -484,9 +484,9 @@
/* Check ACI before checking password syntax */
if ( (err = slapi_access_allowed(pb, e, SLAPI_USERPWD_ATTR, NULL,
- SLAPI_ACL_WRITE)) != LDAP_SUCCESS) {
+ SLAPI_ACL_ADD)) != LDAP_SUCCESS) {
send_ldap_result(pb, err, NULL,
- "Insufficient 'write' privilege to the "
+ "Insufficient 'add' privilege to the "
"'userPassword' attribute", 0, NULL);
goto done;
}
17 years, 5 months