[Fedora-directory-commits] ldapserver nsdefs.mk, 1.11.2.1, 1.11.2.2 ldapserver.spec.tmpl, 1.10.2.2, 1.10.2.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19966
Modified Files:
Tag: Directory71RtmBranch
nsdefs.mk ldapserver.spec.tmpl
Log Message:
[167982] Service Pack framework
1) added patch info files and a perl script to process the info (RPM)
2) modified makefiles to create RPM based as well as setupsdk based SP package
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- nsdefs.mk 31 Aug 2005 21:40:45 -0000 1.11.2.1
+++ nsdefs.mk 10 Sep 2005 00:41:45 -0000 1.11.2.2
@@ -238,7 +238,8 @@
NSPR_DIR=nspr
endif
NSPR_BASENAME=libnspr21
-PRODUCT="Fedora Directory Server"
+PRODUCTCORE=Fedora Directory Server
+PRODUCT="$(PRODUCTCORE)"
PRODUCT_IS_DIRECTORY_SERVER=1
INSTANCE_NAME_PREFIX="Directory Server"
DIR=slapd
@@ -267,6 +268,7 @@
DIR_VERSION:=7.1 SP1
NOSP_DIR_VERSION:=7.1SP1
DIR_NORM_VERSION:=7.1
+PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)"
# When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must
# update all of the .exp and .def files by executing the following command:
# cd ldap/libraries; gmake exportfiles
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- ldapserver.spec.tmpl 7 Sep 2005 16:24:44 -0000 1.10.2.2
+++ ldapserver.spec.tmpl 10 Sep 2005 00:41:46 -0000 1.10.2.3
@@ -91,10 +91,44 @@
%defattr(-,root,root,-)
%{prefix}
+%pre
+# in case upgrade, need to shutdown the servers before the installation
+ls $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-* > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+ for instance in `ls -d $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-*`
+ do
+ if [ -f $instance/logs/pid ]; then
+ pid=`cat $instance/logs/pid`
+ psval=`ps -ef | egrep $pid`
+ if [ "$psval" != "" ]; then
+ $instance/stop-slapd
+ fi
+ fi
+ done
+fi
+if [ -f $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/admin-serv/logs/pid ]; then
+ pid=`cat $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/admin-serv/logs/pid`
+ psval=`ps -ef | egrep $pid`
+ if [ "$psval" != "" ]; then
+ $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/stop-admin
+ fi
+fi
+
%post
+# in case upgrade, need to start the servers before running setup
+ls $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-* > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+ for instance in `ls -d $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/slapd-*`
+ do
+ $instance/start-slapd
+ done
+fi
+if [ -f $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/start-admin ]; then
+ $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/start-admin
+fi
echo ""
if [ -z "$RPM_INSTALL_PREFIX" ]; then
- RPM_INSTALL_PREFIX=%{prefix}
+ RPM_INSTALL_PREFIX=%{prefix}
fi
echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers."
18 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.9.2.1, 1.9.2.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17156
Modified Files:
Tag: Directory71RtmBranch
setup
Log Message:
[160589] IBM JVM breaks on some machines/kernels : admin server fails to start
1) set an environment variable JAVA_COMPILER=NONE
2) added -Djava.compiler=NONE to jvm.option in admin-serv/config/jvm12.conf
3) added reconfig option "-r" to admin server ns-config and ns-update.
Without passing the option, admin server's config file (e.g.,
server.xml) are not properly updated.
Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- setup 2 Sep 2005 23:30:49 -0000 1.9.2.1
+++ setup 9 Sep 2005 22:50:37 -0000 1.9.2.2
@@ -172,6 +172,10 @@
rm -f $sroot/setup/install.inf
+# Fix for "[160589] IBM JVM breaks on some machines/kernels :
+# admin server fails to start
+JAVA_COMPILER=NONE; export JAVA_COMPILER
+
echo "INFO Begin Setup . . ." | tee -a $logfile
# cat LICENSE.txt
if ! [ $silent ]; then
@@ -251,13 +255,10 @@
# check if ds instance directory exists or not
# if it does, run ns-config with the reconfigure option
doreconfig=""
- for x in `ls -d slapd-*`
- do
- if [ -d $x ]; then
- doreconfig="-r"
- break
- fi
- done
+ ls -d slapd-* > /dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ doreconfig="-r"
+ fi
# first, run ds
cd bin/slapd/admin/bin
@@ -266,7 +267,7 @@
# next, run admin
cd bin/admin
- ./ns-config -f $inffile -l $logfile -m $installmode || doExit
+ ./ns-config -f $inffile -l $logfile -m $installmode $doreconfig || doExit
cd ../..
fi
@@ -278,7 +279,12 @@
`pwd`/bin/slapd/admin/bin/ns-update $silentarg $myargs -f $inffile | tee -a $logfile || doExit
-`pwd`/bin/admin/ns-update $silentarg $myargs -f $inffile | tee -a $logfile || doExit
+`pwd`/bin/admin/ns-update $doreconfig $silentarg $myargs -f $inffile | tee -a $logfile || doExit
+
+# Fix for "[160589] IBM JVM breaks on some machines/kernels :
+# admin server fails to start
+sed -e "s/jvm.option=\(.*\)/jvm.option=\1 -Djava.compiler=NONE/" admin-serv/config/jvm12.conf > admin-serv/config/jvm12.tmp
+mv admin-serv/config/jvm12.tmp admin-serv/config/jvm12.conf
echo "INFO Finished with setup, logfile is setup/setup.log" | tee -a $logfile
if [ -f setup/setup.log ] ; then
18 years, 6 months
[Fedora-directory-commits] console/src/com/netscape/management/client/console console.properties, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13008/src/com/netscape/management/client/console
Modified Files:
console.properties
Log Message:
167864 - Additional version 70 -> 71 changes
Index: console.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/console.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- console.properties 18 Jul 2005 00:34:15 -0000 1.1.1.1
+++ console.properties 9 Sep 2005 20:29:09 -0000 1.2
@@ -18,7 +18,7 @@
# END COPYRIGHT BLOCK
#
console-title=Fedora Management Console
-console-displayVersion=7.0
+console-displayVersion=7.1
login-username=User ID:
login-password=Password:
18 years, 6 months
[Fedora-directory-commits] console/src/com/netscape/management/client AboutDialog.java, 1.1.1.1, 1.2 default.properties, 1.1.1.1, 1.2 defaultLicense.properties, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13008/src/com/netscape/management/client
Modified Files:
AboutDialog.java default.properties defaultLicense.properties
Log Message:
167864 - Additional version 70 -> 71 changes
Index: AboutDialog.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/AboutDialog.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- AboutDialog.java 18 Jul 2005 00:34:06 -0000 1.1.1.1
+++ AboutDialog.java 9 Sep 2005 20:29:09 -0000 1.2
@@ -180,7 +180,7 @@
AboutDialog dialog = new AboutDialog(f, "Fedora Management Console");
- dialog.setProduct(UIManager.getIcon("OptionPane.warningIcon"), "Fedora Management Console\056 Console 7.0\nCopyright (C) Red Hat, Inc.", "\n\nThis software is subject to the terms of a license agreement. Please do not use the software unless you agree to all the license terms");
+ dialog.setProduct(UIManager.getIcon("OptionPane.warningIcon"), "Fedora Management Console\056 Console 7.1\nCopyright (C) Red Hat, Inc.", "\n\nThis software is subject to the terms of a license agreement. Please do not use the software unless you agree to all the license terms");
dialog.addVendor(UIManager.getIcon("OptionPane.informationIcon"), "Contains Phaos SSL encryption software from Phaos Technology Corporation. Copyright © 1998 Phaos Technology Corporation. All Rights Reserved");
dialog.addVendor(UIManager.getIcon("OptionPane.informationIcon"), "Contains encryption software from RSA Data Security, Inc. Copyright © 1994 RSA Data Security, Inc. All rights reserved.");
Index: default.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/default.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- default.properties 18 Jul 2005 00:34:08 -0000 1.1.1.1
+++ default.properties 9 Sep 2005 20:29:09 -0000 1.2
@@ -123,5 +123,5 @@
fontTab-fontProfile=Font Profile
fontTab-table_tt=Font table of screen elements and corresponding sample font
-banner-console=Fedora Management Console 7.0
+banner-console=Fedora Management Console 7.1
Index: defaultLicense.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/defaultLicense.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- defaultLicense.properties 18 Jul 2005 00:34:08 -0000 1.1.1.1
+++ defaultLicense.properties 9 Sep 2005 20:29:09 -0000 1.2
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# END COPYRIGHT BLOCK
#
-defaultAbout-dialogTitle=Fedora Management Console 7.0
+defaultAbout-dialogTitle=Fedora Management Console 7.1
defaultAbout-productLogo=com/netscape/management/client/images/logo32.gif
defaultAbout-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved.
defaultAbout-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.
18 years, 6 months
[Fedora-directory-commits] console build.xml, 1.3, 1.4 startconsole, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13008
Modified Files:
build.xml startconsole
Log Message:
167864 - Additional version 70 -> 71 changes
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 31 Aug 2005 17:05:22 -0000 1.3
+++ build.xml 9 Sep 2005 20:29:08 -0000 1.4
@@ -200,7 +200,7 @@
<section name="com.netscape.management.client.security.csr.DefaultPlugin.class">
<attribute name="UserURL" value="http://fedora.redhat.com"/>
<attribute name="UpdateURL" value="http://fedora.redhat.com"/>
- <attribute name="Description" value="Fedora Directory Project"/>
+ <attribute name="Description" value="Fedora"/>
<attribute name="Icon" value="com/netscape/management/client/images/logo16.gif"/>
</section>
</manifest>
Index: startconsole
===================================================================
RCS file: /cvs/dirsec/console/startconsole,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- startconsole 18 Jul 2005 18:07:07 -0000 1.2
+++ startconsole 9 Sep 2005 20:29:08 -0000 1.3
@@ -66,4 +66,4 @@
#
# Launch the Console
#
-cd java; $JAVA_HOME/bin/java -ms8m -mx64m -cp .:./base.jar:./mcc70_en.jar:./jss3.jar:./ldapjdk.jar:./mcc70.jar:./nmclf70_en.jar:./nmclf70.jar -Djava.library.path=../lib -Djava.util.prefs.systemRoot=. -Djava.util.prefs.userRoot=. com.netscape.management.client.console.Console $*
+cd java; $JAVA_HOME/bin/java -ms8m -mx64m -cp .:./base.jar:./mcc71_en.jar:./jss3.jar:./ldapjdk.jar:./mcc71.jar:./nmclf71_en.jar:./nmclf71.jar -Djava.library.path=../lib -Djava.util.prefs.systemRoot=. -Djava.util.prefs.userRoot=. com.netscape.management.client.console.Console $*
18 years, 6 months
[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSContentPage.java, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9834
Modified Files:
DSContentPage.java
Log Message:
Bug(s) fixed: 167761
Bug Description: Directory Server issue with Admin Console
Reviewed by: Nathan (Thanks!)
Fix Description: DSContentPage.actionSearchUG clones an LDAPConnection
for use by the search and edit windows. After invoking the search
window, it closed the connection. While this works for the actionEdit
and actionAdvancedEdit callbacks, it doesn't work here because the
search results window is invoked in a separate thread, which means the
connection was being closed out from under the result list and edit
windows. The solution is to have the LDAPConnection be closed after the
edit list window dialog is finished. I also added some additional
debugging.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: DSContentPage.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSContentPage.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- DSContentPage.java 18 Jul 2005 00:55:38 -0000 1.1.1.1
+++ DSContentPage.java 9 Sep 2005 18:23:11 -0000 1.2
@@ -1310,15 +1310,22 @@
info.setUserHost(rpLdc.getHost());
info.setUserPort(rpLdc.getPort());
// user/group window search
+ Debug.println(9, "DSContentPage.actionSearchUG: cloned connection ["
+ + rpLdc + "] isConnected=" + rpLdc.isConnected()
+ + " isAuthenticated=" + rpLdc.isAuthenticated());
ResourcePickerDlg resourcePickerDlg =
new ResourcePickerDlg( info, new SearchUG(_framework, _iconPool, rpLdc, _entryEditor),
_framework );
resourcePickerDlg.appendSearchInterface( new DSSearchPanel() );
resourcePickerDlg.show();
+
+ /* richm 09/09/2005
+ although actionEdit and actionAdvancedEdit close the ldc cloned for editing
+ purposes, we cannot do that here, because SearchUG will eventually spawn
+ a separate thread on which the editing occurs - if we close it here, we
+ may close it out from underneath the editor
+ */
- try {
- rpLdc.disconnect(); // prepareReferralConnection clones connection
- } catch (Exception ignore) {}
_connectionPool.releaseConnection(ldc);
}
}
@@ -2742,7 +2749,10 @@
protected LDAPConnection getConnectionForNode(IBrowserNodeInfo node) throws LDAPException {
- LDAPConnection ldc = _connectionPool.getConnection(node.getURL());
+ LDAPConnection ldc = _connectionPool.getConnection(node.getURL());
+ Debug.println(9, "DSContentPage.getConnectionForNode: for node [" + node + "] getting "
+ + "connection [" + ldc + "] isConnected=" + ldc.isConnected()
+ + " isAuthenticated=" + ldc.isAuthenticated());
return ldc;
}
@@ -2751,14 +2761,23 @@
* the original one and should be closed after use
*/
protected LDAPConnection prepareReferralConnection(LDAPConnection ldc) {
+ Debug.println(9, "DSContentPage.prepareReferralConnection: original connection ["
+ + ldc + "] isConnected=" + ldc.isConnected()
+ + " isAuthenticated=" + ldc.isAuthenticated());
LDAPConnection result =(LDAPConnection)ldc.clone();
LDAPSearchConstraints lsc = (LDAPSearchConstraints)ldc.getSearchConstraints();
if (!getFollowReferrals()) {
// disable referrals
lsc.setServerControls(_manageDSAITControl);
+ Debug.println(9, "DSContentPage.prepareReferralConnection: no follow referrals connection ["
+ + result + "] isConnected=" + result.isConnected()
+ + " isAuthenticated=" + result.isAuthenticated());
}
else { // follow referrals using the current credentials
+ Debug.println(9, "DSContentPage.prepareReferralConnection: follow referrals connection ["
+ + result + "] isConnected=" + result.isConnected()
+ + " isAuthenticated=" + result.isAuthenticated());
final String dn = ldc.getAuthenticationDN();
final String pw = ldc.getAuthenticationPassword();
lsc.setRebindProc(new LDAPRebind() {
@@ -2934,6 +2953,8 @@
_iconPool = iconPool;
_ldc = ldc;
_entryEditor = entryEditor;
+ Debug.println(9, "DSContentPage.SearchUG: _ldc [" + _ldc + "] isConnected=" + ldc.isConnected() +
+ " isAuthenticated=" + ldc.isAuthenticated());
}
/**
@@ -2976,9 +2997,29 @@
if (dlg.getWidth() > _frame.getWidth()) {
dlg.setSize(_frame.getWidth(), dlg.getHeight());
}
+ Debug.println(9, "DSContentPage.SearchUG.getResults: _ldc [" + _ldc + "] isConnected=" + _ldc.isConnected() +
+ " isAuthenticated=" + _ldc.isAuthenticated());
SwingUtilities.invokeLater(new Runnable() {
public void run() {
dlg.showModal();
+ /*
+ We need to close the connection that was opened in actionSearchUG and passed
+ to the constructor of SearchUG
+ */
+ try {
+ Debug.println(9, "DSContentPage.SearchUG.getResults: before disconnect connection ["
+ + _ldc + "] isConnected=" + _ldc.isConnected()
+ + " isAuthenticated=" + _ldc.isAuthenticated());
+ _ldc.disconnect(); // prepareReferralConnection clones connection
+ Debug.println(9, "DSContentPage.SearchUG.getResults: after disconnect connection ["
+ + _ldc + "] isConnected=" + _ldc.isConnected()
+ + " isAuthenticated=" + _ldc.isAuthenticated());
+ } catch (Exception ignore) {
+ Debug.println(9, "DSContentPage.SearchUG.getResults: caught exception ["
+ + ignore + "] disconnecting connection ["
+ + _ldc + "] isConnected=" + _ldc.isConnected()
+ + " isAuthenticated=" + _ldc.isAuthenticated());
+ }
}
});
}
@@ -4673,7 +4714,10 @@
* @param isAdvanced set this option to true in order to display ALWAYS the generic property editor.
*
* @return true if the entry was modified, false otherwise */
- public boolean editObject(String entryDn, LDAPConnection ldc, boolean isAdvanced) {
+ public boolean editObject(String entryDn, LDAPConnection ldc, boolean isAdvanced) {
+ Debug.println(9, "DSContentPage.editObject: begin entryDN [" + entryDn
+ + "] ldc [" + ldc + "] isConnected=" + ldc.isConnected() +
+ " isAuthenticated=" + ldc.isAuthenticated());
boolean objectModified = false;
_editedObjectDn = null;
_ldc = ldc;
@@ -4693,6 +4737,15 @@
}
_allAttrs = allAttributes;
}
+
+ if (_allAttrs == null) {
+ Debug.println(9, "DSContentPage.editObject: _allAttrs == null");
+ } else {
+ for (int ii = 0; ii < _allAttrs.length; ++ii) {
+ Debug.println(9, "DSContentPage.editObject: _allAttrs[" + ii + "]=["
+ + _allAttrs[ii] + "]");
+ }
+ }
LDAPSearchConstraints searchConstraints = (LDAPSearchConstraints)_ldc.getSearchConstraints().clone();
if (!entryDn.trim().equals("")) {
@@ -4703,6 +4756,7 @@
try {
entry = _ldc.read(entryDn, _allAttrs, searchConstraints);
} catch (LDAPException lde) {
+ Debug.println("DSContentPage.editObject: LDAPException [" + lde + "]");
/* The entry could not be read... */
String[] args = {
entryDn,
18 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd libslapd.def, 1.12, 1.13
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13930
Modified Files:
libslapd.def
Log Message:
Fix for NT build failure: undefined symbols in index.c
Index: libslapd.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libslapd.def,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libslapd.def 12 Aug 2005 05:49:54 -0000 1.12
+++ libslapd.def 9 Sep 2005 00:51:52 -0000 1.13
@@ -773,10 +773,10 @@
slapi_mod_done @752
slapi_mods_done @753
operation_set_csn @754
-; entry_update_deleted_attribute @755
+ valueset_add_valuearray @755
entry_first_deleted_attribute @756
entry_next_deleted_attribute @757
-; config_get_storestateinfo @758
+ valuearray_remove_value @758
; config_set_storestateinfo @759
slapi_value_set_string @760
slapi_is_loglevel_set @761
18 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd libslapd.def, 1.11.2.1, 1.11.2.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13898
Modified Files:
Tag: Directory71RtmBranch
libslapd.def
Log Message:
Fix for NT build failure: undefined symbols in index.c
Index: libslapd.def
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/libslapd.def,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- libslapd.def 26 Aug 2005 15:44:35 -0000 1.11.2.1
+++ libslapd.def 9 Sep 2005 00:49:24 -0000 1.11.2.2
@@ -773,10 +773,10 @@
slapi_mod_done @752
slapi_mods_done @753
operation_set_csn @754
-; entry_update_deleted_attribute @755
+ valueset_add_valuearray @755
entry_first_deleted_attribute @756
entry_next_deleted_attribute @757
-; config_get_storestateinfo @758
+ valuearray_remove_value @758
; config_set_storestateinfo @759
slapi_value_set_string @760
slapi_is_loglevel_set @761
18 years, 6 months
[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.10.2.1, 1.10.2.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25953
Modified Files:
Tag: Directory71RtmBranch
ldapserver.spec.tmpl
Log Message:
165228 - Don't have RPM auto-generate provides list.
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- ldapserver.spec.tmpl 31 Aug 2005 21:40:45 -0000 1.10.2.1
+++ ldapserver.spec.tmpl 7 Sep 2005 16:24:44 -0000 1.10.2.2
@@ -55,6 +55,8 @@
# Without Autoreq: 0, rpmbuild finds all sorts of crazy
# dependencies that we don't care about, and refuses to install
Autoreq: 0
+# Don't automatically generate provides list
+AutoProv: 0
# Without Requires: something, rpmbuild will abort!
Requires: perl
Prefix: /opt/%{name}
18 years, 6 months
[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.10, 1.11
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25876
Modified Files:
ldapserver.spec.tmpl
Log Message:
165228 - Don't have RPM auto-generate provides list
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ldapserver.spec.tmpl 10 May 2005 20:49:43 -0000 1.10
+++ ldapserver.spec.tmpl 7 Sep 2005 16:14:16 -0000 1.11
@@ -55,6 +55,8 @@
# Without Autoreq: 0, rpmbuild finds all sorts of crazy
# dependencies that we don't care about, and refuses to install
Autoreq: 0
+# Don't automatically generate provides list
+AutoProv: 0
# Without Requires: something, rpmbuild will abort!
Requires: perl
Prefix: /opt/%{name}
18 years, 6 months