-Use the authentication tab to set the attributes required for your new database link to connect with a remote data source on another server.
+Use the authentication tab to set the attributes required for your new database link to authenticate to and connect with a remote data source on another server.
Index: configtab_replication.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_replication.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configtab_replication.html 20 Nov 2007 17:35:08 -0000 1.2
+++ configtab_replication.html 3 Mar 2009 00:13:59 -0000 1.3
@@ -3,11 +3,11 @@
-The replication model used in Directory Server 4.1x and the current replication model are different. The former replication model is termed Legacy Replication. Only use this tab if you wish to accept replication updates from a 4.1x Directory Server using legacy replication.
+The replication model used in Directory Server 4.1x and the current replication model are different. The former replication model is termed Legacy Replication. Only use this tab if you wish to accept replication updates from a 4.1x Directory Server using legacy replication.
Index: configtab_replication2.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_replication2.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configtab_replication2.html 20 Nov 2007 17:35:08 -0000 1.2
+++ configtab_replication2.html 3 Mar 2009 00:13:59 -0000 1.3
@@ -3,11 +3,11 @@
-Use this tab to configure a server as a supplier server. You must specify supplier attributes on any server that holds the master copy of a directory database.
+Use this tab to configure a server as a supplier server. This applies to any server which supplies updates to another server, whether the server is one of several masters, a single master, or a read-only hub.
Index: configtab_replication3.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/configtab_replication3.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configtab_replication3.html 26 Feb 2009 17:49:06 -0000 1.3
+++ configtab_replication3.html 3 Mar 2009 00:13:59 -0000 1.4
@@ -24,7 +24,7 @@
-If the ID is incorrect, the field labels turn red and the Save button is disabled. Dedicated Consumer does not require Replica ID.
+If the ID is incorrect, the field labels turn red and the Save button is disabled. Hub and Dedicated Consumer do not require Replica ID.
-Use the Connection tab to display the type of connection used by your replica during replication. You can use this tab to modify the user bind name and password. You cannot change the connection type. To change the connection type, re-create the replication agreement.
+Use the Connection tab to display and configure the type of connection and authentication used by your replica during replication. You cannot change the connection type to or from "Use TLS/SSL (TLS/SSL encryption with LDAPS)" since this would require changing the port number. If you want to do this, re-create the agreement.
-Use the Connection tab to display the type of connection used by your servers during synchronization. You can use this tab to modify the user bind name and password. You cannot change the connection type since this would require changing the port number. To change the connection type, re-create the synchronization agreement.
+Use the Connection tab to display the type of connection used by your servers during synchronization. You can use this tab to modify the user bind name and password. You cannot change the connection type to or from "Use TLS/SSL (TLS/SSL encryption with LDAPS)" since this would require changing the port number. If you want to do this, re-create the synchronization agreement.
Index: synchronization_wizard1.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/synchronization_wizard1.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- synchronization_wizard1.html 13 Aug 2007 22:28:09 -0000 1.1
+++ synchronization_wizard1.html 3 Mar 2009 00:13:59 -0000 1.2
@@ -7,7 +7,7 @@
Index: synchronization_wizard2.html
===================================================================
RCS file: /cvs/dirsec/directoryconsole/help/en/help/synchronization_wizard2.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- synchronization_wizard2.html 20 Nov 2007 17:35:08 -0000 1.2
+++ synchronization_wizard2.html 3 Mar 2009 00:13:59 -0000 1.3
@@ -36,11 +36,11 @@
-Using Encrypted SSL Connection. If you want the Directory Server and Windows servers to use SSL for secure communication, select this checkbox. To use this option, you must have first configured your servers to use SSL. It is strongly recommended that you use an SSL connection. Passwords will not be synchronized if you do not enable SSL.
+Use LDAP (no encryption). If you want the supplier and consumer servers to use plain LDAP with no security, select this radio button.
-Bind As. Enter the supplier bind DN defined on the Windows server in the Bind As text box. This must be a valid DN.
+Use TLS/SSL (TLS/SSL encryption with LDAPS). Deprecated. If you want the supplier and consumer servers to use TLS/SSL for secure communication using LDAPS, select this radio button. To use this option, you must have first configured your servers to use TLS/SSL. This is Deprecated - use StartTLS instead.
+
+
+
+Use StartTLS (TLS/SSL encryption with LDAP). If you want the supplier and consumer servers to use TLS/SSL for secure communication using StartTLS to start an encrypted channel using LDAP, select this radio button. To use this option, you must have first configured your servers to use TLS/SSL.
+
+
+
+Bind As. Enter the supplier bind DN defined on the Windows server in the Bind As text box. This must be a valid DN. This user must be able to read, write, and use the DirSync control in the specified subtree.
From rmeggins at fedoraproject.org Tue Mar 3 01:24:28 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 3 Mar 2009 01:24:28 +0000 (UTC)
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv/panel/replication
AgreementDestinationPanel.java, 1.2,
1.3 WindowsAgreementDestinationPanel.java, 1.3, 1.4
Message-ID: <20090303012428.E266070117@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28857/directoryconsole/src/com/netscape/admin/dirserv/panel/replication
Modified Files:
AgreementDestinationPanel.java
WindowsAgreementDestinationPanel.java
Log Message:
Resolves: bug 483660
Bug Description: Replication and Sync agreement edit should not allow change to/from LDAPS
Reviewed by: nhosoi (Thanks!)
Fix Description: The problem is that there is no way to change the port number in this panel, so if you change to/from LDAPS, there is no way to supply the correct port number. If the agreement was created with LDAPS, disable the LDAP and StartTLS fields, and vice versa.
Platforms tested: RHEL5
Flag Day: no
Doc impact: Yes
Index: AgreementDestinationPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication/AgreementDestinationPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AgreementDestinationPanel.java 24 Nov 2008 16:09:23 -0000 1.2
+++ AgreementDestinationPanel.java 3 Mar 2009 01:24:26 -0000 1.3
@@ -349,7 +349,7 @@
}
- private void enableFields(){
+ private void enableFields(){
boolean ssl = _sslEncrypt.isSelected() || _tlsEncrypt.isSelected();
if (_sslAuth != null) {
_sslAuth.setEnabled(ssl);
@@ -357,6 +357,14 @@
if (_gssapiAuth != null) {
_gssapiAuth.setEnabled(!ssl);
}
+ // cannot convert to or from LDAPS because there is no way to change
+ // the port number in this panel
+ if (_sslEncrypt.isSelected()) {
+ _tlsEncrypt.setEnabled(false);
+ _noEncrypt.setEnabled(false);
+ } else {
+ _sslEncrypt.setEnabled(false);
+ }
}
Index: WindowsAgreementDestinationPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication/WindowsAgreementDestinationPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WindowsAgreementDestinationPanel.java 24 Nov 2008 16:09:23 -0000 1.3
+++ WindowsAgreementDestinationPanel.java 3 Mar 2009 01:24:26 -0000 1.4
@@ -792,6 +792,14 @@
_bindText.setText(_wizardInfo.getBindDN());
_tlsEncrypt.setSelected(_wizardInfo.getStartTLS());
_sslEncrypt.setSelected(_wizardInfo.getSSL());
+ // cannot change to/from LDAPS in this panel because there
+ // is no way to change the port number
+ if (_sslEncrypt.isSelected()) {
+ _noEncrypt.setEnabled(false);
+ _tlsEncrypt.setEnabled(false);
+ } else {
+ _sslEncrypt.setEnabled(false);
+ }
enableSimpleAuth(true);
/* none of the other auth methods are currently supported */
}
From nkinder at fedoraproject.org Tue Mar 3 17:36:02 2009
From: nkinder at fedoraproject.org (Nathan Kinder)
Date: Tue, 3 Mar 2009 17:36:02 +0000 (UTC)
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm
import-threads.c, 1.20, 1.21
Message-ID: <20090303173602.A16BC70117@cvs1.fedora.phx.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16184/ldap/servers/slapd/back-ldbm
Modified Files:
import-threads.c
Log Message:
Resolves: bug 486400
Bug Description: During migration, if import fails for some reason,
the exact cause of why it was unable to open the LDIF is not logged.
Reviewed by: nhosoi (thanks!)
Files: see diff
Branch: HEAD
Fix Description: As discussed in the bug council, the fix is to just
report the actual error returned when the open() of the LDIF fails.
This reports the errno and a string description of the error in the
errors log (which is also output to stderr when running ldif2db).
Platforms tested: F9
Flag Day: no
Doc impact: no
Index: import-threads.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import-threads.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- import-threads.c 21 Nov 2008 16:38:34 -0000 1.20
+++ import-threads.c 3 Mar 2009 17:35:59 -0000 1.21
@@ -461,8 +461,8 @@
fd = dblayer_open_huge_file(curr_filename, o_flag, 0);
}
if (fd < 0) {
- import_log_notice(job, "Could not open LDIF file \"%s\"",
- curr_filename);
+ import_log_notice(job, "Could not open LDIF file \"%s\", errno %d (%s)",
+ curr_filename, errno, slapd_system_strerror(errno));
goto error;
}
if (fd == STDIN_FILENO) {
From rmeggins at fedoraproject.org Wed Mar 4 18:58:07 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 4 Mar 2009 18:58:07 +0000 (UTC)
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication cl5_api.c, 1.26,
1.27 cl5_clcache.c, 1.9, 1.10 cl5_clcache.h, 1.5,
1.6 cl5_config.c, 1.9, 1.10
Message-ID: <20090304185807.E7C1470117@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6239/ldapserver/ldap/servers/plugins/replication
Modified Files:
cl5_api.c cl5_clcache.c cl5_clcache.h cl5_config.c
Log Message:
Resolves: bug 487425
Bug Description: slapd crashes after changelog is moved
Reviewed by: nkinder, nhosoi (Thanks!)
Fix Description: There are a number of real fixes, mixed in with many changes for debugging and instrumentation.
1) When the update thread gets the changelog iterator, it will use _cl5AddThread to increment the count of threads holding an open handle to the changelog. When it releases the iterator, or if there were some error acquiring the database handle, it will decrement the thread count. The way it used to work was that it would increment the thread count when retrieving the DB object, but then would immediately decrement it, meaning it had an open handle to the database, but there was no way for the changelog code to know that (except via the reference count on the DB object itself).
2) Changed the AddThread code to increment the thread count outside of the state lock - this better fits the semantics of the other uses of threadcount which are outside of the lock.
3) The changelog code that closes the databases was not closing things down in the correct order. The first thing it must do is wait for all threads with open database handles or otherwise accessing the database to terminate. Once that is done, it can call _cl5DBClose() to actually close all of the databases. Otherwise, a race condition could cause a database to be accessed after it has been closed.
4) Added clcache cleanup code, and made it possible to re-init the clcache. The clcache was not designed to be dynamically closed and opened.
clcache is init-ed in _cl5Open
clcache_init is re-entrant
Added more code to clean up the clcache
Delete the clcache in _cl5Delete
5) The clcache stores the current buffer in a thread private storage area. If the clcache has been re-initialized, this buffer is also invalid and the clcache code must get a new buffer.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: cl5_api.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_api.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cl5_api.c 5 Dec 2008 22:41:51 -0000 1.26
+++ cl5_api.c 4 Mar 2009 18:58:05 -0000 1.27
@@ -527,7 +527,7 @@
/* already open - ignore */
if (s_cl5Desc.dbState == CL5_STATE_OPEN)
{
- slapi_log_error(SLAPI_LOG_PLUGIN, repl_plugin_name_cl,
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
"cl5Open: changelog already opened; request ignored\n");
rc = CL5_SUCCESS;
goto done;
@@ -920,6 +920,11 @@
object_release (file_obj);
}
+ else
+ {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "cl5GetUpperBoundRUV: "
+ "could not find DB object for replica\n");
+ }
object_release (r_obj);
@@ -1756,7 +1761,7 @@
if (replica == NULL || consumerRuv == NULL || iterator == NULL)
{
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
- "cl5CreateReplayIterator: invalid parameter\n");
+ "cl5CreateReplayIteratorEx: invalid parameter\n");
return CL5_BAD_DATA;
}
@@ -1765,7 +1770,7 @@
if (s_cl5Desc.dbState == CL5_STATE_NONE)
{
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
- "cl5CreateReplayIterator: changelog is not initialized\n");
+ "cl5CreateReplayIteratorEx: changelog is not initialized\n");
return CL5_BAD_STATE;
}
@@ -1787,8 +1792,17 @@
object_release (obj);
}
}
+ else
+ {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "cl5CreateReplayIteratorEx: could not find DB object for replica\n");
+ }
- _cl5RemoveThread ();
+ if (rc != CL5_SUCCESS)
+ {
+ /* release the thread */
+ _cl5RemoveThread ();
+ }
return rc;
}
@@ -1842,8 +1856,17 @@
object_release (obj);
}
}
+ else
+ {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "cl5CreateReplayIterator: could not find DB object for replica\n");
+ }
- _cl5RemoveThread ();
+ if (rc != CL5_SUCCESS)
+ {
+ /* release the thread */
+ _cl5RemoveThread ();
+ }
return rc;
@@ -1937,14 +1960,21 @@
clcache_return_buffer ( &(*iterator)->clcache );
- if ((*iterator)->fileObj)
+ if ((*iterator)->fileObj) {
object_release ((*iterator)->fileObj);
+ (*iterator)->fileObj = NULL;
+ }
/* release supplier's ruv */
- if ((*iterator)->supplierRuvObj)
+ if ((*iterator)->supplierRuvObj) {
object_release ((*iterator)->supplierRuvObj);
+ (*iterator)->supplierRuvObj = NULL;
+ }
slapi_ch_free ((void **)iterator);
+
+ /* this thread no longer holds a db reference, release it */
+ _cl5RemoveThread();
}
/* Name: cl5DeleteOnClose
@@ -2039,10 +2069,14 @@
PR_ASSERT (file);
count = file->entryCount;
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "cl5GetOperationCount: found DB object %p\n", obj);
object_release (obj);
}
else
{
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "cl5GetOperationCount: could not get DB object for replica\n");
count = 0;
}
}
@@ -2071,6 +2105,12 @@
_cl5SetDefaultDBConfig ();
}
+ /* init the clcache */
+ if (( clcache_init (&s_cl5Desc.dbEnv) != 0 )) {
+ rc = CL5_SYSTEM_ERROR;
+ goto done;
+ }
+
/* initialize trimming */
rc = _cl5TrimInit ();
if (rc != CL5_SUCCESS)
@@ -2404,6 +2444,7 @@
PRDirEntry *entry = NULL;
int rc;
Object *replica;
+ int count = 0;
/* create lock that guarantees that each file is only added once to the list */
s_cl5Desc.fileLock = PR_NewLock ();
@@ -2445,6 +2486,7 @@
}
object_release (replica);
+ count++;
}
else /* there is no matching replica for the file - remove */
{
@@ -2464,6 +2506,8 @@
}
}
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBOpen: "
+ "opened %d existing databases in %s\n", count, s_cl5Desc.dbDir);
PR_CloseDir(dir);
return CL5_SUCCESS;
@@ -2759,12 +2803,12 @@
return CL5_BAD_STATE;
}
+ PR_RWLock_Unlock (s_cl5Desc.stLock);
+
/* increment global thread count to make sure that changelog does not close while
backup is in progress */
PR_AtomicIncrement (&s_cl5Desc.threadCount);
- PR_RWLock_Unlock (s_cl5Desc.stLock);
-
return CL5_SUCCESS;
}
@@ -3157,6 +3201,7 @@
}
PR_AtomicDecrement (&s_cl5Desc.threadCount);
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DeadlockMain: exiting\n");
return 0;
}
@@ -3237,6 +3282,7 @@
}
PR_AtomicDecrement (&s_cl5Desc.threadCount);
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5CheckpointMain: exiting\n");
return 0;
}
@@ -3262,6 +3308,7 @@
}
PR_AtomicDecrement (&s_cl5Desc.threadCount);
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5TrickleMain: exiting\n");
return 0;
}
@@ -3773,28 +3820,38 @@
if (s_cl5Desc.dbState != CL5_STATE_CLOSED) /* Don't try to close twice */
{
- /* close db files */
- _cl5DBClose ();
-
- /* stop global threads */
+ /* cl5Close() set the state flag to CL5_STATE_CLOSING, which should
+ trigger all of the db housekeeping threads to exit, and which will
+ eventually cause no new update threads to start - so we wait here
+ for those other threads to finish before we proceed */
interval = PR_MillisecondsToInterval(100);
while (s_cl5Desc.threadCount > 0)
{
- slapi_log_error( SLAPI_LOG_PLUGIN, repl_plugin_name_cl,
+ slapi_log_error( SLAPI_LOG_REPL, repl_plugin_name_cl,
"_cl5Close: waiting for threads to exit: %d thread(s) still active\n",
s_cl5Desc.threadCount);
DS_Sleep(interval);
}
+ /* There should now be no threads accessing any of the changelog databases -
+ it is safe to remove those databases */
+ _cl5DBClose ();
+
/* cleanup trimming */
_cl5TrimCleanup ();
- /* shutdown db environment */
+ /* There should be no more open databases after _cl5DBClose, so it is now
+ safe to close the dbEnv */
if (s_cl5Desc.dbEnv)
{
DB_ENV *dbEnv = s_cl5Desc.dbEnv;
- dbEnv->close(dbEnv, 0);
+ int rc = dbEnv->close(dbEnv, 0);
s_cl5Desc.dbEnv = NULL;
+ if (rc) {
+ slapi_log_error( SLAPI_LOG_FATAL, repl_plugin_name_cl,
+ "_cl5Close: error closing DB environment: %d (%s)\n",
+ rc, db_strerror(rc));
+ }
}
/* record successful close by writing guardian file;
@@ -3828,11 +3885,20 @@
{
if (NULL != s_cl5Desc.dbFiles)
{
- objset_delete (&s_cl5Desc.dbFiles);
+ Object *obj;
+ for (obj = objset_first_obj(s_cl5Desc.dbFiles); obj;
+ obj = objset_next_obj(s_cl5Desc.dbFiles, obj)) {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "_cl5DBClose: deleting DB object %p\n", obj);
+ }
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "_cl5DBClose: closing databases in %s\n", s_cl5Desc.dbDir);
+ objset_delete (&s_cl5Desc.dbFiles);
}
if (NULL != s_cl5Desc.fileLock)
{
PR_DestroyLock (s_cl5Desc.fileLock);
+ s_cl5Desc.fileLock = NULL;
}
}
@@ -3936,6 +4002,9 @@
"_cl5Delete: changelog dir (%s) is not empty - cannot remove\n",
clDir);
}
+
+ /* invalidate the clcache */
+ clcache_destroy();
return CL5_SUCCESS;
}
@@ -4142,6 +4211,7 @@
}
PR_AtomicDecrement (&s_cl5Desc.threadCount);
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5TrimMain: exiting\n");
return 0;
}
@@ -4502,8 +4572,8 @@
else
{
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl,
- "_cl5WriteRUV: failed to write %s RUV for file %s; db error - %d\n",
- purge? "purge" : "upper bound", file->name, rc);
+ "_cl5WriteRUV: failed to write %s RUV for file %s; db error - %d (%s)\n",
+ purge? "purge" : "upper bound", file->name, rc, db_strerror(rc));
if (CL5_OS_ERR_IS_DISKFULL(rc))
{
@@ -5168,12 +5238,14 @@
PR_TRUE /* check for duplicates */);
if (rc != CL5_SUCCESS)
{
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "_cl5WriteOperation: failed to find or open DB object for replica %s\n", replName);
return rc;
}
}
else if (rc != CL5_SUCCESS)
{
- slapi_log_error(SLAPI_LOG_PLUGIN, repl_plugin_name_cl,
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
"_cl5WriteOperation: failed to get db file for target dn (%s)",
op->target_address.dn);
return CL5_OBJSET_ERROR;
@@ -5283,7 +5355,7 @@
}
else if ((cnt + 1) >= MAX_TRIALS)
{
- slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl, "_cl5WriteOperation: retry (%d) the transaction (csn=%s) failed (rc=%d)\n", cnt, (char*)key.data, rc);
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl, "_cl5WriteOperation: retry (%d) the transaction (csn=%s) failed (rc=%d (%s))\n", cnt, (char*)key.data, rc, db_strerror(rc));
}
}
cnt ++;
@@ -6235,6 +6307,8 @@
file_name = NULL;
if (tmpObj) /* this file already exist */
{
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "_cl5DBOpenFileByReplicaName: Found DB object %p for replica %s\n", tmpObj, replName);
/* if we were asked for file handle - keep the handle */
if (obj)
{
@@ -6281,6 +6355,8 @@
/* Mark the DB File initialize */
_cl5DBFileInitialized(tmpObj);
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "_cl5DBOpenFileByReplicaName: created new DB object %p\n", tmpObj);
if (obj)
{
*obj = tmpObj;
@@ -6325,6 +6401,11 @@
object_release (tmpObj);
return CL5_OBJSET_ERROR;
}
+ else
+ {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "_cl5AddDBFile: Added new DB object %p\n", tmpObj);
+ }
if (obj)
{
@@ -6516,6 +6597,11 @@
file = *(CL5DBFile**)data;
+ PR_ASSERT (file);
+
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: "
+ "Closing database %s/%s\n", s_cl5Desc.dbDir, file->name);
+
/* close the file */
/* if this is normal close or close after import, update entry count */
if ((s_cl5Desc.dbOpenMode == CL5_OPEN_NORMAL && s_cl5Desc.dbState == CL5_STATE_CLOSING) ||
@@ -6527,28 +6613,38 @@
}
/* close the db */
- if (file->db)
+ if (file->db) {
file->db->close(file->db, 0);
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: "
+ "Closed the changelog database handle for %s/%s\n", s_cl5Desc.dbDir, file->name);
+ file->db = NULL;
+ }
if (file->flags & DB_FILE_DELETED)
- {
- int rc = 0;
- /* We need to use the libdb API to delete the files, otherwise we'll
- * run into problems when we try to checkpoint transactions later. */
- PR_snprintf(fullpathname, MAXPATHLEN, "%s/%s", s_cl5Desc.dbDir, file->name);
- rc = s_cl5Desc.dbEnv->dbremove(s_cl5Desc.dbEnv, 0, fullpathname, 0, 0);
- if (rc != 0)
- {
- slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: "
- "failed to remove (%s) file; libdb error - %d (%s)\n",
- fullpathname, rc, db_strerror(rc));
- }
+ {
+ int rc = 0;
+ /* We need to use the libdb API to delete the files, otherwise we'll
+ * run into problems when we try to checkpoint transactions later. */
+ PR_snprintf(fullpathname, MAXPATHLEN, "%s/%s", s_cl5Desc.dbDir, file->name);
+ rc = s_cl5Desc.dbEnv->dbremove(s_cl5Desc.dbEnv, 0, fullpathname, 0, 0);
+ if (rc != 0)
+ {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: "
+ "failed to remove (%s) file; libdb error - %d (%s)\n",
+ fullpathname, rc, db_strerror(rc));
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBCloseFile: "
+ "Deleted the changelog database file %s/%s\n", s_cl5Desc.dbDir, file->name);
+
}
+ }
/* slapi_ch_free accepts NULL pointer */
slapi_ch_free ((void**)&file->name);
slapi_ch_free ((void**)&file->replName);
slapi_ch_free ((void**)&file->replGen);
+ ruv_destroy(&file->maxRUV);
+ ruv_destroy(&file->purgeRUV);
if (file->sema) {
PR_CloseSemaphore (file->sema);
PR_DeleteSemaphore (file->semaName);
@@ -6568,13 +6664,18 @@
fileName = _cl5Replica2FileName (replica);
*obj = objset_find(s_cl5Desc.dbFiles, _cl5CompareDBFile, fileName);
- slapi_ch_free ((void**)&fileName);
if (*obj)
{
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5GetDBFile: "
+ "found DB object %p for database %s\n", *obj, fileName);
+ slapi_ch_free_string(&fileName);
return CL5_SUCCESS;
}
else
{
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5GetDBFile: "
+ "no DB object found for database %s\n", fileName);
+ slapi_ch_free_string(&fileName);
return CL5_NOTFOUND;
}
}
@@ -6589,13 +6690,18 @@
fileName = _cl5MakeFileName (replName, replGen);
*obj = objset_find(s_cl5Desc.dbFiles, _cl5CompareDBFile, fileName);
- slapi_ch_free ((void**)&fileName);
if (*obj)
{
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5GetDBFileByReplicaName: "
+ "found DB object %p for database %s\n", *obj, fileName);
+ slapi_ch_free_string(&fileName);
return CL5_SUCCESS;
}
else
{
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5GetDBFileByReplicaName: "
+ "no DB object found for database %s\n", fileName);
+ slapi_ch_free_string(&fileName);
return CL5_NOTFOUND;
}
}
@@ -6603,13 +6709,21 @@
static void _cl5DBDeleteFile (Object *obj)
{
CL5DBFile *file;
+ int rc = 0;
PR_ASSERT (obj);
file = (CL5DBFile*)object_get_data (obj);
PR_ASSERT (file);
file->flags |= DB_FILE_DELETED;
- objset_remove_obj(s_cl5Desc.dbFiles, obj);
+ rc = objset_remove_obj(s_cl5Desc.dbFiles, obj);
+ if (rc != OBJSET_SUCCESS) {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBDeleteFile: "
+ "could not find DB object %p\n", obj);
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl, "_cl5DBDeleteFile: "
+ "removed DB object %p\n", obj);
+ }
object_release (obj);
}
Index: cl5_clcache.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_clcache.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cl5_clcache.c 5 Dec 2008 22:41:51 -0000 1.9
+++ cl5_clcache.c 4 Mar 2009 18:58:05 -0000 1.10
@@ -178,6 +178,9 @@
int
clcache_init ( DB_ENV **dbenv )
{
+ if (_pool) {
+ return 0; /* already initialized */
+ }
_pool = (struct clc_pool*) slapi_ch_calloc ( 1, sizeof ( struct clc_pool ));
_pool->pl_dbenv = dbenv;
_pool->pl_buffer_cnt_min = DEFAULT_CLC_BUFFER_COUNT_MIN;
@@ -225,12 +228,23 @@
clcache_get_buffer ( CLC_Buffer **buf, DB *db, ReplicaId consumer_rid, const RUV *consumer_ruv, const RUV *local_ruv )
{
int rc = 0;
+ int need_new;
if ( buf == NULL ) return CL5_BAD_DATA;
*buf = NULL;
- if ( NULL != ( *buf = (CLC_Buffer*) get_thread_private_cache()) ) {
+ /* if the pool was re-initialized, the thread private cache will be invalid,
+ so we must get a new one */
+ need_new = (!_pool || !_pool->pl_busy_lists || !_pool->pl_busy_lists->bl_buffers);
+
+ if ( (!need_new) && (NULL != ( *buf = (CLC_Buffer*) get_thread_private_cache())) ) {
+ slapi_log_error ( SLAPI_LOG_REPL, get_thread_private_agmtname(),
+ "clcache_get_buffer: found thread private buffer cache %p\n", *buf);
+ slapi_log_error ( SLAPI_LOG_REPL, get_thread_private_agmtname(),
+ "clcache_get_buffer: _pool is %p _pool->pl_busy_lists is %p _pool->pl_busy_lists->bl_buffers is %p\n",
+ _pool, _pool ? _pool->pl_busy_lists : NULL,
+ (_pool && _pool->pl_busy_lists) ? _pool->pl_busy_lists->bl_buffers : NULL);
(*buf)->buf_state = CLC_STATE_READY;
(*buf)->buf_load_cnt = 0;
(*buf)->buf_record_cnt = 0;
@@ -481,6 +495,7 @@
int i;
for ( i = 0; i < buf->buf_num_cscbs; i++ ) {
+ csn_free(&buf->buf_cscbs[i]->consumer_maxcsn);
ruv_get_largest_csn_for_replica (
buf->buf_consumer_ruv,
buf->buf_cscbs[i]->rid,
@@ -841,8 +856,22 @@
clcache_delete_busy_list ( CLC_Busy_List **bl )
{
if ( bl && *bl ) {
+ CLC_Buffer *buf = NULL;
if ( (*bl)->bl_lock ) {
+ PR_Lock ( (*bl)->bl_lock );
+ }
+ buf = (*bl)->bl_buffers;
+ while (buf) {
+ CLC_Buffer *next = buf->buf_next;
+ clcache_delete_buffer(&buf);
+ buf = next;
+ }
+ (*bl)->bl_buffers = NULL;
+ (*bl)->bl_db = NULL;
+ if ( (*bl)->bl_lock ) {
+ PR_Unlock ( (*bl)->bl_lock );
PR_DestroyLock ( (*bl)->bl_lock );
+ (*bl)->bl_lock = NULL;
}
/* csn_free (&( (*bl)->bl_max_csn )); */
slapi_ch_free ( (void **) bl );
@@ -951,3 +980,29 @@
*csn1 = csn_new();
csn_init_by_csn ( *csn1, csn2 );
}
+
+void
+clcache_destroy()
+{
+ if (_pool) {
+ CLC_Busy_List *bl = NULL;
+ if (_pool->pl_lock) {
+ PR_RWLock_Wlock (_pool->pl_lock);
+ }
+
+ bl = _pool->pl_busy_lists;
+ while (bl) {
+ CLC_Busy_List *next = bl->bl_next;
+ clcache_delete_busy_list(&bl);
+ bl = next;
+ }
+ _pool->pl_busy_lists = NULL;
+ _pool->pl_dbenv = NULL;
+ if (_pool->pl_lock) {
+ PR_RWLock_Unlock(_pool->pl_lock);
+ PR_DestroyRWLock(_pool->pl_lock);
+ _pool->pl_lock = NULL;
+ }
+ slapi_ch_free ( (void **) &_pool );
+ }
+}
Index: cl5_clcache.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_clcache.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cl5_clcache.h 10 Nov 2006 23:45:17 -0000 1.5
+++ cl5_clcache.h 4 Mar 2009 18:58:05 -0000 1.6
@@ -55,5 +55,6 @@
int clcache_load_buffer ( CLC_Buffer *buf, CSN *startCSN, int flag );
void clcache_return_buffer ( CLC_Buffer **buf );
int clcache_get_next_change ( CLC_Buffer *buf, void **key, size_t *keylen, void **data, size_t *datalen, CSN **csn );
+void clcache_destroy ();
#endif
Index: cl5_config.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/cl5_config.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cl5_config.c 5 Dec 2008 22:41:51 -0000 1.9
+++ cl5_config.c 4 Mar 2009 18:58:05 -0000 1.10
@@ -497,8 +497,6 @@
"old dir - %s, new dir - %s; recreating changelog.\n",
currentDir, config.dir);
- /* this call will block until all threads using changelog
- release changelog by calling cl5RemoveThread () */
rc = cl5Close ();
if (rc != CL5_SUCCESS)
{
@@ -511,6 +509,9 @@
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl,
"changelog5_config_modify: failed to close changelog\n");
goto done;
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "changelog5_config_modify: closed the changelog\n");
}
rc = cl5Delete (currentDir);
@@ -525,6 +526,9 @@
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name_cl,
"changelog5_config_modify: failed to remove changelog\n");
goto done;
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "changelog5_config_modify: deleted the changelog at %s\n", currentDir);
}
rc = cl5Open (config.dir, &config.dbconfig);
@@ -544,6 +548,9 @@
"changelog5_config_modify: failed to restore previous changelog\n");
}
goto done;
+ } else {
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name_cl,
+ "changelog5_config_modify: opened the changelog at %s\n", config.dir);
}
}
}
From rmeggins at fedoraproject.org Fri Mar 6 20:02:16 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 6 Mar 2009 20:02:16 +0000 (UTC)
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication
repl5_inc_protocol.c, 1.14, 1.15
Message-ID: <20090306200216.3EA9E70117@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21859/ldapserver/ldap/servers/plugins/replication
Modified Files:
repl5_inc_protocol.c
Log Message:
Resolves: bug 488866
Bug Description: crash in reliab15 test
Reviewed by: nhosoi (Thanks!)
Fix Description: I could not reproduce the crash, but I think the problem is that the server is not handling the disconnection case correctly. It seems that in the event of disconnection (LDAP_SERVER_DOWN 81 - Can't contact server) the code would continue to read results.
repl5_inc_result_threadmain() will call conn_read_result_ex() in a loop. If conn_read_result_ex() detects a disconnection or an unrecoverable error, it will call conn_disconnect to close the connection, and return CONN_NOT_CONNECTED. Once this happens, the code must not use conn->ld any more. However, the code did not differentiate between the not connected case and other errors, so it would keep trying to read results (in case some errors are recoverable, the thread still has to read all of the pending results). The code has been fixed to handle disconnect cases specially. I also added some additional locking to make sure the result and the abort flags were set/read correctly. Finally, I changed the code that waits for results to come in, so that if the connection has been closed, it will just return immediately.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
Index: repl5_inc_protocol.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_inc_protocol.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- repl5_inc_protocol.c 5 Dec 2008 22:41:51 -0000 1.14
+++ repl5_inc_protocol.c 6 Mar 2009 20:02:13 -0000 1.15
@@ -329,6 +329,7 @@
}
if (conres != CONN_TIMEOUT)
{
+ int return_value;
int should_finish = 0;
if (message_id)
{
@@ -347,17 +348,26 @@
conn_get_error_ex(conn, &operation_code, &connection_error, &ldap_error_string);
slapi_log_error(SLAPI_LOG_REPL, NULL, "repl5_inc_result_threadmain: result %d, %d, %d, %d, %s\n", operation_code,connection_error,conres,message_id,ldap_error_string);
- rd->result = repl5_inc_update_from_op_result(rd->prp, conres, connection_error, csn_str, uniqueid, replica_id, &should_finish, &(rd->num_changes_sent));
- if (rd->result || should_finish)
+ return_value = repl5_inc_update_from_op_result(rd->prp, conres, connection_error, csn_str, uniqueid, replica_id, &should_finish, &(rd->num_changes_sent));
+ if (return_value || should_finish)
{
- slapi_log_error(SLAPI_LOG_REPL, NULL, "repl5_inc_result_threadmain: got op result %d should finish %d\n", rd->result, should_finish);
+ slapi_log_error(SLAPI_LOG_REPL, NULL, "repl5_inc_result_threadmain: got op result %d should finish %d\n", return_value, should_finish);
/* If so then we need to take steps to abort the update process */
PR_Lock(rd->lock);
+ rd->result = return_value;
rd->abort = 1;
PR_Unlock(rd->lock);
/* We also need to log the error, including details stored from when the operation was sent */
/* we cannot finish yet - we still need to waitfor the pending results, then
the main repl code will shut down this thread */
+ /* we can finish if we have disconnected - in that case, there will be nothing
+ to read */
+ if (return_value == UPDATE_CONNECTION_LOST) {
+ finished = 1;
+ }
+ } else {
+ /* old semantics had result set outside of lock */
+ rd->result = return_value;
}
}
/* Should we stop ? */
@@ -470,13 +480,17 @@
/* If so then we're done */
done = 1;
}
+ if (rd->abort && (rd->result == UPDATE_CONNECTION_LOST))
+ {
+ done = 1; /* no connection == no more results */
+ }
PR_Unlock(rd->lock);
/* If not then sleep a bit */
DS_Sleep(PR_SecondsToInterval(1));
loops++;
/* If we sleep forever then we can conclude that something bad happened, and bail... */
/* Arbitrary 30 second delay : basically we should only expect to wait as long as it takes to process a few operations, which should be on the order of a second at most */
- if (loops > 300)
+ if (!done && (loops > 300))
{
/* Log a warning */
slapi_log_error(SLAPI_LOG_FATAL, NULL,
@@ -1551,7 +1565,7 @@
{
/* We lost the connection - enter backoff state */
- return_value = UPDATE_TRANSIENT_ERROR;
+ return_value = UPDATE_CONNECTION_LOST;
*finished = 1;
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"%s: Consumer failed to replay change (uniqueid %s, CSN %s): "
@@ -1794,7 +1808,7 @@
{
/* We lost the connection - enter backoff state */
- return_value = UPDATE_TRANSIENT_ERROR;
+ return_value = UPDATE_CONNECTION_LOST;
finished = 1;
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
"%s: Consumer failed to replay change (uniqueid %s, CSN %s): "
@@ -1914,19 +1928,24 @@
return_value = UPDATE_YIELD;
finished = 1;
}
+ PR_Lock(rd->lock);
/* See if the result thread has hit a problem */
if (!finished && rd->abort)
{
return_value = rd->result;
finished = 1;
}
+ PR_Unlock(rd->lock);
} while (!finished);
/* Terminate the results reading thread */
if (!prp->repl50consumer)
{
/* We need to ensure that we wait until all the responses have been recived from our operations */
- repl5_inc_waitfor_async_results(rd);
+ if (return_value != UPDATE_CONNECTION_LOST) {
+ /* if connection was lost/closed, there will be nothing to read */
+ repl5_inc_waitfor_async_results(rd);
+ }
rc = repl5_inc_destroy_async_result_thread(rd);
if (rc) {
From rmeggins at fedoraproject.org Sat Mar 7 00:59:10 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Sat, 7 Mar 2009 00:59:10 +0000 (UTC)
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd
mapping_tree.c, 1.17, 1.18
Message-ID: <20090307005910.1143B70117@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29835
Modified Files:
mapping_tree.c
Log Message:
Resolves: bug 488814
Description: mapping tree code inconsistent about treatment of quoted node names
Reviewed by: nhosoi (Thanks!)
Fix Description: Look for (|(%s=\"%s\")(%s=%s))) when looking for mapping tree suffixes - there may be a quoted suffix, or one without quotes, so look for either
Index: mapping_tree.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/mapping_tree.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mapping_tree.c 4 Dec 2008 00:42:18 -0000 1.17
+++ mapping_tree.c 7 Mar 2009 00:59:07 -0000 1.18
@@ -910,7 +910,9 @@
filter = slapi_ch_smprintf("(&(objectclass=nsMappingTree)(!(%s=*)))",
MAPPING_TREE_PARENT_ATTRIBUTE);
} else {
- filter = slapi_ch_smprintf("(&(objectclass=nsMappingTree)(%s=\"%s\"))",
+ filter = slapi_ch_smprintf("(&(objectclass=nsMappingTree)(|(%s=\"%s\")(%s=%s)))",
+ MAPPING_TREE_PARENT_ATTRIBUTE,
+ slapi_sdn_get_dn(target->mtn_subtree),
MAPPING_TREE_PARENT_ATTRIBUTE,
slapi_sdn_get_dn(target->mtn_subtree));
}
From nhosoi at fedoraproject.org Mon Mar 9 16:35:38 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Mon, 9 Mar 2009 16:35:38 +0000 (UTC)
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd util.c,
1.28, 1.29
Message-ID: <20090309163538.13C3E70133@cvs1.fedora.phx.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26816
Modified Files:
util.c
Log Message:
Resolves: #488856
Summary: slapi_ldap_init_ext needs to be modified due to the build failure on Solaris
Description: instead of replacing client_callbacks, set sasl path to SASL_PATH
using putenv.
Index: util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- util.c 4 Feb 2009 18:21:01 -0000 1.28
+++ util.c 9 Mar 2009 16:35:35 -0000 1.29
@@ -916,23 +916,6 @@
return SASL_OK;
}
-/* copied from mozldap libldap/saslbind.c - except
- SASL_CB_GETPATH added as last item (before SASL_CB_LIST_END
- This allows us to set the sasl path used for outgoing
- client connections */
-sasl_callback_t slapd_client_callbacks[] = {
- { SASL_CB_GETOPT, slapd_sasl_fail, NULL },
- { SASL_CB_GETREALM, NULL, NULL },
- { SASL_CB_USER, NULL, NULL },
- { SASL_CB_CANON_USER, NULL, NULL },
- { SASL_CB_AUTHNAME, NULL, NULL },
- { SASL_CB_PASS, NULL, NULL },
- { SASL_CB_ECHOPROMPT, NULL, NULL },
- { SASL_CB_NOECHOPROMPT, NULL, NULL },
- { SASL_CB_GETPATH, slapd_sasl_getpluginpath, NULL },
- { SASL_CB_LIST_END, NULL, NULL }
-};
-
/*
Perform LDAP init and return an LDAP* handle. If ldapurl is given,
that is used as the basis for the protocol, host, port, and whether
@@ -947,6 +930,10 @@
filename is the ldapi file name - if this is given, and no other options
are given, ldapi is assumed.
*/
+/* util_sasl_path: the string argument for putenv.
+ It must be a global or a static */
+char util_sasl_path[MAXPATHLEN];
+
LDAP *
slapi_ldap_init_ext(
const char *ldapurl, /* full ldap url */
@@ -962,16 +949,36 @@
LDAPURLDesc *ludp = NULL;
LDAP *ld = NULL;
int rc = 0;
- extern sasl_callback_t *client_callbacks;
/* We need to provide a sasl path used for client connections, especially
if the server is not set up to be a sasl server - since mozldap provides
- no way to override the default path programatically, we replace its
- client callback list with our own so that we can provide a CB_GETPATH
- callback */
- if (client_callbacks != slapd_client_callbacks) {
- client_callbacks = slapd_client_callbacks;
+ no way to override the default path programatically, we set the sasl
+ path to the environment variable SASL_PATH. */
+ char *configpluginpath = config_get_saslpath();
+ char *pluginpath = configpluginpath;
+ char *pp = NULL;
+
+ if (NULL == pluginpath || (*pluginpath == '\0')) {
+ slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_init_ext",
+ "configpluginpath == NULL\n");
+ if (!(pluginpath = getenv("SASL_PATH"))) {
+#if defined(LINUX) && defined(__LP64__)
+ pluginpath = "/usr/lib64/sasl2";
+#else
+ pluginpath = "/usr/lib/sasl2";
+#endif
+ }
+ }
+ if ('\0' == util_sasl_path[0] || /* first time */
+ NULL == (pp = strchr(util_sasl_path, '=')) || /* invalid arg for putenv */
+ (0 != strcmp(++pp, pluginpath)) /* sasl_path has been updated */ ) {
+ PR_snprintf(util_sasl_path, sizeof(util_sasl_path),
+ "SASL_PATH=%s", pluginpath);
+ slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_init_ext",
+ "putenv(%s)\n", util_sasl_path);
+ putenv(util_sasl_path);
}
+ slapi_ch_free_string(&configpluginpath);
/* if ldapurl is given, parse it */
if (ldapurl && ((rc = ldap_url_parse_no_defaults(ldapurl, &ludp, 0)) ||
From rmeggins at fedoraproject.org Tue Mar 10 16:49:34 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 10 Mar 2009 16:49:34 +0000 (UTC)
Subject: [Fedora-directory-commits] fedora-idm-console/win unzip.vbs, NONE,
1.1 Makefile, 1.3, 1.4
Message-ID: <20090310164934.A307370132@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/fedora-idm-console/win
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29683
Modified Files:
Makefile
Added Files:
unzip.vbs
Log Message:
added unzip.vbs ; cleaned up/simplified Makefile
--- NEW FILE unzip.vbs ---
' unzip a zip file
Sub Usage()
WScript.Echo "Usage: cscript unzip.vbs \path\to\file.zip [destinationfolder]"
WScript.Echo "Example: cscript unzip.vbs ..\src\foo.zip ..\dest"
WScript.Echo "NOTE: The .zip file must have a .zip extension, so if"
WScript.Echo "it does not, a temporary copy will be made with a .zip extension"
WScript.Echo "If the destinationfolder does not exist, it will be created"
WScript.Echo "Use '.' for the current directory"
WScript.Echo "If the destinationfolder is not specified, '.' will be used"
End Sub
' see if args are correct
Set objArgs = WScript.Arguments
If objArgs.Count < 1 then
Usage
WScript.Quit(1)
End If
' get our FSO object
Set objFSO = CreateObject("Scripting.FileSystemObject")
' src zip file is arg 0
SRC = objFSO.GetAbsolutePathName(objArgs(0))
' dest folder is arg 1 or "."
If objArgs.Count < 2 then
DEST = objFSO.GetAbsolutePathName(".")
Else
DEST = objFSO.GetAbsolutePathName(objArgs(1))
End If
' debugging - print args
' For I = 0 to objArgs.Count - 1
' WScript.Echo "arg ", I, " ", objArgs(I)
' Next
' create dest folder if it does not exist
If not objFSO.FolderExists(DEST) Then
objFSO.CreateFolder(DEST)
WScript.Echo "Created new folder", DEST
End If
' see if file ends in .zip - if not (e.g. .jar) make temp copy
' that ends in .zip
Dim newSRC
newSRC = ""
If not Right(SRC, 4) = ".zip" Then
newSRC = SRC & ".zip"
objFSO.CopyFile SRC, newSRC, true
SRC = newSRC
End If
' get the shell application object used to do the unzip
Set objShell = CreateObject("Shell.Application")
Set objSrc = objShell.Namespace(SRC)
Set objDest = objShell.Namespace(DEST)
' For Each item in objSrc.Items
' WScript.Echo "item = ", item
' Next
objDest.CopyHere(objSrc.Items)
' remove temp zip, if any
If Len(newSrc) > 0 Then
objFSO.DeleteFile(newSRC)
End If
WScript.Stdout.Write "Done. Copied contents of " & SRC & " to " & DEST
' Set WshShell = WScript.CreateObject("WScript.Shell")
' WScript.Echo "CD =", WshShell.CurrentDirectory
' Set objFolder = objFSO.GetFolder(".")
' WScript.Echo "name = ", objFolder.Name
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/fedora-idm-console/win/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 3 Feb 2009 16:19:07 -0000 1.3
+++ Makefile 10 Mar 2009 16:49:31 -0000 1.4
@@ -46,8 +46,10 @@
# could also use wget or curl
DOWNLOAD="c:\program files\support tools\bitsadmin" /wrap /transfer consolebuild /download /priority normal
-SBC=http://tsunami.dsdev.sjc.redhat.com/share/builds/components
-SBV=http://tsunami.dsdev.sjc.redhat.com/share/builds/verification
+SBC=http://filer/components
+SBV=http://filer/components
+
+UNZIP=cscript //nologo unzip.vbs
NSPRVER=4.7.3
NSSVER=3_12_2
@@ -57,98 +59,101 @@
JSSVERDIR=JSS_$(JSSVER)_RTM/20090122.1
IDMVER=1.1
IDMVERDIR=$(IDMVER)/20090122.1
+WIXVER=2.0.5805.0
PLAT=WINNT5.0_OPT.OBJ
-PKGDIR="$(BASEDIR)\fedora-idm-console\win\build.$(PLAT)"
+# where to stage the package layout
+PKGDIR=build.$(PLAT)
+# where to find components to package
+COMPDIR=$(PKGDIR)
-#BASEDIR=E:\cygwin\home\rich
# where to find nspr dlls
-NSPRLIBDIR="$(BASEDIR)\nspr-4.7.3\lib"
+NSPRDIR=$(COMPDIR)\nspr
+NSPRLIBDIR=$(NSPRDIR)\lib
# where to find nss dlls
-NSSLIBDIR="$(BASEDIR)\nss-3.12.2\lib"
+NSSDIR=$(COMPDIR)\nss
+NSSLIBDIR=$(NSSDIR)\lib
# where to find nss exes
-NSSBINDIR="$(BASEDIR)\nss-3.12.2\bin"
+NSSBINDIR=$(NSSDIR)\bin
# where to find jss jar and dll
-JSSDIR="$(BASEDIR)\jss-4.2.5"
+JSSDIR=$(COMPDIR)\jss
# where to find the ldapjdk.jar
-LDAPDIR="$(BASEDIR)\console"
-#LDAPDIR=$(BASEDIR)\ldapjdk-4.18
+LDAPDIR=$(COMPDIR)\console
+#LDAPDIR=$(COMPDIR)\ldapjdk-4.18
# where to find the idm-console-framework jars
-IDMDIR="$(BASEDIR)\console"
+IDMDIR=$(COMPDIR)\console
# where to find the fedora-idm-console jar and other files
FEDORACONSOLEDIR=.
-WIXDIR="$(BASEDIR)\wix"
-CANDLE=$(WIXDIR)\candle
-LIGHT=$(WIXDIR)\light
+WIXURL=$(SBC)/wix
+WIXDIR=$(COMPDIR)\wix
+CANDLE=$(WIXDIR)\candle.exe
+LIGHT=$(WIXDIR)\light.exe
-ALL : $(BRAND_PKGNAME).msi
+ALL : $(PKGDIR)\$(BRAND_PKGNAME).msi
$(PKGDIR) :
mkdir $@
mkdir $@\Bitmaps
-LAYOUT : $(PKGDIR)
-# copy /Y $(NSPRLIBDIR)\*.dll $(PKGDIR)
-# copy /Y $(NSSLIBDIR)\*.dll $(PKGDIR)
-# copy /Y $(NSSBINDIR)\certutil.exe $(PKGDIR)
-# copy /Y $(NSSBINDIR)\pk12util.exe $(PKGDIR)
-# copy /Y $(JSSDIR)\jss4.jar $(PKGDIR)
-# copy /Y $(JSSDIR)\jss4.dll $(PKGDIR)
-# copy /Y $(LDAPDIR)\ldapjdk.jar $(PKGDIR)
-# copy /Y $(IDMDIR)\*.jar $(PKGDIR)
+$(NSPRDIR) $(NSSDIR) $(JSSDIR) $(LDAPDIR) $(IDMDIR) $(FEDORACONSOLEDIR) $(WIXDIR):
+ mkdir $@
+
+$(NSPRDIR)\mdbinary.jar : $(NSPRDIR)
+ if not exist $@ $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/$(@F) %%CD%%\$@
+
+$(NSPRLIBDIR)\libnspr4.dll : $(NSPRDIR)\mdbinary.jar
+ $(UNZIP) $? $(?D)
+
+$(NSSDIR)\mdbinary.jar : $(NSSDIR)
+ if not exist $@ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/$(@F) %%CD%%\$@
+
+$(NSSLIBDIR)\nss3.dll : $(NSSDIR)\mdbinary.jar
+ $(UNZIP) $? $(?D)
+
+$(JSSDIR)\jss4.dll : $(JSSDIR)
+ if not exist $@ $(DOWNLOAD) $(SBV)/jss/$(JSSVERDIR)/$(PLAT)/lib/$(@F) %%CD%%\$@
+
+$(JSSDIR)\jss4.jar :
+ if not exist $@ $(DOWNLOAD) $(SBV)/jss/$(JSSVERDIR)/$(@F) %%CD%%\$@
+
+$(LDAPDIR)\ldapjdk.jar : $(LDAPDIR)
+ if not exist $@ $(DOWNLOAD) $(SBV)/ldapjdk/$(LDAPJDKVERDIR)/$(@F) %%CD%%\$@
+
+$(IDMDIR)\idm-console-base.jar $(IDMDIR)\idm-console-mcc.jar $(IDMDIR)\idm-console-mcc_en.jar $(IDMDIR)\idm-console-nmclf.jar $(IDMDIR)\idm-console-nmclf_en.jar : $(IDMDIR)
+ if not exist $@ $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/$(@F) %%CD%%\$@
+
+$(FEDORACONSOLEDIR)\fedora-idm-console_en.jar : $(FEDORACONSOLEDIR)
+ echo where is $@
+
+$(WIXDIR)\wix-$(WIXVER).zip : $(WIXDIR)
+ if not exist $@ $(DOWNLOAD) $(WIXURL)/$(@F) %%CD%%\$@
+
+$(CANDLE) : $(WIXDIR)\wix-$(WIXVER).zip
+ $(UNZIP) $? $(?D)
+
+LAYOUT : $(PKGDIR) $(NSPRLIBDIR)\libnspr4.dll $(NSSLIBDIR)\nss3.dll $(JSSDIR)\jss4.dll $(JSSDIR)\jss4.jar $(LDAPDIR)\ldapjdk.jar $(IDMDIR)\idm-console-base.jar $(IDMDIR)\idm-console-mcc.jar $(IDMDIR)\idm-console-mcc_en.jar $(IDMDIR)\idm-console-nmclf.jar $(IDMDIR)\idm-console-nmclf_en.jar $(FEDORACONSOLEDIR)\fedora-idm-console_en.jar
+ copy /Y $(NSPRLIBDIR)\*.dll $(PKGDIR)
+ copy /Y $(NSSLIBDIR)\*.dll $(PKGDIR)
+ copy /Y $(NSSBINDIR)\certutil.exe $(PKGDIR)
+ copy /Y $(NSSBINDIR)\pk12util.exe $(PKGDIR)
+ copy /Y $(JSSDIR)\jss4.jar $(PKGDIR)
+ copy /Y $(JSSDIR)\jss4.dll $(PKGDIR)
+ copy /Y $(LDAPDIR)\ldapjdk.jar $(PKGDIR)
+ copy /Y $(IDMDIR)\*.jar $(PKGDIR)
copy /Y $(FEDORACONSOLEDIR)\*.jar $(PKGDIR)
# directory should already contain the bat file, icon, and bitmaps
- copy /Y $(FEDORACONSOLEDIR)\*.bat $(PKGDIR)
- copy /Y $(FEDORACONSOLEDIR)\*.ico $(PKGDIR)
- copy /Y $(FEDORACONSOLEDIR)\Bitmaps\* $(PKGDIR)\Bitmaps\*
- copy /Y $(FEDORACONSOLEDIR)\License.rtf $(PKGDIR)
-
-DOWNLOAD : $(PKGDIR)
-# NSPR
- $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/lib/libnspr4.dll $(PKGDIR)/libnspr4.dll
- $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/lib/libplc4.dll $(PKGDIR)/libplc4.dll
- $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/lib/libplds4.dll $(PKGDIR)/libplds4.dll
-# NSS
- $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/nss3.dll $(PKGDIR)/nss3.dll
- $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/ssl3.dll $(PKGDIR)/ssl3.dll
- $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/smime3.dll $(PKGDIR)/smime3.dll
- $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/nssutil3.dll $(PKGDIR)/nssutil3.dll
- $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/freebl3.dll $(PKGDIR)/freebl3.dll
- $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/softokn3.dll $(PKGDIR)/softokn3.dll
- $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/sqlite3.dll $(PKGDIR)/sqlite3.dll
- $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/nssdbm3.dll $(PKGDIR)/nssdbm3.dll
- $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/nssckbi.dll $(PKGDIR)/nssckbi.dll
- $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/bin/certutil.exe $(PKGDIR)/certutil.exe
- $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/bin/pk12util.exe $(PKGDIR)/pk12util.exe
- $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/bin/certutil.exe $(PKGDIR)/certutil.exe
-# JSS
- $(DOWNLOAD) $(SBV)/jss/$(JSSVERDIR)/$(PLAT)/lib/jss4.dll $(PKGDIR)/jss4.dll
- $(DOWNLOAD) $(SBV)/jss/$(JSSVERDIR)/jss4.jar $(PKGDIR)/jss4.jar
-# LDAPJDK
- $(DOWNLOAD) $(SBV)/ldapjdk/$(LDAPJDKVERDIR)/ldapjdk.jar $(PKGDIR)/ldapjdk.jar
-# IDM
- $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-base.jar $(PKGDIR)/idm-console-base.jar
- $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-mcc.jar $(PKGDIR)/idm-console-mcc.jar
- $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-mcc_en.jar $(PKGDIR)/idm-console-mcc_en.jar
- $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-nmclf.jar $(PKGDIR)/idm-console-nmclf.jar
- $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-nmclf_en.jar $(PKGDIR)/idm-console-nmclf_en.jar
-
-#$(PKGNAME).msi : LAYOUT DOWNLOAD
-$(PKGNAME).msi :
- cd $(PKGDIR)
- cd
- dir ..\$(PKGNAME).wxs
- $(CANDLE) ..\$(PKGNAME).wxs
- $(LIGHT) -out $(PKGNAME).msi $(PKGNAME).wixobj $(WIXDIR)\wixui.wixlib -loc $(WIXDIR)\WixUI_en-us.wxl
-
-$(BRAND_PKGNAME).msi: $(PKGNAME).msi
- cd $(PKGDIR)
- del /F /Q $(BRAND_PKGNAME).msi
- rename $(PKGNAME).msi $(BRAND_PKGNAME).msi
+ copy /Y *.bat $(PKGDIR)
+ copy /Y *.ico $(PKGDIR)
+ copy /Y Bitmaps\* $(PKGDIR)\Bitmaps\*
+ copy /Y License.rtf $(PKGDIR)
+
+$(PKGDIR)\$(BRAND_PKGNAME).msi : $(PKGDIR) LAYOUT $(CANDLE) $(PKGNAME).wxs
+ $(CANDLE) -nologo -out $(PKGDIR)\$(PKGNAME).wixobj $(PKGNAME).wxs
+ $(LIGHT) -nologo -out $@ -b $(PKGDIR) $(PKGDIR)\$(PKGNAME).wixobj $(WIXDIR)\wixui.wixlib -loc $(WIXDIR)\WixUI_en-us.wxl
clean:
- del /F /Q $(PKGDIR)
+ rmdir /S /Q $(PKGDIR)
help:
@echo You must define the following paths:
From nhosoi at fedoraproject.org Tue Mar 10 16:55:22 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Tue, 10 Mar 2009 16:55:22 +0000 (UTC)
Subject: [Fedora-directory-commits] ldapserver Makefile.in, 1.104,
1.105 aclocal.m4, 1.80, 1.81 configure, 1.100,
1.101 configure.ac, 1.57, 1.58 ltmain.sh, 1.31, 1.32
Message-ID: <20090310165523.26D7E70132@cvs1.fedora.phx.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30996
Modified Files:
Makefile.in aclocal.m4 configure configure.ac ltmain.sh
Log Message:
Resolves: #476096
Summary: move perl on solaris to a path
Description: Changing Solaris perl path (perlexec) from /opt/perl5x/bin/perl to /usr/lib/sparcv9/dirsrv/perl5x/bin/perl.
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- Makefile.in 13 Feb 2009 20:05:55 -0000 1.104
+++ Makefile.in 10 Mar 2009 16:55:13 -0000 1.105
@@ -935,6 +935,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOLARIS_FALSE = @SOLARIS_FALSE@
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- aclocal.m4 13 Feb 2009 20:05:57 -0000 1.80
+++ aclocal.m4 10 Mar 2009 16:55:17 -0000 1.81
@@ -1578,10 +1578,27 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4288,6 +4305,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4421,11 +4441,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4437,7 +4457,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4517,7 +4537,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6353,6 +6373,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6385,6 +6406,7 @@
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- configure 13 Feb 2009 20:05:58 -0000 1.100
+++ configure 10 Mar 2009 16:55:17 -0000 1.101
@@ -465,7 +465,7 @@
#endif"
ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct
_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_autobind_TRUE enable_autobind_FALSE enable_auto_dn_suffix_TRUE enable_auto_dn_suffix_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG KRB5_CONFIG_BIN kerberos_inc kerberos_lib kerberos_libdir PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc
svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS SED EGREP LN_S ECHO AR ac_ct_AR RANLIB a
c_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_autobind_TRUE enable_autobind_FALSE enable_auto_dn_suffix_TRUE enable_auto_dn_suffix_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG KRB5_CONFIG_BIN kerberos_inc kerberos_lib kerberos_libdir PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore
_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -3876,6 +3876,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3910,6 +3911,7 @@
fi
SED=$lt_cv_path_SED
+
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -4350,7 +4352,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4353 "configure"' > conftest.$ac_ext
+ echo '#line 4355 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5485,7 +5487,7 @@
# Provide some information about the compiler.
-echo "$as_me:5488:" \
+echo "$as_me:5490:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6548,11 +6550,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6551: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6553: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6555: \$? = $ac_status" >&5
+ echo "$as_me:6557: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6816,11 +6818,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6819: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6821: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6823: \$? = $ac_status" >&5
+ echo "$as_me:6825: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6920,11 +6922,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6923: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6925: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6927: \$? = $ac_status" >&5
+ echo "$as_me:6929: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8385,10 +8387,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 8394 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9265,7 +9288,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11734: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11712: \$? = $ac_status" >&5
+ echo "$as_me:11738: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11809,11 +11835,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11812: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11838: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11816: \$? = $ac_status" >&5
+ echo "$as_me:11842: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12341,10 +12367,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 12374 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12728,6 +12775,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12861,11 +12911,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_CXX
+predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_CXX
+postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12877,7 +12927,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12957,7 +13007,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13379,11 +13429,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13382: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13432: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13386: \$? = $ac_status" >&5
+ echo "$as_me:13436: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13483,11 +13533,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13486: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13536: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13490: \$? = $ac_status" >&5
+ echo "$as_me:13540: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14928,10 +14978,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 14985 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15315,6 +15386,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15448,11 +15522,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_F77
+predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_F77
+postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15464,7 +15538,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15544,7 +15618,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15686,11 +15760,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15689: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15763: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15693: \$? = $ac_status" >&5
+ echo "$as_me:15767: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15954,11 +16028,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15957: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16031: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15961: \$? = $ac_status" >&5
+ echo "$as_me:16035: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16058,11 +16132,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16061: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16135: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16065: \$? = $ac_status" >&5
+ echo "$as_me:16139: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17523,10 +17597,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 17604 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17910,6 +18005,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18043,11 +18141,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_GCJ
+predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
+postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18059,7 +18157,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18139,7 +18237,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18391,6 +18489,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18524,11 +18625,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_RC
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_RC
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18540,7 +18641,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18620,7 +18721,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23729,7 +23830,7 @@
platform="solaris"
# assume 64 bit
- perlexec='/opt/perl5x/bin/perl'
+ perlexec='/usr/lib/sparcv9/dirsrv/perl5x/bin/perl'
# relative to sysconfdir
initdir=/init.d
;;
@@ -27082,6 +27183,7 @@
s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
s, at CCAS@,$CCAS,;t t
s, at CCASFLAGS@,$CCASFLAGS,;t t
+s, at SED@,$SED,;t t
s, at EGREP@,$EGREP,;t t
s, at LN_S@,$LN_S,;t t
s, at ECHO@,$ECHO,;t t
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- configure.ac 4 Nov 2008 18:23:06 -0000 1.57
+++ configure.ac 10 Mar 2009 16:55:20 -0000 1.58
@@ -388,7 +388,7 @@
AC_SUBST([LIBCRUN], [$LIBCRUN])
platform="solaris"
# assume 64 bit
- perlexec='/opt/perl5x/bin/perl'
+ perlexec='/usr/lib/sparcv9/dirsrv/perl5x/bin/perl'
# relative to sysconfdir
initdir=/init.d
;;
Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ltmain.sh 13 Feb 2009 20:05:58 -0000 1.31
+++ ltmain.sh 10 Mar 2009 16:55:20 -0000 1.32
@@ -46,10 +46,16 @@
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
# Check that we have a working $echo.
@@ -105,12 +111,14 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
+ $lt_var=C
+ export $lt_var
+ fi"
+done
# Make sure IFS has a sensible default
lt_nl='
@@ -136,6 +144,8 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
#####################################
# Shell function definitions:
@@ -327,7 +337,17 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xdir="$my_gentop/$my_xlib"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ extracted_serial=`expr $extracted_serial + 1`
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
*.f90) xform=f90 ;;
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
for arg
do
case $arg in
- -all-static | -static)
- if test "X$arg" = "X-all-static"; then
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@@ -1147,12 +1169,20 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
- else
+ ;;
+ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
- fi
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
build_libtool_libs=no
build_old_libs=yes
break
@@ -1712,7 +1742,7 @@
continue
;;
- -static)
+ -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows)
+ darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@@ -3410,11 +3442,11 @@
fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- done
+# for path in $notinst_path; do
+# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+# done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+ if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -3560,9 +3591,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
- $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@@ -4239,12 +4268,14 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@@ -4716,13 +4747,13 @@
# really was required.
# Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@@ -4846,7 +4877,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ \$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@@ -5581,7 +5624,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -5926,9 +5969,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
fi
# Restore saved environment variables
- if test "${save_LC_ALL+set}" = set; then
- LC_ALL="$save_LC_ALL"; export LC_ALL
- fi
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
+ else
+ $lt_unset $lt_var
+ fi"
+ done
+
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
+ try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
- try to export only the symbols matching REGEX
+ try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@@ -6791,9 +6837,11 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of libtool libraries
+ -static do not do any dynamic linking of uninstalled libtool libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
+ specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.
From nhosoi at fedoraproject.org Tue Mar 10 17:04:02 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Tue, 10 Mar 2009 17:04:02 +0000 (UTC)
Subject: [Fedora-directory-commits] adminserver Makefile.in, 1.53,
1.54 aclocal.m4, 1.46, 1.47 configure, 1.50, 1.51 configure.ac,
1.29, 1.30 ltmain.sh, 1.7, 1.8
Message-ID: <20090310170403.5033270132@cvs1.fedora.phx.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1131
Modified Files:
Makefile.in aclocal.m4 configure configure.ac ltmain.sh
Log Message:
Resolves: #476096
Summary: move perl on solaris to a path
Description: Changing Solaris perl path (perlexec) from /opt/perl5x/bin/perl to /usr/lib/sparcv9/dirsrv/perl5x/bin/perl.
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile.in 27 Feb 2009 17:34:20 -0000 1.53
+++ Makefile.in 10 Mar 2009 17:03:59 -0000 1.54
@@ -357,6 +357,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOLARIS_FALSE = @SOLARIS_FALSE@
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/adminserver/aclocal.m4,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- aclocal.m4 27 Feb 2009 17:34:20 -0000 1.46
+++ aclocal.m4 10 Mar 2009 17:03:59 -0000 1.47
@@ -1578,10 +1578,27 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4288,6 +4305,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4421,11 +4441,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4437,7 +4457,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4517,7 +4537,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6353,6 +6373,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6385,6 +6406,7 @@
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- configure 27 Feb 2009 17:34:20 -0000 1.50
+++ configure 10 Mar 2009 17:03:59 -0000 1.51
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/dirsrv
ac_subdirs_all="$ac_subdirs_all mod_admserv"
ac_subdirs_all="$ac_subdirs_all mod_restartd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX
CPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE initconfigdir HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup admlogdir piddir pidfile admservport admservip ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP
CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE initconfigdir HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup admlogdir piddir pidfile admservport admservip ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -3839,6 +3839,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3873,6 +3874,7 @@
fi
SED=$lt_cv_path_SED
+
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -4313,7 +4315,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4316 "configure"' > conftest.$ac_ext
+ echo '#line 4318 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5448,7 +5450,7 @@
# Provide some information about the compiler.
-echo "$as_me:5451:" \
+echo "$as_me:5453:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6511,11 +6513,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6514: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6516: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6518: \$? = $ac_status" >&5
+ echo "$as_me:6520: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6779,11 +6781,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6782: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6784: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6786: \$? = $ac_status" >&5
+ echo "$as_me:6788: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6883,11 +6885,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6886: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6888: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6890: \$? = $ac_status" >&5
+ echo "$as_me:6892: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8348,10 +8350,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 8357 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9228,7 +9251,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11697: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11675: \$? = $ac_status" >&5
+ echo "$as_me:11701: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11772,11 +11798,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11775: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11801: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11779: \$? = $ac_status" >&5
+ echo "$as_me:11805: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12304,10 +12330,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 12337 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12691,6 +12738,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12824,11 +12874,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_CXX
+predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_CXX
+postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12840,7 +12890,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12920,7 +12970,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13342,11 +13392,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13345: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13395: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13349: \$? = $ac_status" >&5
+ echo "$as_me:13399: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13446,11 +13496,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13449: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13499: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13453: \$? = $ac_status" >&5
+ echo "$as_me:13503: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14891,10 +14941,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 14948 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15278,6 +15349,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15411,11 +15485,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_F77
+predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_F77
+postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15427,7 +15501,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15507,7 +15581,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15649,11 +15723,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15652: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15726: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15656: \$? = $ac_status" >&5
+ echo "$as_me:15730: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15917,11 +15991,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15920: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15994: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15924: \$? = $ac_status" >&5
+ echo "$as_me:15998: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16021,11 +16095,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16024: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16098: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16028: \$? = $ac_status" >&5
+ echo "$as_me:16102: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17486,10 +17560,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 17567 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17873,6 +17968,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18006,11 +18104,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_GCJ
+predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
+postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18022,7 +18120,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18102,7 +18200,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18354,6 +18452,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18487,11 +18588,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_RC
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_RC
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18503,7 +18604,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18583,7 +18684,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23144,7 +23245,7 @@
CXXLINK_REQUIRED=1
platform="solaris"
# assume 64 bit
- perlexec='/opt/perl5x/bin/perl'
+ perlexec='/usr/lib/sparcv9/dirsrv/perl5x/bin/perl'
# relative to sysconfdir
initdir=/init.d
;;
@@ -25830,6 +25931,7 @@
s, at CCDEPMODE@,$CCDEPMODE,;t t
s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s, at SED@,$SED,;t t
s, at EGREP@,$EGREP,;t t
s, at LN_S@,$LN_S,;t t
s, at ECHO@,$ECHO,;t t
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- configure.ac 29 Jan 2009 21:33:11 -0000 1.29
+++ configure.ac 10 Mar 2009 17:04:00 -0000 1.30
@@ -187,7 +187,7 @@
CXXLINK_REQUIRED=1
platform="solaris"
# assume 64 bit
- perlexec='/opt/perl5x/bin/perl'
+ perlexec='/usr/lib/sparcv9/dirsrv/perl5x/bin/perl'
# relative to sysconfdir
initdir=/init.d
;;
Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/adminserver/ltmain.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ltmain.sh 5 Sep 2007 16:45:58 -0000 1.7
+++ ltmain.sh 10 Mar 2009 17:04:00 -0000 1.8
@@ -46,10 +46,16 @@
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
# Check that we have a working $echo.
@@ -105,12 +111,14 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
+ $lt_var=C
+ export $lt_var
+ fi"
+done
# Make sure IFS has a sensible default
lt_nl='
@@ -136,6 +144,8 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
#####################################
# Shell function definitions:
@@ -327,7 +337,17 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xdir="$my_gentop/$my_xlib"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ extracted_serial=`expr $extracted_serial + 1`
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
*.f90) xform=f90 ;;
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
for arg
do
case $arg in
- -all-static | -static)
- if test "X$arg" = "X-all-static"; then
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@@ -1147,12 +1169,20 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
- else
+ ;;
+ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
- fi
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
build_libtool_libs=no
build_old_libs=yes
break
@@ -1712,7 +1742,7 @@
continue
;;
- -static)
+ -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows)
+ darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@@ -3410,11 +3442,11 @@
fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- done
+# for path in $notinst_path; do
+# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+# done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+ if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -3560,9 +3591,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
- $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@@ -4239,12 +4268,14 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@@ -4716,13 +4747,13 @@
# really was required.
# Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@@ -4846,7 +4877,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ \$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@@ -5581,7 +5624,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -5926,9 +5969,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
fi
# Restore saved environment variables
- if test "${save_LC_ALL+set}" = set; then
- LC_ALL="$save_LC_ALL"; export LC_ALL
- fi
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
+ else
+ $lt_unset $lt_var
+ fi"
+ done
+
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
+ try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
- try to export only the symbols matching REGEX
+ try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@@ -6791,9 +6837,11 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of libtool libraries
+ -static do not do any dynamic linking of uninstalled libtool libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
+ specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.
From rmeggins at fedoraproject.org Tue Mar 10 20:06:31 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 10 Mar 2009 20:06:31 +0000 (UTC)
Subject: [Fedora-directory-commits] winsync/passwordsync build.bat, 1.11,
1.12 unzip.vbs, 1.1, 1.2
Message-ID: <20090310200631.DDF6770132@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/winsync/passwordsync
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20568
Modified Files:
build.bat unzip.vbs
Log Message:
remove internal paths ; use new improved unzip.vbs
Index: build.bat
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/build.bat,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.bat 16 Feb 2009 22:37:32 -0000 1.11
+++ build.bat 10 Mar 2009 20:06:27 -0000 1.12
@@ -82,8 +82,8 @@
rem ======== Fetch Components ========
if [%INTERNAL_BUILD%] == [1] (
- set COMPONENT_URL=http://tsunami.dsdev.sjc.redhat.com/share/builds/components
- set COMPONENT_URL2=http://tsunami.dsdev.sjc.redhat.com/share/builds/verification
+ set COMPONENT_URL=%SBC%
+ set COMPONENT_URL2=%SBV%
) else (
set COMPONENT_URL=http://directory.fedoraproject.org/built/components
)
@@ -97,12 +97,9 @@
echo %NSPR_LOCATION%/%FLAVOR% > version.txt
%DOWNLOAD% %NSPR_LOCATION%/%FLAVOR%/mdbinary.jar "%LIBROOT%\nspr\mdbinary.jar"
%DOWNLOAD% %NSPR_LOCATION%/%FLAVOR%/mdheader.jar "%LIBROOT%\nspr\mdheader.jar"
-
- ren mdbinary.jar mdbinary.zip
- ren mdheader.jar mdheader.zip
- %UNZIP% mdbinary.zip
+ %UNZIP% mdbinary.jar
cd include
- %UNZIP% ..\mdheader.zip
+ %UNZIP% ..\mdheader.jar
popd
)
@@ -115,11 +112,9 @@
echo %NSS_LOCATION%/%FLAVOR% > version.txt
%DOWNLOAD% %NSS_LOCATION%/%FLAVOR%/mdbinary.jar "%LIBROOT%\nss\mdbinary.jar"
%DOWNLOAD% %NSS_LOCATION%/include/xpheader.jar "%LIBROOT%\nss\xpheader.jar"
- ren mdbinary.jar mdbinary.zip
- ren xpheader.jar xpheader.zip
- %UNZIP% mdbinary.zip
+ %UNZIP% mdbinary.jar
cd include
- %UNZIP% ..\xpheader.zip
+ %UNZIP% ..\xpheader.jar
popd
)
Index: unzip.vbs
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/unzip.vbs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unzip.vbs 16 Feb 2009 22:37:32 -0000 1.1
+++ unzip.vbs 10 Mar 2009 20:06:27 -0000 1.2
@@ -4,8 +4,7 @@
WScript.Echo "Usage: cscript unzip.vbs \path\to\file.zip [destinationfolder]"
WScript.Echo "Example: cscript unzip.vbs ..\src\foo.zip ..\dest"
WScript.Echo "NOTE: The .zip file must have a .zip extension, so if"
- WScript.Echo "you are trying to unzip a .jar file, you must copy or rename it"
- WScript.Echo "to have a .zip extension"
+ WScript.Echo "it does not, a temporary copy will be made with a .zip extension"
WScript.Echo "If the destinationfolder does not exist, it will be created"
WScript.Echo "Use '.' for the current directory"
WScript.Echo "If the destinationfolder is not specified, '.' will be used"
@@ -39,6 +38,17 @@
WScript.Echo "Created new folder", DEST
End If
+' see if file ends in .zip - if not (e.g. .jar) make temp copy
+' that ends in .zip
+Dim newSRC
+newSRC = ""
+If not Right(SRC, 4) = ".zip" Then
+ newSRC = SRC & ".zip"
+ objFSO.CopyFile SRC, newSRC, true
+ SRC = newSRC
+End If
+
+' get the shell application object used to do the unzip
Set objShell = CreateObject("Shell.Application")
Set objSrc = objShell.Namespace(SRC)
Set objDest = objShell.Namespace(DEST)
@@ -47,7 +57,12 @@
' Next
objDest.CopyHere(objSrc.Items)
-WScript.Echo "Done. Copied contents of " & SRC & " to " & DEST
+' remove temp zip, if any
+If Len(newSrc) > 0 Then
+ objFSO.DeleteFile(newSRC)
+End If
+
+WScript.Stdout.Write "Done. Copied contents of " & SRC & " to " & DEST
' Set WshShell = WScript.CreateObject("WScript.Shell")
' WScript.Echo "CD =", WshShell.CurrentDirectory
From rmeggins at fedoraproject.org Wed Mar 11 13:41:16 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 11 Mar 2009 13:41:16 +0000 (UTC)
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication
repl5_connection.c, 1.15, 1.16 repl5_inc_protocol.c, 1.15, 1.16
Message-ID: <20090311134116.3583170132@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26204/ldapserver/ldap/servers/plugins/replication
Modified Files:
repl5_connection.c repl5_inc_protocol.c
Log Message:
Resolves: bug 488866
Bug Description: crash in reliab15 test
Reviewed by: nkinder (Thanks!)
Fix Description: My earlier fix was for the case where the result reader thread disconnects. But it looks like there is still a problem if the update sender thread disconnects out from under the reader thread. We need to use conn_connected() to test to see if the connection is connected before we attempt to access conn->ld in the result reader thread. I also improved the error messages so that I could tell if the errors were coming from the update sender thread or the result reader thread.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: repl5_connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_connection.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- repl5_connection.c 5 Dec 2008 22:41:51 -0000 1.15
+++ repl5_connection.c 11 Mar 2009 13:41:13 -0000 1.16
@@ -306,6 +306,11 @@
while (1)
{
+ if (!conn_connected(conn)) {
+ rc = -1;
+ return_value = CONN_NOT_CONNECTED;
+ break;
+ }
rc = ldap_result(conn->ld, LDAP_RES_ANY , 1, &local_timeout, &res);
if (0 != rc)
{
@@ -344,11 +349,20 @@
conn->last_ldap_error = LDAP_TIMEOUT;
return_value = CONN_TIMEOUT;
}
+ else if ((-1 == rc) && (CONN_NOT_CONNECTED == return_value))
+ {
+ /* must not access conn->ld if disconnected in another thread */
+ /* the other thread that actually did the conn_disconnect() */
+ /* will set the status and error info */
+ slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
+ "%s: Connection disconnected by another thread\n",
+ agmt_get_long_name(conn->agmt));
+ }
else if (-1 == rc)
{
/* Error */
char *s = NULL;
-
+
rc = ldap_get_lderrno(conn->ld, NULL, &s);
conn->last_ldap_errmsg = s;
conn->last_ldap_error = rc;
Index: repl5_inc_protocol.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_inc_protocol.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- repl5_inc_protocol.c 6 Mar 2009 20:02:13 -0000 1.15
+++ repl5_inc_protocol.c 11 Mar 2009 13:41:13 -0000 1.16
@@ -1798,7 +1798,7 @@
agmt_inc_last_update_changecount (prp->agmt, csn_get_replicaid(entry.op->csn), 1 /*skipped*/);
}
slapi_log_error(finished ? SLAPI_LOG_FATAL : slapi_log_urp, repl_plugin_name,
- "%s: Consumer failed to replay change (uniqueid %s, CSN %s): %s. %s.\n",
+ "%s: Failed to send update operation to consumer (uniqueid %s, CSN %s): %s. %s.\n",
agmt_get_long_name(prp->agmt),
entry.op->target_address.uniqueid, csn_str,
ldap_err2string(error),
@@ -1811,7 +1811,7 @@
return_value = UPDATE_CONNECTION_LOST;
finished = 1;
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "%s: Consumer failed to replay change (uniqueid %s, CSN %s): "
+ "%s: Failed to send update operation to consumer (uniqueid %s, CSN %s): "
"%s. Will retry later.\n",
agmt_get_long_name(prp->agmt),
entry.op->target_address.uniqueid, csn_str,
@@ -1822,7 +1822,7 @@
return_value = UPDATE_TIMEOUT;
finished = 1;
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "%s: Consumer timed out to replay change (uniqueid %s, CSN %s): "
+ "%s: Timed out sending update operation to consumer (uniqueid %s, CSN %s): "
"%s.\n",
agmt_get_long_name(prp->agmt),
entry.op->target_address.uniqueid, csn_str,
@@ -1837,7 +1837,7 @@
return_value = UPDATE_TRANSIENT_ERROR;
finished = 1;
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "%s: Failed to replay change (uniqueid %s, CSN %s): "
+ "%s: Failed to send update operation to consumer (uniqueid %s, CSN %s): "
"Local error. Will retry later.\n",
agmt_get_long_name(prp->agmt),
entry.op->target_address.uniqueid, csn_str);
From rmeggins at fedoraproject.org Wed Mar 11 23:08:30 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 11 Mar 2009 23:08:30 +0000 (UTC)
Subject: [Fedora-directory-commits] fedora-idm-console/win Makefile,1.4,1.5
Message-ID: <20090311230830.E83BF70132@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/fedora-idm-console/win
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32509/win
Modified Files:
Makefile
Log Message:
update idm console version to 20090310
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/fedora-idm-console/win/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile 10 Mar 2009 16:49:31 -0000 1.4
+++ Makefile 11 Mar 2009 23:08:27 -0000 1.5
@@ -58,7 +58,7 @@
JSSVER=4_2_5
JSSVERDIR=JSS_$(JSSVER)_RTM/20090122.1
IDMVER=1.1
-IDMVERDIR=$(IDMVER)/20090122.1
+IDMVERDIR=$(IDMVER)/200900310.1
WIXVER=2.0.5805.0
PLAT=WINNT5.0_OPT.OBJ
From rmeggins at fedoraproject.org Thu Mar 12 02:16:45 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 12 Mar 2009 02:16:45 +0000 (UTC)
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication
repl5_connection.c, 1.16, 1.17 repl5_tot_protocol.c, 1.10, 1.11
Message-ID: <20090312021645.90B8070132@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27916/ldapserver/ldap/servers/plugins/replication
Modified Files:
repl5_connection.c repl5_tot_protocol.c
Log Message:
Resolves: bug 488866
Bug Description: crash in reliab15 test
Reviewed by: nkinder (Thanks!)
Fix Description: There was still a small window of time during which the connection could be closed out from under the other thread which was sending/reading result. The solution is to use explicit locking using the conn->lock to protect access to the conn->ld. Since this also affected the total update code, I tested it under similar conditions, and found that it exhibited the same behavior. I added checking to the total update code to check for disconnection and coordinate access in the entry sending/result reading threads.
I also fixed a spurious error message about the sasl path.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: repl5_connection.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_connection.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- repl5_connection.c 11 Mar 2009 13:41:13 -0000 1.16
+++ repl5_connection.c 12 Mar 2009 02:16:42 -0000 1.17
@@ -306,12 +306,20 @@
while (1)
{
- if (!conn_connected(conn)) {
+ /* we have to make sure the update sending thread does not
+ attempt to call conn_disconnect while we are reading
+ results - so lock the conn while we get the results */
+ PR_Lock(conn->lock);
+ if ((STATE_CONNECTED != conn->state) || !conn->ld) {
rc = -1;
return_value = CONN_NOT_CONNECTED;
+ PR_Unlock(conn->lock);
break;
}
+
rc = ldap_result(conn->ld, LDAP_RES_ANY , 1, &local_timeout, &res);
+ PR_Unlock(conn->lock);
+
if (0 != rc)
{
/* Something other than a timeout happened */
@@ -342,6 +350,18 @@
repl5_stop_debug_timeout(eqctx, &setlevel);
+ PR_Lock(conn->lock);
+ /* we have to check again since the connection may have
+ been closed in the meantime
+ acquire the lock for the rest of the function
+ to protect against another attempt to close
+ the conn while we are using it
+ */
+ if ((STATE_CONNECTED != conn->state) || !conn->ld) {
+ rc = -1;
+ return_value = CONN_NOT_CONNECTED;
+ }
+
if (0 == rc)
{
/* Timeout */
@@ -370,7 +390,7 @@
later */
if (IS_DISCONNECT_ERROR(rc))
{
- conn_disconnect(conn);
+ close_connection_internal(conn); /* we already have the lock */
return_value = CONN_NOT_CONNECTED;
}
else
@@ -397,13 +417,13 @@
if (IS_DISCONNECT_ERROR(rc))
{
conn->last_ldap_error = rc;
- conn_disconnect(conn);
+ close_connection_internal(conn); /* we already have the lock */
return_value = CONN_NOT_CONNECTED;
}
else if (IS_DISCONNECT_ERROR(err))
{
conn->last_ldap_error = err;
- conn_disconnect(conn);
+ close_connection_internal(conn); /* we already have the lock */
return_value = CONN_NOT_CONNECTED;
}
/* Got a result */
@@ -450,6 +470,7 @@
conn->status = STATUS_CONNECTED;
}
if (res) ldap_msgfree(res);
+ PR_Unlock(conn->lock); /* release the conn lock */
return return_value;
}
@@ -565,7 +586,10 @@
server_controls[1] = update_control;
server_controls[2] = NULL;
- if (conn_connected(conn))
+ /* lock the conn to prevent the result reader thread
+ from closing the connection out from under us */
+ PR_Lock(conn->lock);
+ if (STATE_CONNECTED == conn->state)
{
int setlevel = 0;
@@ -574,6 +598,7 @@
return_value = see_if_write_available(
conn, PR_SecondsToInterval(conn->timeout.tv_sec));
if (return_value != CONN_OPERATION_SUCCESS) {
+ PR_Unlock(conn->lock);
return return_value;
}
conn->last_operation = optype;
@@ -627,7 +652,7 @@
conn->last_ldap_error = rc;
if (IS_DISCONNECT_ERROR(rc))
{
- conn_disconnect(conn);
+ close_connection_internal(conn); /* already have the lock */
return_value = CONN_NOT_CONNECTED;
}
else
@@ -640,11 +665,12 @@
else
{
/* conn->last_ldap_error has been set to a more specific value
- * in conn_connected()
+ * in the thread that did the disconnection
* conn->last_ldap_error = LDAP_SERVER_DOWN;
*/
return_value = CONN_NOT_CONNECTED;
}
+ PR_Unlock(conn->lock); /* release the lock */
if (message_id)
{
*message_id = msgid;
@@ -1073,6 +1099,13 @@
static void
close_connection_internal(Repl_Connection *conn)
{
+ conn->state = STATE_DISCONNECTED;
+ conn->status = STATUS_DISCONNECTED;
+ conn->supports_ds50_repl = -1;
+ conn->supports_ds71_repl = -1;
+ /* do this last, to minimize the chance that another thread
+ might read conn->state as not disconnected and attempt
+ to use conn->ld */
if (NULL != conn->ld)
{
/* Since we call slapi_ldap_init,
@@ -1080,10 +1113,6 @@
slapi_ldap_unbind(conn->ld);
}
conn->ld = NULL;
- conn->state = STATE_DISCONNECTED;
- conn->status = STATUS_DISCONNECTED;
- conn->supports_ds50_repl = -1;
- conn->supports_ds71_repl = -1;
slapi_log_error(SLAPI_LOG_REPL, repl_plugin_name,
"%s: Disconnected from the consumer\n", agmt_get_long_name(conn->agmt));
}
Index: repl5_tot_protocol.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_tot_protocol.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- repl5_tot_protocol.c 5 Dec 2008 22:41:52 -0000 1.10
+++ repl5_tot_protocol.c 12 Mar 2009 02:16:42 -0000 1.11
@@ -95,6 +95,7 @@
static int send_entry (Slapi_Entry *e, void *callback_data);
static void repl5_tot_delete(Private_Repl_Protocol **prp);
+#define LOST_CONN_ERR(xx) ((xx == -2) || (xx == LDAP_SERVER_DOWN) || (xx == LDAP_CONNECT_ERROR))
/*
* Notes on the async version of this code:
* First, we need to have the supplier and consumer both be async-capable.
@@ -120,9 +121,9 @@
repl5_tot_log_operation_failure(int ldap_error, char* ldap_error_string, const char *agreement_name)
{
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name,
- "%s: Received error %d: %s for total update operation\n",
+ "%s: Received error %d (%s): %s for total update operation\n",
agreement_name,
- ldap_error, ldap_error_string ? ldap_error_string : "NULL");
+ ldap_error, ldap_err2string(ldap_error), ldap_error_string ? ldap_error_string : "");
}
/* Thread that collects results from async operations sent to the consumer */
@@ -206,7 +207,9 @@
}
/* Should we stop ? */
PR_Lock(cb->lock);
- if (cb->stop_result_thread)
+ /* if the connection is not connected, then we cannot read any more
+ results - we are finished */
+ if (cb->stop_result_thread || (conres == CONN_NOT_CONNECTED))
{
finished = 1;
}
@@ -290,13 +293,17 @@
/* If so then we're done */
done = 1;
}
+ if (cb_data->abort && LOST_CONN_ERR(cb_data->rc))
+ {
+ done = 1; /* no connection == no more results */
+ }
PR_Unlock(cb_data->lock);
/* If not then sleep a bit */
DS_Sleep(PR_SecondsToInterval(1));
loops++;
/* If we sleep forever then we can conclude that something bad happened, and bail... */
/* Arbitrary 30 second delay : basically we should only expect to wait as long as it takes to process a few operations, which should be on the order of a second at most */
- if (loops > 300)
+ if (!done && (loops > 300))
{
/* Log a warning */
slapi_log_error(SLAPI_LOG_FATAL, NULL,
@@ -618,6 +625,18 @@
return -1;
}
+ /* see if the result reader thread encountered
+ a fatal error */
+ PR_Lock(((callback_data*)cb_data)->lock);
+ rc = ((callback_data*)cb_data)->abort;
+ PR_Unlock(((callback_data*)cb_data)->lock);
+ if (rc)
+ {
+ conn_disconnect(prp->conn);
+ prp->stopped = 1;
+ ((callback_data*)cb_data)->rc = -1;
+ return -1;
+ }
/* skip ruv tombstone - need to do this because it might be
more up to date then the data we are sending to the client.
RUV is sent separately via the protocol */
@@ -702,9 +721,14 @@
ber_bvfree(bv);
(*num_entriesp)++;
- /* For async operation we need to inspect the abort status from the result thread here */
-
- if (CONN_OPERATION_SUCCESS == rc) {
+ /* if the connection has been closed, we need to stop
+ sending entries and set a special rc value to let
+ the result reading thread know the connection has been
+ closed - do not attempt to read any more results */
+ if (CONN_NOT_CONNECTED == rc) {
+ ((callback_data*)cb_data)->rc = -2;
+ retval = -1;
+ } else if (CONN_OPERATION_SUCCESS == rc) {
retval = 0;
} else {
((callback_data*)cb_data)->rc = rc;
From rmeggins at fedoraproject.org Thu Mar 12 02:16:45 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 12 Mar 2009 02:16:45 +0000 (UTC)
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd util.c,
1.29, 1.30
Message-ID: <20090312021645.7D50470135@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27916/ldapserver/ldap/servers/slapd
Modified Files:
util.c
Log Message:
Resolves: bug 488866
Bug Description: crash in reliab15 test
Reviewed by: nkinder (Thanks!)
Fix Description: There was still a small window of time during which the connection could be closed out from under the other thread which was sending/reading result. The solution is to use explicit locking using the conn->lock to protect access to the conn->ld. Since this also affected the total update code, I tested it under similar conditions, and found that it exhibited the same behavior. I added checking to the total update code to check for disconnection and coordinate access in the entry sending/result reading threads.
I also fixed a spurious error message about the sasl path.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- util.c 9 Mar 2009 16:35:35 -0000 1.29
+++ util.c 12 Mar 2009 02:16:43 -0000 1.30
@@ -959,7 +959,7 @@
char *pp = NULL;
if (NULL == pluginpath || (*pluginpath == '\0')) {
- slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_init_ext",
+ slapi_log_error(SLAPI_LOG_SHELL, "slapi_ldap_init_ext",
"configpluginpath == NULL\n");
if (!(pluginpath = getenv("SASL_PATH"))) {
#if defined(LINUX) && defined(__LP64__)
@@ -974,7 +974,7 @@
(0 != strcmp(++pp, pluginpath)) /* sasl_path has been updated */ ) {
PR_snprintf(util_sasl_path, sizeof(util_sasl_path),
"SASL_PATH=%s", pluginpath);
- slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_init_ext",
+ slapi_log_error(SLAPI_LOG_SHELL, "slapi_ldap_init_ext",
"putenv(%s)\n", util_sasl_path);
putenv(util_sasl_path);
}
From rmeggins at fedoraproject.org Thu Mar 12 14:39:43 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 12 Mar 2009 14:39:43 +0000 (UTC)
Subject: [Fedora-directory-commits] winsync/passwordsync/passsync
ntservice.cpp, 1.6, 1.7
Message-ID: <20090312143943.3830070132@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/winsync/passwordsync/passsync
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32164
Modified Files:
ntservice.cpp
Log Message:
Resolves: Bug 482892
Description: Passsync service start and stop messages in Windows event viewer are not logged correctly
Fix Description: Omit "The Password Synchronization Service service was installed." message at service startup.
Index: ntservice.cpp
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/ntservice.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ntservice.cpp 16 Feb 2009 22:20:21 -0000 1.6
+++ ntservice.cpp 12 Mar 2009 14:39:40 -0000 1.7
@@ -199,6 +199,7 @@
// Get the executable file path
TCHAR szFilePath[_MAX_PATH];
::GetModuleFileName(NULL, szFilePath, sizeof(szFilePath)/sizeof(*szFilePath));
+ int didinstall = FALSE;
// install if not already installed
if (!IsInstalled()) {
@@ -229,6 +230,7 @@
// clean up
::CloseServiceHandle(hService);
::CloseServiceHandle(hSCM);
+ didinstall = TRUE;
}
// make registry entries to support logging messages
@@ -263,10 +265,12 @@
0,
REG_DWORD,
(CONST BYTE*)&dwData,
- sizeof(DWORD));
+ sizeof(DWORD));
::RegCloseKey(hKey);
- LogEvent(EVENTLOG_INFORMATION_TYPE, EVMSG_INSTALLED, m_szServiceName);
+ if (didinstall) {
+ LogEvent(EVENTLOG_INFORMATION_TYPE, EVMSG_INSTALLED, m_szServiceName);
+ }
return TRUE;
}
From nhosoi at fedoraproject.org Thu Mar 12 20:39:02 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Thu, 12 Mar 2009 20:39:02 +0000 (UTC)
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd dse.c, 1.11, 1.12
Message-ID: <20090312203902.0DF3570132@cvs1.fedora.phx.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3128
Modified Files:
dse.c
Log Message:
Resolves: #489763
Summary: rhds80 64b el5.3 - db2ldif lock case
Description: Fixed double free, which confused the server operation and eventually crashed the server.
Index: dse.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/dse.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dse.c 17 Oct 2008 16:54:47 -0000 1.11
+++ dse.c 12 Mar 2009 20:38:59 -0000 1.12
@@ -1139,9 +1139,6 @@
slapi_entry_free(schemacheckentry);
}
- /* callers expect e (SLAPI_ADD_ENTRY) to be freed or otherwise consumed */
- slapi_entry_free(e);
-
return rc;
}
From rmeggins at fedoraproject.org Thu Mar 12 22:13:01 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Thu, 12 Mar 2009 22:13:01 +0000 (UTC)
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
FileConn.pm, 1.6, 1.7
Message-ID: <20090312221301.5408370132@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22797
Modified Files:
FileConn.pm
Log Message:
Resolves: bug 480869
Description: Bug 480869 - DS console: Can not delete DS instance
Fix Description: Create instance was broken, so no instances could be created for purposes of deletion. Create instance was printing the following error:
Unable to find Pass Through Authentication Plug-In config entry.
This is because the search for this entry in AdminUtil.pm was getting an incorrect error message - something other than "Success"
This is because the FileConn->getErrorString() method was returning "0" instead of "Success".
Platforms tested: RHEL4
Index: FileConn.pm
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/FileConn.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileConn.pm 27 Feb 2009 14:33:12 -0000 1.6
+++ FileConn.pm 12 Mar 2009 22:12:59 -0000 1.7
@@ -213,7 +213,7 @@
sub getErrorString {
my $self = shift;
- return ($self->{lastErrorCode} ? ldap_err2string($self->{lastErrorCode}) : LDAP_SUCCESS);
+ return ldap_err2string($self->{lastErrorCode});
}
#############################################################################
From rmeggins at fedoraproject.org Fri Mar 13 14:27:53 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Fri, 13 Mar 2009 14:27:53 +0000 (UTC)
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
DSMigration.pm.in, 1.28, 1.29 Util.pm.in, 1.20, 1.21
Message-ID: <20090313142753.8F95770132@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29040/ldapserver/ldap/admin/src/scripts
Modified Files:
DSMigration.pm.in Util.pm.in
Log Message:
Resolves: bug 489360
Bug Description: Replication Bind Failure After Migration from DS 7.1
Reviewed by: nkinder (Thanks!)
Fix Description: We have to quote shell metacharacters before passing them to the shell. I added a new function shellEscape to use for this purpose. We really should shell escape anything passed to system() or back ticks ``. Certainly passwords should contain shell meta characters so I changed places where we use passwords to use shellEscape to pass them to pwdhash or migratecred. I also chomp() the output of migratecred to remove the trailing newline. With the fix, I was able to run setup with a root password of `~!@#$%^&*()\\|[]{}:;<>?/"\ and successfully authenticate.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: DSMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSMigration.pm.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- DSMigration.pm.in 27 Feb 2009 14:33:12 -0000 1.28
+++ DSMigration.pm.in 13 Mar 2009 14:27:50 -0000 1.29
@@ -222,19 +222,22 @@
sub migrateCredentials {
my ($ent, $attr, $mig, $inst) = @_;
my $oldval = $ent->getValues($attr);
+ my $qoldval = shellEscape($oldval);
# Older versions of the server on x86 systems and other systems that do not use network byte order
# stored the credentials incorrectly. The first step is to determine if this is the case. We
# migrate using the same server root to see if we get the same output as we input.
debug(3, "In migrateCredentials - see how old credentials were encoded.\n");
- my $testval = `@bindir@/migratecred -o $mig->{actualsroot}/$inst -n $mig->{actualsroot}/$inst -c \'$oldval\'`;
+ my $testval = `@bindir@/migratecred -o $mig->{actualsroot}/$inst -n $mig->{actualsroot}/$inst -c $qoldval`;
+ chomp($testval);
if ($testval ne $oldval) { # need to turn on the special flag
debug(3, "Credentials not encoded correctly. oldval $oldval not equal to testval $testval. The value will be re-encoded correctly.\n");
$ENV{MIGRATE_BROKEN_PWD} = "1"; # decode and re-encode correctly
}
- debug(3, "Executing @bindir@/migratecred -o $mig->{actualsroot}/$inst -n @instconfigdir@/$inst -c \'$oldval\' . . .\n");
- my $newval = `@bindir@/migratecred -o $mig->{actualsroot}/$inst -n @instconfigdir@/$inst -c \'$oldval\'`;
+ debug(3, "Executing @bindir@/migratecred -o $mig->{actualsroot}/$inst -n @instconfigdir@/$inst -c $qoldval . . .\n");
+ my $newval = `@bindir@/migratecred -o $mig->{actualsroot}/$inst -n @instconfigdir@/$inst -c $qoldval`;
+ chomp($newval);
delete $ENV{MIGRATE_BROKEN_PWD}; # clear the flag, if set
debug(3, "Converted old value [$oldval] to new value [$newval] for attr $attr in entry ", $ent->getDN(), "\n");
return $newval;
Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Util.pm.in 27 Feb 2009 14:33:12 -0000 1.20
+++ Util.pm.in 13 Mar 2009 14:27:50 -0000 1.21
@@ -47,11 +47,11 @@
@ISA = qw(Exporter);
@EXPORT = qw(portAvailable getAvailablePort isValidDN addSuffix getMappedEntries
process_maptbl check_and_add_entry getMappedEntries
- getHashedPassword debug createInfFromConfig
+ getHashedPassword debug createInfFromConfig shellEscape
isValidServerID isValidUser makePaths getLogin remove_tree remove_pidfile);
@EXPORT_OK = qw(portAvailable getAvailablePort isValidDN addSuffix getMappedEntries
process_maptbl check_and_add_entry getMappedEntries
- getHashedPassword debug createInfFromConfig
+ getHashedPassword debug createInfFromConfig shellEscape
isValidServerID isValidUser makePaths getLogin remove_tree remove_pidfile);
use strict;
@@ -679,6 +679,20 @@
return $mapper;
}
+# given a string, escape the characters in the string
+# so that it can be safely passed to the shell via
+# the system() call or `` backticks
+sub shellEscape {
+ my $val = shift;
+ # first, escape the double quotes and slashes
+ $val =~ s/([\\"])/\\$1/g; # " font lock fun
+ # next, escape the rest of the special chars
+ my $special = '!$\' @#%^&*()|[\]{};:<>?/`';
+ $val =~ s/([$special])/\\$1/g;
+
+ return $val;
+}
+
sub getHashedPassword {
my $pwd = shift;
my $alg = shift;
@@ -691,7 +705,7 @@
if ($alg) {
$cmd .= " -s $alg";
}
- $cmd .= " \'$pwd\'";
+ $cmd .= " " . shellEscape($pwd);
my $hashedpwd = `$cmd`;
chomp($hashedpwd);
From nhosoi at fedoraproject.org Fri Mar 13 16:39:29 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Fri, 13 Mar 2009 16:39:29 +0000 (UTC)
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd log.c, 1.25, 1.26
Message-ID: <20090313163929.29D7070132@cvs1.fedora.phx.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20986
Modified Files:
log.c
Log Message:
Resolves: #489625
Summary: If an independent process db2ldif rotates the error log, it crashes the server.
Description: PR_Rename failure due to the FILE_EXIST is benign. Ignore the
error and goes forward. The procedure is extended to all the log type: error,
access, and audit.
Index: log.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- log.c 10 Dec 2008 06:23:24 -0000 1.25
+++ log.c 13 Mar 2009 16:39:25 -0000 1.26
@@ -2144,9 +2144,15 @@
log_convert_time (log->l_ctime, tbuf, 1 /*short */);
PR_snprintf(newfile, sizeof(newfile), "%s.%s", loginfo.log_access_file, tbuf);
if (PR_Rename (loginfo.log_access_file, newfile) != PR_SUCCESS) {
- loginfo.log_access_fdes = NULL;
- if (!locked) LOG_ACCESS_UNLOCK_WRITE();
- return LOG_UNABLE_TO_OPENFILE;
+ PRErrorCode prerr = PR_GetError();
+ /* Make "FILE EXISTS" error an exception.
+ Even if PR_Rename fails with the error, we continue logging.
+ */
+ if (PR_FILE_EXISTS_ERROR != prerr) {
+ loginfo.log_access_fdes = NULL;
+ if (!locked) LOG_ACCESS_UNLOCK_WRITE();
+ return LOG_UNABLE_TO_OPENFILE;
+ }
}
/* add the log to the chain */
log->l_next = loginfo.log_access_logchain;
@@ -3202,7 +3208,7 @@
* which causes the self deadlock if you call LDAPDebug for logging.
* Thus, instead of LDAPDebug, call log__error_emergency with locked == 1. */
PR_snprintf(buffer, sizeof(buffer), "LOGINFO:Unable to remove file:%s.%s\n",
- loginfo.log_audit_file, tbuf);
+ loginfo.log_audit_file, tbuf);
log__error_emergency(buffer, 0, locked);
}
slapi_ch_free((void**)&delete_logp);
@@ -3638,14 +3644,19 @@
PR_snprintf(newfile, sizeof(newfile), "%s.%s", loginfo.log_error_file, tbuf);
if (PR_Rename (loginfo.log_error_file, newfile) != PR_SUCCESS) {
PRErrorCode prerr = PR_GetError();
- PR_snprintf(buffer, sizeof(buffer),
- "Failed to rename errors log file, "
- SLAPI_COMPONENT_NAME_NSPR " error %d (%s). Exiting...",
- prerr, slapd_pr_strerror(prerr));
- log__error_emergency(buffer, 1, 1);
- slapi_ch_free((void **)&log);
- if (!locked) LOG_ERROR_UNLOCK_WRITE();
- return LOG_UNABLE_TO_OPENFILE;
+ /* Make "FILE EXISTS" error an exception.
+ Even if PR_Rename fails with the error, we continue logging.
+ */
+ if (PR_FILE_EXISTS_ERROR != prerr) {
+ PR_snprintf(buffer, sizeof(buffer),
+ "Failed to rename errors log file, "
+ SLAPI_COMPONENT_NAME_NSPR " error %d (%s). Exiting...",
+ prerr, slapd_pr_strerror(prerr));
+ log__error_emergency(buffer, 1, 1);
+ slapi_ch_free((void **)&log);
+ if (!locked) LOG_ERROR_UNLOCK_WRITE();
+ return LOG_UNABLE_TO_OPENFILE;
+ }
}
/* add the log to the chain */
@@ -3776,8 +3787,14 @@
log_convert_time (log->l_ctime, tbuf, 1 /*short */);
PR_snprintf(newfile, sizeof(newfile), "%s.%s", loginfo.log_audit_file, tbuf);
if (PR_Rename (loginfo.log_audit_file, newfile) != PR_SUCCESS) {
- if (!locked) LOG_AUDIT_UNLOCK_WRITE();
- return LOG_UNABLE_TO_OPENFILE;
+ PRErrorCode prerr = PR_GetError();
+ /* Make "FILE EXISTS" error an exception.
+ Even if PR_Rename fails with the error, we continue logging.
+ */
+ if (PR_FILE_EXISTS_ERROR != prerr) {
+ if (!locked) LOG_AUDIT_UNLOCK_WRITE();
+ return LOG_UNABLE_TO_OPENFILE;
+ }
}
/* add the log to the chain */
From nhosoi at fedoraproject.org Fri Mar 13 20:35:40 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Fri, 13 Mar 2009 20:35:40 +0000 (UTC)
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/slapd log.c, 1.26, 1.27
Message-ID: <20090313203540.1856B70132@cvs1.fedora.phx.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9043
Modified Files:
log.c
Log Message:
Resolves: #490027
Summary: log module issues unnecessary/inaccurate syslog errors
Description:
1) don't log "Exceeded max number of logs allowed" in syslog messages. It's an
info level log, which is not appropriate to log in syslog messages.
2) when deleting an error log file failed, a wrong file name (audit log) was
printed. I also added the error code and the message why the deletion failed.
Index: log.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/log.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- log.c 13 Mar 2009 16:39:25 -0000 1.26
+++ log.c 13 Mar 2009 20:35:37 -0000 1.27
@@ -3104,7 +3104,6 @@
*/
if (++numoflogs > loginfo.log_error_maxnumlogs) {
logstr = "Exceeded max number of logs allowed";
- syslog(LOG_ERR, "%s\n", logstr);
goto delete_logfile;
}
@@ -3184,6 +3183,8 @@
return 0;
}
}
+ memset(tbuf, 0, sizeof(tbuf));
+ log_convert_time (delete_logp->l_ctime, tbuf, 1 /*short */);
if (!locked) {
/* if locked, we should not call LDAPDebug,
which tries to get a lock internally. */
@@ -3201,14 +3202,15 @@
}
/* Delete the error file */
- log_convert_time (delete_logp->l_ctime, tbuf, 1 /*short */);
PR_snprintf (buffer, sizeof(buffer), "%s.%s", loginfo.log_error_file, tbuf);
if (PR_Delete(buffer) != PR_SUCCESS) {
+ PRErrorCode prerr = PR_GetError();
/* This function could be called in the ERROR WRITE LOCK,
* which causes the self deadlock if you call LDAPDebug for logging.
* Thus, instead of LDAPDebug, call log__error_emergency with locked == 1. */
- PR_snprintf(buffer, sizeof(buffer), "LOGINFO:Unable to remove file:%s.%s\n",
- loginfo.log_audit_file, tbuf);
+ PR_snprintf(buffer, sizeof(buffer),
+ "LOGINFO:Unable to remove file:%s.%s error %d (%s)\n",
+ loginfo.log_error_file, tbuf, prerr, slapd_pr_strerror(prerr));
log__error_emergency(buffer, 0, locked);
}
slapi_ch_free((void**)&delete_logp);
From rmeggins at fedoraproject.org Mon Mar 16 16:29:48 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon, 16 Mar 2009 16:29:48 +0000 (UTC)
Subject: [Fedora-directory-commits]
ldapserver/ldap/servers/plugins/replication repl5_agmt.c, 1.16, 1.17
Message-ID: <20090316162948.5853370132@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/replication
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12778/ldapserver/ldap/servers/plugins/replication
Modified Files:
repl5_agmt.c
Log Message:
Resolves: bug 479254
Bug Description: Configuring Replication Server to Server GSSAPI over TLS - attempts replication and can't stop servers
Reviewed by: nhosoi (Thanks!)
Fix Description: The agreement add code did not check the transport and bind method for compatability.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: repl5_agmt.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/replication/repl5_agmt.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- repl5_agmt.c 5 Dec 2008 22:41:51 -0000 1.16
+++ repl5_agmt.c 16 Mar 2009 16:29:45 -0000 1.17
@@ -207,6 +207,20 @@
"is malformed: invalid pausetime %ld.\n", slapi_sdn_get_dn(ra->dn), ra->pausetime);
return_value = 0;
}
+ if ((0 != ra->transport_flags) && (BINDMETHOD_SASL_GSSAPI == ra->bindmethod)) {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Replication agreement \"%s\" "
+ " is malformed: cannot use SASL/GSSAPI if using SSL or TLS - please "
+ "change %s to LDAP before changing %s to use SASL/GSSAPI\n",
+ slapi_sdn_get_dn(ra->dn), type_nsds5TransportInfo, type_nsds5ReplicaBindMethod);
+ return_value = 0;
+ }
+ if ((0 == ra->transport_flags) && (BINDMETHOD_SSL_CLIENTAUTH == ra->bindmethod)) {
+ slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "Replication agreement \"%s\" "
+ " is malformed: cannot use SSLCLIENTAUTH if using plain LDAP - please "
+ "change %s to SSL or TLS before changing %s to use SSLCLIENTAUTH\n",
+ slapi_sdn_get_dn(ra->dn), type_nsds5TransportInfo, type_nsds5ReplicaBindMethod);
+ return_value = 0;
+ }
return return_value;
}
From nhosoi at fedoraproject.org Tue Mar 17 01:00:29 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Tue, 17 Mar 2009 01:00:29 +0000 (UTC)
Subject: [Fedora-directory-commits] ldapserver configure.ac, 1.58,
1.59 configure, 1.101, 1.102
Message-ID: <20090317010029.8555D70136@cvs1.fedora.phx.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13549
Modified Files:
configure.ac configure
Log Message:
Resolves: #476096
Summary: move perl on solaris to a path
Description: Changing Solaris perl path (perlexec) to /usr/lib/sparcv9/dirsec/perl5x/bin/perl.
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- configure.ac 10 Mar 2009 16:55:20 -0000 1.58
+++ configure.ac 17 Mar 2009 01:00:25 -0000 1.59
@@ -388,7 +388,7 @@
AC_SUBST([LIBCRUN], [$LIBCRUN])
platform="solaris"
# assume 64 bit
- perlexec='/usr/lib/sparcv9/dirsrv/perl5x/bin/perl'
+ perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl'
# relative to sysconfdir
initdir=/init.d
;;
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- configure 10 Mar 2009 16:55:17 -0000 1.101
+++ configure 17 Mar 2009 01:00:25 -0000 1.102
@@ -23830,7 +23830,7 @@
platform="solaris"
# assume 64 bit
- perlexec='/usr/lib/sparcv9/dirsrv/perl5x/bin/perl'
+ perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl'
# relative to sysconfdir
initdir=/init.d
;;
From nhosoi at fedoraproject.org Tue Mar 17 01:09:43 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Tue, 17 Mar 2009 01:09:43 +0000 (UTC)
Subject: [Fedora-directory-commits] adminserver configure.ac, 1.30,
1.31 configure, 1.51, 1.52
Message-ID: <20090317010943.7C23A70136@cvs1.fedora.phx.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15206
Modified Files:
configure.ac configure
Log Message:
Resolves: #476096
Summary: move perl on solaris to a path
Description: Changing Solaris perl path (perlexec) to /usr/lib/sparcv9/dirsec/perl5x/bin/perl.
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- configure.ac 10 Mar 2009 17:04:00 -0000 1.30
+++ configure.ac 17 Mar 2009 01:09:40 -0000 1.31
@@ -187,7 +187,7 @@
CXXLINK_REQUIRED=1
platform="solaris"
# assume 64 bit
- perlexec='/usr/lib/sparcv9/dirsrv/perl5x/bin/perl'
+ perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl'
# relative to sysconfdir
initdir=/init.d
;;
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- configure 10 Mar 2009 17:03:59 -0000 1.51
+++ configure 17 Mar 2009 01:09:40 -0000 1.52
@@ -23245,7 +23245,7 @@
CXXLINK_REQUIRED=1
platform="solaris"
# assume 64 bit
- perlexec='/usr/lib/sparcv9/dirsrv/perl5x/bin/perl'
+ perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl'
# relative to sysconfdir
initdir=/init.d
;;
From rmeggins at fedoraproject.org Tue Mar 17 15:40:54 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 17 Mar 2009 15:40:54 +0000 (UTC)
Subject: [Fedora-directory-commits] winsync/passwordsync/passsync
ntservice.cpp, 1.7, 1.8
Message-ID: <20090317154054.61C0870133@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/winsync/passwordsync/passsync
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30046/passwordsync/passsync
Modified Files:
ntservice.cpp
Log Message:
Resolves: bug 482892
Bug Description: Passsync service start and stop messages in Windows event
viewer are not logged correctly
Reviewed by: nkinder (Thanks!)
Fix Description: For some reason, the code was not detecting that the service
had already been installed and was installing it again. We do not need to
install the service in this code, that is done in the .msi file now. I just
got rid of that old code.
Platforms tested: Windows 2003 Server
Flag Day: no
Doc impact: no
Index: ntservice.cpp
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/ntservice.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ntservice.cpp 12 Mar 2009 14:39:40 -0000 1.7
+++ ntservice.cpp 17 Mar 2009 15:40:51 -0000 1.8
@@ -199,40 +199,6 @@
// Get the executable file path
TCHAR szFilePath[_MAX_PATH];
::GetModuleFileName(NULL, szFilePath, sizeof(szFilePath)/sizeof(*szFilePath));
- int didinstall = FALSE;
-
- // install if not already installed
- if (!IsInstalled()) {
- // Open the Service Control Manager
- SC_HANDLE hSCM = ::OpenSCManager(NULL, // local machine
- NULL, // ServicesActive database
- SC_MANAGER_ALL_ACCESS); // full access
- if (!hSCM) return FALSE;
-
- // Create the service
- SC_HANDLE hService = ::CreateService(hSCM,
- m_szServiceName,
- m_szServiceName,
- SERVICE_ALL_ACCESS,
- SERVICE_WIN32_OWN_PROCESS,
- SERVICE_DEMAND_START, // start condition
- SERVICE_ERROR_NORMAL,
- szFilePath,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
- if (!hService) {
- ::CloseServiceHandle(hSCM);
- return FALSE;
- }
- // clean up
- ::CloseServiceHandle(hService);
- ::CloseServiceHandle(hSCM);
- didinstall = TRUE;
- }
-
// make registry entries to support logging messages
// Add the source name as a subkey under the Application
// key in the EventLog service portion of the registry.
@@ -268,10 +234,6 @@
sizeof(DWORD));
::RegCloseKey(hKey);
- if (didinstall) {
- LogEvent(EVENTLOG_INFORMATION_TYPE, EVMSG_INSTALLED, m_szServiceName);
- }
-
return TRUE;
}
From nhosoi at fedoraproject.org Mon Mar 23 16:44:28 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Mon, 23 Mar 2009 16:44:28 +0000 (UTC)
Subject: [Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools
mmldif.c, 1.9, 1.10
Message-ID: <20090323164428.CB50170133@cvs1.fedora.phx.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14981
Modified Files:
mmldif.c
Log Message:
Resolves: #491215
Summary: mmldif crashes in PK11_CreateDigestContext
Description: NSS was not initialized. Since cert db, key db, or secmod db are
not needed, changed to call NSS_NoDB_Init to initialize NSS.
Index: mmldif.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/mmldif.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mmldif.c 8 Oct 2008 17:29:04 -0000 1.9
+++ mmldif.c 23 Mar 2009 16:44:25 -0000 1.10
@@ -347,6 +347,8 @@
time(&statsp->diff_start_time);
license_count = 0;
+ NSS_NoDB_Init(".");
+
/*
* read all entries from all directories hashing name and value, and make
* a bitmaps of who has each entry. Flag those entries where at least
From nkinder at fedoraproject.org Mon Mar 23 20:13:09 2009
From: nkinder at fedoraproject.org (Nathan Kinder)
Date: Mon, 23 Mar 2009 20:13:09 +0000 (UTC)
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
DSMigration.pm.in, 1.29, 1.30 migrate-ds.res, 1.8, 1.9
Message-ID: <20090323201310.1CF2C70133@cvs1.fedora.phx.redhat.com>
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6972/ldap/admin/src/scripts
Modified Files:
DSMigration.pm.in migrate-ds.res
Log Message:
Resolves: 445602
Summary: Fixup replicated schema during migration.
Index: DSMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/DSMigration.pm.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- DSMigration.pm.in 13 Mar 2009 14:27:50 -0000 1.29
+++ DSMigration.pm.in 23 Mar 2009 20:13:06 -0000 1.30
@@ -820,12 +820,152 @@
'hassubordinates' => 'hasSubordinates'
);
+sub fixup99user {
+ my $mig = shift; # the Migration object
+ my $inst = shift; # The name of the instance
+ my $newschemadir = shift; # the new instance's schema path
+
+ my %attrstoskip = ();
+ my %objclassestoskip = ();
+ my $uid;
+ my $gid;
+ my $mode;
+
+ # Read every schema file in the legacy server's schema directory
+ for (glob("$mig->{oldsroot}/$inst/config/schema/*.ldif")) {
+ if (!open( OLDSCHEMA, $_ )) {
+ debug(0, "Can't open schema file $_: $!\n");
+ next;
+ }
+
+ # Read attributes from each file, looking for ones that contain
+ # the string "DESC ''".
+ my $in = new Mozilla::LDAP::LDIF(*OLDSCHEMA);
+ while (my $ent = readOneEntry $in) {
+ my @attrs = $ent->getValues('attributeTypes');
+ my @objclasses = $ent->getValues('objectClasses');
+ foreach my $attr (@attrs) {
+ debug(4, "Checking if attribute should be added to skip list ($attr)\n");
+ if ($attr =~ /\(\s*(\S*)\s*NAME .* DESC \'\'/) {
+ # Store the OID of those in an associative array for
+ # quick lookups later.
+ debug(3, "Adding attribute to list to skip (OID $1)\n");
+ $attrstoskip{"$1"} = 1;
+ }
+ }
+
+ foreach my $objclass (@objclasses) {
+ debug(4, "Checking if objectclass should be added to skip list ($objclass)\n");
+ if ($objclass =~ /\(\s*(\S*)\s*NAME .* DESC \'\'/) {
+ # Store the OID of those in an associative array for
+ # quick lookups later.
+ debug(3, "Adding objectclass to list to skip (OID $1)\n");
+ $objclassestoskip{"$1"} = 1;
+ }
+ }
+ }
+
+ close(OLDSCHEMA);
+ }
+
+ # Open the 99user.ldif file in the new server schema directory, which is a
+ # copy of the one in the legacy server. Also open a tempfile.
+ if (!open(USERSCHEMA, "$newschemadir/99user.ldif")) {
+ return ("error_opening_schema", "$newschemadir/99user.ldif", $!);
+ }
+
+ # Open a tempfile to write the cleaned 99user.ldif to
+ if (!open(TMPSCHEMA, ">$newschemadir/99user.ldif.tmp")) {
+ close(USERSCHEMA);
+ return ("error_opening_schema", "$newschemadir/99user.ldif.tmp", $!);
+ }
+
+ # Iterate through every attribute in the 99user.ldif file and write them to the
+ # tempfile if their OID doesn't exist in the "bad schema" array.
+ my $in = new Mozilla::LDAP::LDIF(*USERSCHEMA);
+ while (my $ent = readOneEntry $in) {
+ my @attrs = $ent->getValues('attributeTypes');
+ my @objclasses = $ent->getValues('objectClasses');
+ my @keepattrs;
+ my @keepobjclasses;
+ foreach my $attr (@attrs) {
+ if ($attr =~ /\(\s*(\S*)\s*NAME/) {
+ debug(3, "Checking if attribute should be trimmed (OID $1)\n");
+ # See if this OID is in our list of attrs to skip
+ if ($attrstoskip{"$1"}) {
+ debug(2, "Trimming attribute from 99user.ldif (OID $1)\n");
+ next;
+ }
+ }
+
+ # Keep this value
+ debug(3, "Keeping attribute in 99user.ldif (OID $1)\n");
+ push @keepattrs, $attr;
+ }
+
+ foreach my $objclass (@objclasses) {
+ if ($objclass =~ /\(\s*(\S*)\s*NAME/) {
+ debug(3, "Checking if objectclass should be trimmed (OID $1)\n");
+ # See if this OID is in our list of objectclasses to skip
+ if ($objclassestoskip{"$1"}) {
+ debug(2, "Trimming objectclass from 99user.ldif (OID $1)\n");
+ next;
+ }
+ }
+
+ # Keep this value
+ debug(3, "Keeping objectclass in 99user.ldif (OID $1)\n");
+ push @keepobjclasses, $objclass;
+ }
+
+ # Update the entry with the values we want to keep
+ if ($#keepattrs >= $[) {
+ $ent->setValues("attributetypes", @keepattrs);
+ } else {
+ $ent->remove("attributetypes");
+ }
+
+ if ($#keepobjclasses >= $[) {
+ $ent->setValues("objectclasses", @keepobjclasses);
+ } else {
+ $ent->remove("objectclasses");
+ }
+
+ # Write the entry to temp schema file
+ my $oldfh = select(TMPSCHEMA);
+ $ent->printLDIF();
+ select($oldfh);
+ }
+
+ close(USERSCHEMA);
+ close(TMPSCHEMA);
+
+ # Make the ownership and permissions on the temp schema file
+ # the same as the copied 99user.ldif.
+ ($mode, $uid, $gid) = (stat("$newschemadir/99user.ldif"))[2,4,5];
+ if ((chown $uid, $gid, "$newschemadir/99user.ldif.tmp") != 1) {
+ return ("error_schema_permissions", "$newschemadir/99user.ldif.tmp", $!);
+ }
+
+ if ((chmod $mode, "$newschemadir/99user.ldif.tmp") != 1) {
+ return ("error_schema_permissions", "$newschemadir/99user.ldif.tmp", $!);
+ }
+
+ # Replace the copied 99user.ldif with the trimmed file.
+ if ((rename "$newschemadir/99user.ldif.tmp", "$newschemadir/99user.ldif") != 1) {
+ return ("error_renaming_schema", "$newschemadir/99user.ldif.tmp", "$newschemadir/99user.ldif", $!);
+ }
+
+ return();
+}
+
sub migrateSchema {
my $mig = shift; # the Migration object
my $inst = shift; # the instance name (e.g. slapd-instance)
my $src = shift; # a Conn to the source
my $dest = shift; # a Conn to the dest
+ my @errs;
my $cfgent = $dest->search("cn=config", "base", "(objectclass=*)");
my $newschemadir = $cfgent->getValues('nsslapd-schemadir') ||
"$mig->{configdir}/$inst/schema";
@@ -840,6 +980,11 @@
}
}
+ # fixup any attributes with missing descriptions in 99user.ldif
+ if (@errs = fixup99user($mig, $inst, $newschemadir)) {
+ return @errs;
+ }
+
if (!$mig->{crossplatform}) {
# now, for all of the new schema, we need to get the list of attribute
# types with INTEGER syntax, including derived types (e.g. SUP 'attr')
Index: migrate-ds.res
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/migrate-ds.res,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- migrate-ds.res 26 Oct 2007 22:00:32 -0000 1.8
+++ migrate-ds.res 23 Mar 2009 20:13:06 -0000 1.9
@@ -7,6 +7,9 @@
error_importing_migrated_db = Could not import the LDIF file '%s' for the migrated database. Error: %s. Output: %s\n
error_reading_olddbconfig = Could not read the old database configuration information. Error: %s\n
error_migrating_schema = Could not copy old schema file '%s'. Error: %s\n
+error_opening_schema = Could not open new schema file '%s'. Error: %s\n
+error_schema_permissions = Could not reset permissions on schema file '%s'. Error: %s\n
+error_renaming_schema = Could not rename schema file '%s' tp '%s'. Error: %s\n
error_copying_dbdir = Could not copy database directory '%s' to '%s'. Error: %s\n
error_copying_dbfile = Could not copy database file '%s' to '%s'. Error: %s\n
error_dbsrcdir_not_exist = Could not copy from the database source directory '%s' because it does not exist. Please check your configuration.\n
From nhosoi at fedoraproject.org Tue Mar 24 22:50:22 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Tue, 24 Mar 2009 22:50:22 +0000 (UTC)
Subject: [Fedora-directory-commits] ldapserver/ldap/admin/src/scripts
Migration.pm.in, 1.9, 1.10
Message-ID: <20090324225022.916A270133@cvs1.fedora.phx.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24287
Modified Files:
Migration.pm.in
Log Message:
Resolves: #489360
Summary: Replication Bind Failure After Migration from DS 7.1 (comment #10)
Description: changed to trim trailing slashes of oldsroot and actualsroot at the beginning.
Index: Migration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Migration.pm.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Migration.pm.in 24 Feb 2009 16:57:45 -0000 1.9
+++ Migration.pm.in 24 Mar 2009 22:50:20 -0000 1.10
@@ -205,7 +205,9 @@
my $oldpkgname = "@brand at -ds";
$self->{pkgname} = $pkgname;
+ $oldsroot =~ s/\/+$//; # trim trailing '/'s, if any
$self->{oldsroot} = $oldsroot || "/opt/$oldpkgname";
+ $actualsroot =~ s/\/+$//; # trim trailing '/'s, if any
$self->{actualsroot} = $actualsroot || $self->{oldsroot};
$self->{silent} = $silent;
$self->{inffile} = $inffile;
From nkinder at fedoraproject.org Wed Mar 25 18:00:03 2009
From: nkinder at fedoraproject.org (Nathan Kinder)
Date: Wed, 25 Mar 2009 18:00:03 +0000 (UTC)
Subject: [Fedora-directory-commits] winsync/passwordsync/passhook
passhook.cpp, 1.9, 1.10
Message-ID: <20090325180003.16B9470133@cvs1.fedora.phx.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passhook
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26335/passhook
Modified Files:
passhook.cpp
Log Message:
Related: 490048
Summary: Handle NULL Username and Password parameters in PasswordChangeNotify callback.
Index: passhook.cpp
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passhook/passhook.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- passhook.cpp 30 Mar 2006 22:59:25 -0000 1.9
+++ passhook.cpp 25 Mar 2009 18:00:00 -0000 1.10
@@ -59,11 +59,20 @@
fstream outLog;
DWORD waitRes;
+ // If UserName is NULL, just return STATUS_SUCCESS
+ if (UserName == NULL) {
+ goto exit;
+ }
+
// This memory will be freed in SavePasshookChange
if ( newPassInfo = (PASS_INFO *) malloc(sizeof(PASS_INFO)) ) {
// These get freed in SavePasshookChange by calling clearSet
newPassInfo->username = (char*)malloc((UserName->Length / 2) + 1);
- newPassInfo->password = (char*)malloc((Password->Length / 2) + 1);
+ if (Password != NULL) {
+ newPassInfo->password = (char*)malloc((Password->Length / 2) + 1);
+ } else {
+ newPassInfo->password = (char*)malloc(1);
+ }
} else {
goto exit;
}
@@ -71,9 +80,13 @@
// Fill in the password change struct
if (newPassInfo->username && newPassInfo->password) {
_snprintf(newPassInfo->username, (UserName->Length / 2), "%S", UserName->Buffer);
- _snprintf(newPassInfo->password, (Password->Length / 2), "%S", Password->Buffer);
- newPassInfo->username[UserName->Length / 2] = '\0';
- newPassInfo->password[Password->Length / 2] = '\0';
+ newPassInfo->username[UserName->Length / 2] = '\0';
+ if (Password != NULL) {
+ _snprintf(newPassInfo->password, (Password->Length / 2), "%S", Password->Buffer);
+ newPassInfo->password[Password->Length / 2] = '\0';
+ } else {
+ newPassInfo->password[0] = '\0';
+ }
// Backoff
newPassInfo->backoffCount = 0;
From rmeggins at fedoraproject.org Wed Mar 25 22:25:29 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Wed, 25 Mar 2009 22:25:29 +0000 (UTC)
Subject: [Fedora-directory-commits]
directoryconsole/src/com/netscape/admin/dirserv/panel/replication
AgreementDestinationPanel.java, 1.3, 1.4
Message-ID: <20090325222529.E4B9770133@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv965/directoryconsole/src/com/netscape/admin/dirserv/panel/replication
Modified Files:
AgreementDestinationPanel.java
Log Message:
Resolves: bug 483660
Bug Description: Replication and Sync agreement edit should not allow change to/from LDAPS
Reviewed by: nhosoi (Thanks!)
Fix Description: If simple auth was being used, the simple auth radio button was not selected. This patch makes sure it is selected if it needs to be.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Index: AgreementDestinationPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/replication/AgreementDestinationPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AgreementDestinationPanel.java 3 Mar 2009 01:24:26 -0000 1.3
+++ AgreementDestinationPanel.java 25 Mar 2009 22:25:27 -0000 1.4
@@ -562,9 +562,11 @@
_digestAuth.setSelected(_agreement.getUseDigestAuth());
_digestAuthDSEntry.fakeInitModel (_agreement.getUseDigestAuth() ? "on" : "off");
}
+ boolean issimple = !_agreement.getUseSSLAuth() && !_agreement.getUseDigestAuth() && !_agreement.getUseGSSAPIAuth();
if (_simpAuth != null) {
- _simpAuth.setEnabled(!_agreement.getUseSSLAuth());
- _simpAuthDSEntry.fakeInitModel (_agreement.getUseSSLAuth() ? "on" : "off");
+ _simpAuth.setEnabled(issimple);
+ _simpAuth.setSelected(issimple);
+ _simpAuthDSEntry.fakeInitModel (issimple ? "on" : "off");
}
if(_agreement.getAgreementType() == ReplicationAgreement.AGREEMENT_TYPE_AD){
From nhosoi at fedoraproject.org Fri Mar 27 16:45:44 2009
From: nhosoi at fedoraproject.org (Noriko Hosoi)
Date: Fri, 27 Mar 2009 16:45:44 +0000 (UTC)
Subject: [Fedora-directory-commits]
ldapserver/ldap/schema 01common.ldif, 1.4, 1.5
Message-ID: <20090327164544.14C6E70133@cvs1.fedora.phx.redhat.com>
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/schema
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2051
Modified Files:
01common.ldif
Log Message:
Resolves: #492562
Summary: homePhone is not RFC 1274 compliant
Description: added "homeTelephoneNumber" to the NAME list of "homePhone".
Index: 01common.ldif
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/schema/01common.ldif,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 01common.ldif 14 Jan 2009 15:07:58 -0000 1.4
+++ 01common.ldif 27 Mar 2009 16:45:41 -0000 1.5
@@ -96,7 +96,7 @@
attributeTypes: ( 0.9.2342.19200300.100.1.3 NAME ( 'mail' 'rfc822mailbox' ) DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'RFC 1274' )
attributeTypes: ( 0.9.2342.19200300.100.1.6 NAME 'roomNumber' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'RFC 1274' )
attributeTypes: ( 0.9.2342.19200300.100.1.10 NAME 'manager' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'RFC 1274' )
-attributeTypes: ( 0.9.2342.19200300.100.1.20 NAME 'homePhone' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 X-ORIGIN 'RFC 1274' )
+attributeTypes: ( 0.9.2342.19200300.100.1.20 NAME ( 'homePhone' 'homeTelephoneNumber' ) DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 X-ORIGIN 'RFC 1274' )
attributeTypes: ( 0.9.2342.19200300.100.1.21 NAME 'secretary' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'RFC 1274' )
attributeTypes: ( 0.9.2342.19200300.100.1.39 NAME 'homePostalAddress' DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'RFC 1274' )
attributeTypes: ( 0.9.2342.19200300.100.1.41 NAME ( 'mobile' 'mobileTelephoneNumber' ) DESC 'Standard LDAP attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 X-ORIGIN 'RFC 1274' )
From jmagne at fedoraproject.org Sun Mar 29 00:23:57 2009
From: jmagne at fedoraproject.org (Jack Magne)
Date: Sun, 29 Mar 2009 00:23:57 +0000 (UTC)
Subject: [Fedora-directory-commits] esc/src/lib/coolkey CoolKey.cpp,1.8,1.9
Message-ID: <20090329002357.3A85270136@cvs1.fedora.phx.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/src/lib/coolkey
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24209/coolkey
Modified Files:
CoolKey.cpp
Log Message:
Fix for #235474, remove password prompt pref for Security Officer mode.
Index: CoolKey.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/lib/coolkey/CoolKey.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoolKey.cpp 25 Jul 2007 20:43:22 -0000 1.8
+++ CoolKey.cpp 29 Mar 2009 00:23:54 -0000 1.9
@@ -266,15 +266,18 @@
CoolKeyReference reference, CoolKeyRelease release,
CoolKeyGetConfigValue getconfigvalue,CoolKeySetConfigValue setconfigvalue)
{
+ char tBuff[56];
g_Dispatch = dispatch;
g_Reference = reference;
g_Release = release;
g_GetConfigValue = getconfigvalue;
g_SetConfigValue = setconfigvalue;
- char * suppressPINPrompt =(char*) CoolKeyGetConfig("esc.disable.password.prompt");
+ char * suppressPINPrompt =(char*) CoolKeyGetConfig("esc.security.url");
+
+ PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("%s CoolKeySetCallbacks: prompt %s \n", GetTStamp(tBuff,56), suppressPINPrompt));
- if(suppressPINPrompt && !strcmp(suppressPINPrompt,"yes"))
+ if(!suppressPINPrompt)
{
PK11_SetPasswordFunc( CoolKeyVerifyPassword);
}
From jmagne at fedoraproject.org Sun Mar 29 00:37:55 2009
From: jmagne at fedoraproject.org (Jack Magne)
Date: Sun, 29 Mar 2009 00:37:55 +0000 (UTC)
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc
ESC.js, 1.21, 1.22
Message-ID: <20090329003755.17B3A70136@cvs1.fedora.phx.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26727
Modified Files:
ESC.js
Log Message:
Fix for #491003, global phone home pref.
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ESC.js 27 Feb 2009 03:31:42 -0000 1.21
+++ ESC.js 29 Mar 2009 00:37:52 -0000 1.22
@@ -54,6 +54,7 @@
const ESC_FACE_TO_FACE_MODE = "esc.face.to.face.mode";
const ESC_SECURITY_URL="esc.security.url";
const ESC_SECURE_URL="esc.secure.url";
+const ESC_GLOBAL_PHONE_HOME_URL= "esc.global.phone.home.url";
const ESC_HIDE_FORMAT="esc.hide.format";
const CLEAN_TOKEN = "cleanToken";
@@ -292,7 +293,12 @@
return true;
}
- //Check for special key since we have no phone home info.
+ //Check for optional global phone home url.
+
+
+ if(!home) {
+ home = GetGlobalPhoneHomeUrl(keyType,keyID);
+ }
var homeRes = false;
@@ -315,6 +321,19 @@
return homeRes;
}
+//Get global phone home url if pref is set
+
+function GetGlobalPhoneHomeUrl(keyType,keyID)
+{
+
+ var globalIssuerURL=null;
+
+ globalIssuerURL = DoCoolKeyGetConfigValue(ESC_GLOBAL_PHONE_HOME_URL);
+
+ return globalIssuerURL;
+
+}
+
//Test Phone Home url in config UI
function DoPhoneHomeTest()
@@ -644,7 +663,7 @@
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
return netkey.GetCoolKeyPolicy(keyType, keyID);
} catch (e) {
- ReportException(getBundleString("errorCoolKeyGetPolicy"), e);
+ //ReportException(getBundleString("errorCoolKeyGetPolicy"), e);
return "";
}
}
From jmagne at fedoraproject.org Sun Mar 29 00:51:11 2009
From: jmagne at fedoraproject.org (Jack Magne)
Date: Sun, 29 Mar 2009 00:51:11 +0000 (UTC)
Subject: [Fedora-directory-commits] esc/src/app/xpcom CoolKeyCSP.cpp, 1.3,
1.4
Message-ID: <20090329005111.7690970136@cvs1.fedora.phx.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28330
Modified Files:
CoolKeyCSP.cpp
Log Message:
Fix for Bug# 473982, publish certs to CAPI when enrolled token inserted.
Index: CoolKeyCSP.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/CoolKeyCSP.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoolKeyCSP.cpp 25 Oct 2006 03:58:16 -0000 1.3
+++ CoolKeyCSP.cpp 29 Mar 2009 00:51:08 -0000 1.4
@@ -537,16 +537,19 @@
PR_LOG( coolKeyCSPLog, PR_LOG_DEBUG, ("CoolKeyCSPListener::RhNotifyStateChange state %d \n",aKeyState));
AutoCoolKey key(aKeyType, aKeyID);
+ int enrolled = CoolKeyIsEnrolled(&key);
switch (aKeyState)
{
- //case eCKState_KeyInserted:
+ case eCKState_KeyInserted:
case eCKState_EnrollmentComplete:
- bOK = PropCerts(&key);
+ if( enrolled) {
+ bOK = PropCerts(&key);
+ }
break;
- //case eCKState_KeyRemoved:
+ case eCKState_KeyRemoved:
case eCKState_FormatComplete:
bOK = RemoveCerts(&key);
From jmagne at fedoraproject.org Sun Mar 29 00:54:59 2009
From: jmagne at fedoraproject.org (Jack Magne)
Date: Sun, 29 Mar 2009 00:54:59 +0000 (UTC)
Subject: [Fedora-directory-commits]
esc/src/app/xul/esc/defaults/preferences esc-prefs.js, 1.6, 1.7
Message-ID: <20090329005459.594D070136@cvs1.fedora.phx.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/defaults/preferences
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28799
Modified Files:
esc-prefs.js
Log Message:
Fix for #491003, global phone home pref.
Index: esc-prefs.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/defaults/preferences/esc-prefs.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- esc-prefs.js 27 Feb 2009 03:31:43 -0000 1.6
+++ esc-prefs.js 29 Mar 2009 00:54:57 -0000 1.7
@@ -29,9 +29,6 @@
pref("esc.windows.do.capi","yes");
-#Do we disable the password prompt ?
-
-pref("esc.disable.password.prompt","yes");
#Sample Security Officer Enrollment UI
@@ -39,8 +36,14 @@
#Sample Security Officer Workstation UI
-#pref("esc.security.url","https://test.host.com:7889/cgi-bin/sow/welcome.cgi");
+#pref("esc.security.url","https://dhcp-170.sjc.redhat.com:7889/cgi-bin/sow/welcome.cgi");
#Hide the format button or not.
pref("esc.hide.format","no");
+
+
+#Use this if you absolutely want a global phone home url for all tokens
+#Not recommended!
+
+#pref("esc.global.phone.home.url","http:/test.host.com:7888/cgi-bin/home/index.cgi");
From nkinder at fedoraproject.org Mon Mar 30 18:15:32 2009
From: nkinder at fedoraproject.org (Nathan Kinder)
Date: Mon, 30 Mar 2009 18:15:32 +0000 (UTC)
Subject: [Fedora-directory-commits] winsync/passwordsync/passsync
passsync.mak, 1.8, 1.9 service.cpp, 1.7, 1.8 syncserv.cpp,
1.15, 1.16
Message-ID: <20090330181532.3637270136@cvs1.fedora.phx.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passsync
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv348/passwordsync/passsync
Modified Files:
passsync.mak service.cpp syncserv.cpp
Log Message:
Related: 490048
Summary: Fixed debug passsync builds.
Index: passsync.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/passsync.mak,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- passsync.mak 16 Feb 2009 22:20:21 -0000 1.8
+++ passsync.mak 30 Mar 2009 18:15:29 -0000 1.9
@@ -90,18 +90,23 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cpp{$(INTDIR)}.obj::
+{.\}.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
+{..\}.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -167,18 +172,23 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\passsync.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
-.cpp{$(INTDIR)}.obj::
+{.\}.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
+{..\}.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -229,34 +239,3 @@
!ENDIF
!ENDIF
-
-!IF "$(CFG)" == "passsync - Win32 Release" || "$(CFG)" == "passsync - Win32 Debug"
-SOURCE=.\ntservice.cpp
-
-"$(INTDIR)\ntservice.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=..\passhand.cpp
-
-"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\service.cpp
-
-"$(INTDIR)\service.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\subuniutil.cpp
-
-"$(INTDIR)\subuniutil.obj" : $(SOURCE) "$(INTDIR)"
-
-
-SOURCE=.\syncserv.cpp
-
-"$(INTDIR)\syncserv.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF
-
Index: service.cpp
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/service.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- service.cpp 16 Feb 2009 22:20:21 -0000 1.7
+++ service.cpp 30 Mar 2009 18:15:29 -0000 1.8
@@ -58,11 +58,6 @@
//#include "dsperson.h"
#include "synchcmds.h"
#include "dssynch.h"
-
-#ifdef _DEBUG
-void doDebug( PassSyncService *pSynch );
-#endif // _DEBUG
-
//#include
/////////////////////////////////////////////////////////////////
@@ -330,9 +325,6 @@
exit(theSynch.m_Status.dwWin32ExitCode);
- ////////// That's it - the rest is debugging stuff //////
-#ifdef _DEBUG
- doDebug( &theSynch );
-#endif
+ ////////// That's it //////
return 0;
}
Index: syncserv.cpp
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passsync/syncserv.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- syncserv.cpp 13 Feb 2009 23:39:44 -0000 1.15
+++ syncserv.cpp 30 Mar 2009 18:15:29 -0000 1.16
@@ -504,6 +504,11 @@
int result = 0;
char searchFilter[SYNCSERV_BUF_SIZE];
+ if (username == NULL)
+ {
+ goto exit;
+ }
+
if (results != NULL) {
ldap_msgfree(results);
results = NULL;
From nkinder at fedoraproject.org Mon Mar 30 18:15:32 2009
From: nkinder at fedoraproject.org (Nathan Kinder)
Date: Mon, 30 Mar 2009 18:15:32 +0000 (UTC)
Subject: [Fedora-directory-commits] winsync/passwordsync/passhook
passhook.mak, 1.11, 1.12
Message-ID: <20090330181532.2F4D87013C@cvs1.fedora.phx.redhat.com>
Author: nkinder
Update of /cvs/dirsec/winsync/passwordsync/passhook
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv348/passwordsync/passhook
Modified Files:
passhook.mak
Log Message:
Related: 490048
Summary: Fixed debug passsync builds.
Index: passhook.mak
===================================================================
RCS file: /cvs/dirsec/winsync/passwordsync/passhook/passhook.mak,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- passhook.mak 16 Feb 2009 22:37:32 -0000 1.11
+++ passhook.mak 30 Mar 2009 18:15:29 -0000 1.12
@@ -94,11 +94,16 @@
$(CPP_PROJ) $<
<<
-.cpp{$(INTDIR)}.obj::
+{.\}.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
+{..\}.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -172,11 +177,16 @@
$(CPP_PROJ) $<
<<
-.cpp{$(INTDIR)}.obj::
+{.\}.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
+{..\}.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -228,19 +238,3 @@
!ENDIF
!ENDIF
-
-!IF "$(CFG)" == "passhook - Win32 Release" || "$(CFG)" == "passhook - Win32 Debug"
-SOURCE=..\passhand.cpp
-
-"$(INTDIR)\passhand.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\passhook.cpp
-
-"$(INTDIR)\passhook.obj" : $(SOURCE) "$(INTDIR)"
-
-
-
-!ENDIF
-
From jmagne at fedoraproject.org Mon Mar 30 22:03:02 2009
From: jmagne at fedoraproject.org (Jack Magne)
Date: Mon, 30 Mar 2009 22:03:02 +0000 (UTC)
Subject: [Fedora-directory-commits] esc/win32 build.sh,1.7,1.8
Message-ID: <20090330220302.9F3877013B@cvs1.fedora.phx.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30357
Modified Files:
build.sh
Log Message:
Bump version no.
Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.sh 27 Feb 2009 21:51:20 -0000 1.7
+++ build.sh 30 Mar 2009 22:03:00 -0000 1.8
@@ -76,7 +76,7 @@
#ESC values
ESC_NAME=esc
-ESC_VERSION_NO=1.1.0-2
+ESC_VERSION_NO=1.1.0-3
#Cygwin values
From jmagne at fedoraproject.org Mon Mar 30 22:05:43 2009
From: jmagne at fedoraproject.org (Jack Magne)
Date: Mon, 30 Mar 2009 22:05:43 +0000 (UTC)
Subject: [Fedora-directory-commits] esc/win32 setup.iss,1.5,1.6
Message-ID: <20090330220543.C4D217013B@cvs1.fedora.phx.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30998
Modified Files:
setup.iss
Log Message:
Bump version no.
Index: setup.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/setup.iss,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- setup.iss 27 Feb 2009 21:51:20 -0000 1.5
+++ setup.iss 30 Mar 2009 22:05:41 -0000 1.6
@@ -4,28 +4,27 @@
[Setup]
AppName=Smart Card Manager
AppMutex=ESCMutex
-AppVerName=Smart Card Manager 1.1.0-2
-AppPublisher=Fedora.
+AppVerName=Smart Card Manager 1.1.0-3
+AppPublisher=Red Hat, Inc.
CreateAppDir=true
Compression=lzma
SolidCompression=true
MinVersion=0,5.0.2195
ShowLanguageDialog=yes
-OutputBaseFilename=SmartCardManagerSetup-1.1.0-2.win32.i386
-DefaultDirName={pf}\Fedora\ESC
+OutputBaseFilename=SmartCardManagerSetup-1.1.0-3.win32.i386
+DefaultDirName={pf}\Red Hat\ESC
DisableProgramGroupPage=false
-DefaultGroupName=Fedora
+DefaultGroupName=Red Hat
SetupIconFile=BUILD\ESC\components\esc.ico
UninstallDisplayIcon={app}\components\esc.ico
-;WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp
-WizardImageFile=esc-image-large.bmp
+WizardImageFile=BUILD\ESC\chrome\content\esc\esc-image-large.bmp
WizardSmallImageFile=BUILD\ESC\components\esc.bmp
AllowNoIcons=yes
LicenseFile=esc-license.txt
InfoBeforeFile=info-before.txt
InfoAfterFile=info-after.txt
PrivilegesRequired=admin
-VersionInfoVersion=1.1.0.2
+VersionInfoVersion=1.1.0.3
[Files]
@@ -42,11 +41,9 @@
Source: BUILD\egate\egaterdr.sys; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\egdrvins1.dll; DestDir: {win}\egate2.4; Flags: uninsneveruninstall
Source: BUILD\egate\eginstall.exe; DestDir: {win}\egate2.4; Flags: ignoreversion
-Source: BUILD\pk11install.exe; DestDir: {app}\PKCS11
-
-;Files related to CSP, comment out if not available
Source: BUILD\clkcsp.dll; DestDir: {sys}; Flags: regserver restartreplace
Source: BUILD\cspres.dll; DestDir: {sys}; Flags: restartreplace
+Source: BUILD\pk11install.exe; DestDir: {app}\PKCS11
Source: BUILD\clkcsp.sig; DestDir: {sys}
Source: BUILD\atl71.dll; DestDir: {sys}; Flags: uninsneveruninstall onlyifdoesntexist
@@ -447,10 +444,7 @@
LogFile=inst.log
LogFileAppend=false
[Registry]
-
-;The following lines register the CSP. Comment out if not available
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Defaults\Provider\CoolKey PKCS #11 CSP; ValueType: string; ValueName: PKCS11Module; ValueData: coolkeypk11.dll; Flags: uninsdeletekey
-
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATR; ValueData: 3b 75 94 00 00 62 02 02 00 00
From rmeggins at fedoraproject.org Mon Mar 30 22:32:40 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Mon, 30 Mar 2009 22:32:40 +0000 (UTC)
Subject: [Fedora-directory-commits] ldapserver configure.ac, 1.59,
1.60 aclocal.m4, 1.81, 1.82 configure, 1.102, 1.103 missing,
1.60, 1.61 install-sh, 1.60, 1.61 depcomp, 1.60, 1.61 compile,
1.53, 1.54 Makefile.in, 1.105, 1.106 config.sub, 1.59,
1.60 config.guess, 1.59, 1.60
Message-ID: <20090330223240.3B43A7013B@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6706
Modified Files:
configure.ac aclocal.m4 configure missing install-sh depcomp
compile Makefile.in config.sub config.guess
Log Message:
bump version to 1.2.0
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- configure.ac 17 Mar 2009 01:00:25 -0000 1.59
+++ configure.ac 30 Mar 2009 22:32:35 -0000 1.60
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
# This version is the version returned by ns-slapd -v
-AC_INIT([dirsrv], [1.1.4], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv], [1.2.0], [http://bugzilla.redhat.com/])
# AC_CONFIG_HEADER must be called right after AC_INIT.
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- configure 17 Mar 2009 01:00:25 -0000 1.102
+++ configure 30 Mar 2009 22:32:35 -0000 1.103
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dirsrv 1.1.4.
+# Generated by GNU Autoconf 2.59 for dirsrv 1.2.0.
#
# Report bugs to .
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='dirsrv'
PACKAGE_TARNAME='dirsrv'
-PACKAGE_VERSION='1.1.4'
-PACKAGE_STRING='dirsrv 1.1.4'
+PACKAGE_VERSION='1.2.0'
+PACKAGE_STRING='dirsrv 1.2.0'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -962,7 +962,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dirsrv 1.1.4 to adapt to many kinds of systems.
+\`configure' configures dirsrv 1.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1028,7 +1028,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dirsrv 1.1.4:";;
+ short | recursive ) echo "Configuration of dirsrv 1.2.0:";;
esac
cat <<\_ACEOF
@@ -1234,7 +1234,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-dirsrv configure 1.1.4
+dirsrv configure 1.2.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1248,7 +1248,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dirsrv $as_me 1.1.4, which was
+It was created by dirsrv $as_me 1.2.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1894,7 +1894,7 @@
# Define the identity of the package.
PACKAGE='dirsrv'
- VERSION='1.1.4'
+ VERSION='1.2.0'
cat >>confdefs.h <<_ACEOF
@@ -26865,7 +26865,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by dirsrv $as_me 1.1.4, which was
+This file was extended by dirsrv $as_me 1.2.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26928,7 +26928,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-dirsrv config.status 1.1.4
+dirsrv config.status 1.2.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
From rmeggins at fedoraproject.org Tue Mar 31 16:48:26 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 31 Mar 2009 16:48:26 +0000 (UTC)
Subject: [Fedora-directory-commits] fedora-idm-console
fedora-idm-console.spec, 1.4, 1.5
Message-ID: <20090331164826.5F0E57013C@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/fedora-idm-console
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14015
Modified Files:
fedora-idm-console.spec
Log Message:
update for 1.1.3
Index: fedora-idm-console.spec
===================================================================
RCS file: /cvs/dirsec/fedora-idm-console/fedora-idm-console.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-idm-console.spec 14 Jan 2008 19:33:08 -0000 1.4
+++ fedora-idm-console.spec 31 Mar 2009 16:48:23 -0000 1.5
@@ -1,5 +1,5 @@
%define major_version 1.1
-%define minor_version 1
+%define minor_version 3
Name: fedora-idm-console
Version: %{major_version}.%{minor_version}
@@ -13,12 +13,12 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
Requires: idm-console-framework >= 1.1
-Requires: java-1.7.0-icedtea
+Requires: java >= 1:1.6.0
BuildRequires: ant >= 1.6.2
BuildRequires: ldapjdk
BuildRequires: jss >= 4.2
BuildRequires: idm-console-framework >= 1.1
-BuildRequires: java-1.7.0-icedtea-devel
+BuildRequires: java-devel >= 1:1.6.0
%description
A Java based remote management console used for Managing Fedora
@@ -57,6 +57,12 @@
%{_bindir}/%{name}
%changelog
+* Tue Mar 31 2009 Rich Megginson 1.1.3-1
+- the 1.1.3 release
+
+* Tue Apr 15 2008 Rich Megginson 1.1.1-2
+- use java > 1.5.0 for requirements
+
* Thu Jan 10 2008 Rich Megginson 1.1.1-1
- this is the fedora package review candidate
- added LICENSE file
From rmeggins at fedoraproject.org Tue Mar 31 17:28:55 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 31 Mar 2009 17:28:55 +0000 (UTC)
Subject: [Fedora-directory-commits] directoryconsole fedora-ds-console.spec,
1.7, 1.8
Message-ID: <20090331172855.3C00A7013C@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/directoryconsole
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24548
Modified Files:
fedora-ds-console.spec
Log Message:
updated for 1.1.3
Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-ds-console.spec 4 Sep 2008 15:27:52 -0000 1.7
+++ fedora-ds-console.spec 31 Mar 2009 17:28:53 -0000 1.8
@@ -1,5 +1,5 @@
%define major_version 1.1
-%define minor_version 2
+%define minor_version 3
%define shortname fedora-ds
%define pkgname dirsrv
@@ -19,8 +19,8 @@
Requires: %{shortname}-admin
BuildRequires: ant >= 1.6.2
BuildRequires: ldapjdk
-BuildRequires: idm-console-framework
-BuildRequires: java-devel
+BuildRequires: idm-console-framework >= 1.1
+BuildRequires: java-devel >= 1:1.6.0
%description
A Java based remote management console used for Managing Fedora
@@ -69,6 +69,12 @@
%doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
%changelog
+* Tue Mar 31 2009 Rich Megginson 1.1.3-1
+- this is the 1.1.3 release
+
+* Thu Sep 4 2008 Rich Megginson 1.1.2-2
+- fixed incorrect source
+
* Thu Jul 3 2008 Rich Megginson 1.1.2-1
- fix threading issues with create new ds instance dialog
From rmeggins at fedoraproject.org Tue Mar 31 17:43:04 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 31 Mar 2009 17:43:04 +0000 (UTC)
Subject: [Fedora-directory-commits] admservconsole
fedora-ds-admin-console.spec, 1.2, 1.3
Message-ID: <20090331174304.B46BC7013C@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/admservconsole
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28443/admservconsole
Modified Files:
fedora-ds-admin-console.spec
Log Message:
for the 1.1.3 release
Index: fedora-ds-admin-console.spec
===================================================================
RCS file: /cvs/dirsec/admservconsole/fedora-ds-admin-console.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-ds-admin-console.spec 4 Sep 2008 15:37:34 -0000 1.2
+++ fedora-ds-admin-console.spec 31 Mar 2009 17:43:02 -0000 1.3
@@ -1,5 +1,5 @@
%define major_version 1.1
-%define minor_version 2
+%define minor_version 3
%define dsname fedora-ds
%define shortname fedora-admin
@@ -21,7 +21,7 @@
BuildRequires: ant >= 1.6.2
BuildRequires: ldapjdk
BuildRequires: idm-console-framework
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1:1.6.0
Obsoletes: fedora-admin-console
%description
@@ -71,6 +71,9 @@
%doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
%changelog
+* Tue Mar 31 2009 Rich Megginson 1.1.3-1
+- this is the 1.1.3 release
+
* Thu Jul 3 2008 Rich Megginson 1.1.2-1
- disable SSLv2 settings
From rmeggins at fedoraproject.org Tue Mar 31 17:59:51 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 31 Mar 2009 17:59:51 +0000 (UTC)
Subject: [Fedora-directory-commits]
adminserver/pkg fedora-ds-admin.spec, 1.4, 1.5
Message-ID: <20090331175951.1033E7013C@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminserver/pkg
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1107/adminserver/pkg
Modified Files:
fedora-ds-admin.spec
Log Message:
for the 1.1.7 release
Index: fedora-ds-admin.spec
===================================================================
RCS file: /cvs/dirsec/adminserver/pkg/fedora-ds-admin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-ds-admin.spec 4 Sep 2008 14:44:45 -0000 1.4
+++ fedora-ds-admin.spec 31 Mar 2009 17:59:48 -0000 1.5
@@ -3,7 +3,7 @@
Summary: Fedora Administration Server (admin)
Name: fedora-ds-admin
-Version: 1.1.6
+Version: 1.1.7
Release: 1%{?dist}
License: GPLv2
URL: http://directory.fedoraproject.org/
@@ -76,10 +76,54 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+# save permission info in temp file
+# if upgrading
+if [ "$1" -gt 1 ] ; then
+ set -x
+ mydt=`date +%Y%m%d`
+ mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
+ perm1=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
+ if [ -z "$perm1" ] ; then
+ perm1=0
+ fi
+ own1=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv 2> /dev/null`
+ if [ -z "$own1" ] ; then
+ own1=0
+ fi
+ perm2=`stat --format=%%a %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
+ if [ -z "$perm2" ] ; then
+ perm2=0
+ fi
+ own2=`stat --format=%%U:%%G %{_sysconfdir}/%{pkgname}/admin-serv/console.conf 2> /dev/null`
+ if [ -z "$own2" ] ; then
+ own2=0
+ fi
+ echo $perm1 $own1 $perm2 $own2 > $mytmpfile
+fi
+
%post
/sbin/chkconfig --add %{pkgname}-admin
/sbin/ldconfig
-
+# if installing for the first time, make sure the config
+# directory and file have the correct permissions
+# the setup script is used to "fix" these
+if [ "$1" -gt 1 ]; then
+ set -x
+ mydt=`date +%Y%m%d`
+ mytmpfile=${TMPDIR:-/tmp}/$mydt.$PPID
+ if [ ! -f $mytmpfile ] ; then
+ echo Error: upgrade temp file $mytmpfile not found
+ exit 1
+ fi
+ cat $mytmpfile | while read perm1 own1 perm2 own2 ; do
+ chmod $perm1 %{_sysconfdir}/%{pkgname}/admin-serv
+ chown $own1 %{_sysconfdir}/%{pkgname}/admin-serv
+ chmod $perm2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
+ chown $own2 %{_sysconfdir}/%{pkgname}/admin-serv/console.conf
+ done
+ rm -f $mytmpfile
+fi
%preun
if [ $1 = 0 ]; then
@@ -100,8 +144,18 @@
%{_sbindir}/*
%{_libdir}/*.so.*
%{_libdir}/%{pkgname}
+%{_mandir}/man8/*
%changelog
+* Tue Mar 31 2009 Rich Megginson - 1.1.7-1
+- this is the 1.1.7 release
+- added man pages for setup, migration, remove commands
+- better error handling for command line utilities
+- fixed remove from console
+- added remove-ds-admin.pl
+- added pre and post sections in order to preserve the permissions and ownerships
+- CVS tag FedoraDirSrvAdmin_1_1_7_RC1 FedoraDirSrvAdmin_1_1_7_RC1_20090331
+
* Mon Jul 14 2008 Rich Megginson - 1.1.6-1
- This is for the fedora ds 1.1.2 release
From jmagne at fedoraproject.org Tue Mar 31 18:36:01 2009
From: jmagne at fedoraproject.org (Jack Magne)
Date: Tue, 31 Mar 2009 18:36:01 +0000 (UTC)
Subject: [Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc
ESC.js, 1.22, 1.23
Message-ID: <20090331183601.548467013C@cvs1.fedora.phx.redhat.com>
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10967
Modified Files:
ESC.js
Log Message:
Allow ESC UI to re-enroll an enrolled token, #493118.
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ESC.js 29 Mar 2009 00:37:52 -0000 1.22
+++ ESC.js 31 Mar 2009 18:35:59 -0000 1.23
@@ -2302,9 +2302,9 @@
var isLoginKey = IsKeyLoginKey(keyType,keyID);
EnableItem(viewcertsbtn);
- DisableItem(enrollbtn);
- if(adminkeymenu)
- DisableItem(menu_enroll);
+ EnableItem(enrollbtn);
+ if(adminkeymenu)
+ EnableItem(menu_enroll);
if(isCool)
{
From rmeggins at fedoraproject.org Tue Mar 31 18:35:58 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 31 Mar 2009 18:35:58 +0000 (UTC)
Subject: [Fedora-directory-commits] adminutil adminutil.spec,1.7,1.8
Message-ID: <20090331183558.511C27013C@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10994
Modified Files:
adminutil.spec
Log Message:
the 1.1.8 release
Index: adminutil.spec
===================================================================
RCS file: /cvs/dirsec/adminutil/adminutil.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- adminutil.spec 22 Jun 2007 22:51:00 -0000 1.7
+++ adminutil.spec 31 Mar 2009 18:35:55 -0000 1.8
@@ -6,9 +6,9 @@
Summary: Utility library for directory server administration
Name: adminutil
-Version: 1.1.2
+Version: 1.1.8
Release: 1%{?dist}
-License: LGPL
+License: LGPLv2
URL: http://directory.fedoraproject.org/wiki/AdminUtil
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -84,6 +84,9 @@
%{_includedir}/libadmsslutil
%changelog
+* Tue Mar 31 2009 Rich Megginson - 1.1.8-1
+- this is the 1.1.8 release
+
* Fri Jun 22 2007 Rich Megginson - 1.1.2-1
- Updated version to 1.1.2
- This version fixes some memory leaks and invalid memory use
From rmeggins at fedoraproject.org Tue Mar 31 19:32:01 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 31 Mar 2009 19:32:01 +0000 (UTC)
Subject: [Fedora-directory-commits] dsgw configure.ac, 1.13,
1.14 fedora-ds-dsgw.spec, 1.1, 1.2 aclocal.m4, 1.18,
1.19 configure, 1.21, 1.22 missing, 1.17, 1.18 install-sh,
1.17, 1.18 Makefile.in, 1.22, 1.23 depcomp, 1.17,
1.18 config.sub, 1.17, 1.18 config.guess, 1.17, 1.18 compile,
1.17, 1.18
Message-ID: <20090331193202.2929E7013C@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/dsgw
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25465
Modified Files:
configure.ac fedora-ds-dsgw.spec aclocal.m4 configure missing
install-sh Makefile.in depcomp config.sub config.guess compile
Log Message:
for the 1.1.2 release
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/dsgw/configure.ac,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- configure.ac 4 Sep 2008 16:09:39 -0000 1.13
+++ configure.ac 31 Mar 2009 19:31:59 -0000 1.14
@@ -21,7 +21,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([dirsrv-gw], [1.1.1], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv-gw], [1.1.2], [http://bugzilla.redhat.com/])
AC_CONFIG_SRCDIR([dsgwutil.c])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
Index: fedora-ds-dsgw.spec
===================================================================
RCS file: /cvs/dirsec/dsgw/fedora-ds-dsgw.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-ds-dsgw.spec 4 Sep 2008 16:09:40 -0000 1.1
+++ fedora-ds-dsgw.spec 31 Mar 2009 19:31:59 -0000 1.2
@@ -2,7 +2,7 @@
Summary: Fedora Directory Server Gateway (dsgw)
Name: fedora-ds-dsgw
-Version: 1.1.1
+Version: 1.1.2
Release: 1%{?dist}
License: GPLv2
URL: http://directory.fedoraproject.org/
@@ -61,12 +61,22 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+# this has been problematic - if this directory
+# does not exist, the server will silently fail to
+# start - however, if the user has already created
+# it, we don't want to overwrite the permissions
+# on it - so we can't list it explicitly in the
+# files section
+if [ ! -d %{_localstatedir}/run/%{pkgname}/dsgw/cookies ] ; then
+ mkdir -p %{_localstatedir}/run/%{pkgname}/dsgw/cookies
+fi
+
%files
%defattr(-,root,root,-)
%doc LICENSE
%dir %{_sysconfdir}/%{pkgname}/dsgw
%config(noreplace)%{_sysconfdir}/%{pkgname}/dsgw/*.conf
-%{_localstatedir}/run/%{pkgname}/dsgw
%{_datadir}/%{pkgname}/dsgw
%{_datadir}/%{pkgname}/manual/*/dsgw
%{_datadir}/%{pkgname}/properties/dsgw
@@ -74,6 +84,9 @@
%{_libdir}/%{pkgname}/dsgw-cgi-bin
%changelog
+* Tue Mar 31 2009 Rich Megginson - 1.1.2-1
+- this is the 1.1.2 release
+
* Thu Sep 4 2008 Rich Megginson - 1.1.1-1
- this is the 1.1.1 release
Index: configure
===================================================================
RCS file: /cvs/dirsec/dsgw/configure,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure 4 Sep 2008 16:09:39 -0000 1.21
+++ configure 31 Mar 2009 19:31:59 -0000 1.22
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dirsrv-gw 1.1.1.
+# Generated by GNU Autoconf 2.59 for dirsrv-gw 1.1.2.
#
# Report bugs to .
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='dirsrv-gw'
PACKAGE_TARNAME='dirsrv-gw'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='dirsrv-gw 1.1.1'
+PACKAGE_VERSION='1.1.2'
+PACKAGE_STRING='dirsrv-gw 1.1.2'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
ac_unique_file="dsgwutil.c"
@@ -955,7 +955,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dirsrv-gw 1.1.1 to adapt to many kinds of systems.
+\`configure' configures dirsrv-gw 1.1.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1021,7 +1021,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dirsrv-gw 1.1.1:";;
+ short | recursive ) echo "Configuration of dirsrv-gw 1.1.2:";;
esac
cat <<\_ACEOF
@@ -1189,7 +1189,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-dirsrv-gw configure 1.1.1
+dirsrv-gw configure 1.1.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1203,7 +1203,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dirsrv-gw $as_me 1.1.1, which was
+It was created by dirsrv-gw $as_me 1.1.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1847,7 +1847,7 @@
# Define the identity of the package.
PACKAGE='dirsrv-gw'
- VERSION='1.1.1'
+ VERSION='1.1.2'
cat >>confdefs.h <<_ACEOF
@@ -23028,7 +23028,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by dirsrv-gw $as_me 1.1.1, which was
+This file was extended by dirsrv-gw $as_me 1.1.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23091,7 +23091,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-dirsrv-gw config.status 1.1.1
+dirsrv-gw config.status 1.1.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
From rmeggins at fedoraproject.org Tue Mar 31 19:58:07 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 31 Mar 2009 19:58:07 +0000 (UTC)
Subject: [Fedora-directory-commits] directoryconsole build.properties, 1.10,
1.11 fedora-ds-console.spec, 1.8, 1.9
Message-ID: <20090331195807.E5CE77013C@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/directoryconsole
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1510
Modified Files:
build.properties fedora-ds-console.spec
Log Message:
version must correspond to ds base version - 1.2.0
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.properties 17 Dec 2008 00:21:38 -0000 1.10
+++ build.properties 31 Mar 2009 19:58:05 -0000 1.11
@@ -21,8 +21,8 @@
lang=en
ldapconsole.root=..
-ldapconsole.version=1.1.3
-ldapconsole.gen.version=1.1
+ldapconsole.version=1.2.0
+ldapconsole.gen.version=1.2
brand=fedora
ldapconsole.name=${brand}-ds-${ldapconsole.version}
ldapconsole.gen.name=${brand}-ds-${ldapconsole.gen.version}
Index: fedora-ds-console.spec
===================================================================
RCS file: /cvs/dirsec/directoryconsole/fedora-ds-console.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-ds-console.spec 31 Mar 2009 17:28:53 -0000 1.8
+++ fedora-ds-console.spec 31 Mar 2009 19:58:05 -0000 1.9
@@ -1,5 +1,5 @@
-%define major_version 1.1
-%define minor_version 3
+%define major_version 1.2
+%define minor_version 0
%define shortname fedora-ds
%define pkgname dirsrv
@@ -69,6 +69,9 @@
%doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
%changelog
+* Tue Mar 31 2009 Rich Megginson 1.2.0-1
+- this is the 1.2.0 release
+
* Tue Mar 31 2009 Rich Megginson 1.1.3-1
- this is the 1.1.3 release
From rmeggins at fedoraproject.org Tue Mar 31 20:52:44 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 31 Mar 2009 20:52:44 +0000 (UTC)
Subject: [Fedora-directory-commits] console idm-console-framework.spec, 1.5,
1.6
Message-ID: <20090331205244.F060E7013C@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/console
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17915
Modified Files:
idm-console-framework.spec
Log Message:
bump version for 1.1.3 release
Index: idm-console-framework.spec
===================================================================
RCS file: /cvs/dirsec/console/idm-console-framework.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- idm-console-framework.spec 4 Sep 2008 15:07:42 -0000 1.5
+++ idm-console-framework.spec 31 Mar 2009 20:52:42 -0000 1.6
@@ -1,5 +1,5 @@
%define major_version 1.1
-%define minor_version 2
+%define minor_version 3
Name: idm-console-framework
Version: %{major_version}.%{minor_version}
@@ -14,12 +14,13 @@
BuildArch: noarch
Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2
Requires: ldapjdk
-Requires: jss
-Requires: java
+Requires: jss >= 4.2
+# Urge use of OpenJDK for runtime
+Requires: java >= 1:1.6.0
+BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 1.6.2
BuildRequires: ldapjdk
-BuildRequires: jss
-BuildRequires: java-devel
+BuildRequires: jss >= 4.2
%description
A Java Management Console framework used for remote server management.
@@ -75,6 +76,10 @@
%{_javadir}/idm-console-nmclf_en.jar
%changelog
+* Tue Jan 6 2009 Rich Megginson 1.1.3-1
+- this is the 1.1.3 release
+- use the epoch with the java-devel version
+
* Wed Jul 2 2008 Rich Megginson 1.1.2-1
- numerous fixes for threading issues and help for debugging and eclipse
From rmeggins at fedoraproject.org Tue Mar 31 20:53:10 2009
From: rmeggins at fedoraproject.org (Richard Allen Megginson)
Date: Tue, 31 Mar 2009 20:53:10 +0000 (UTC)
Subject: [Fedora-directory-commits] console idm-console-framework.spec, 1.6,
1.7
Message-ID: <20090331205310.62A757013C@cvs1.fedora.phx.redhat.com>
Author: rmeggins
Update of /cvs/dirsec/console
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17978
Modified Files:
idm-console-framework.spec
Log Message:
fix date in changelog
Index: idm-console-framework.spec
===================================================================
RCS file: /cvs/dirsec/console/idm-console-framework.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- idm-console-framework.spec 31 Mar 2009 20:52:42 -0000 1.6
+++ idm-console-framework.spec 31 Mar 2009 20:53:08 -0000 1.7
@@ -76,7 +76,7 @@
%{_javadir}/idm-console-nmclf_en.jar
%changelog
-* Tue Jan 6 2009 Rich Megginson 1.1.3-1
+* Tue Mar 31 2009 Rich Megginson 1.1.3-1
- this is the 1.1.3 release
- use the epoch with the java-devel version