[Fedora-directory-commits] ldapserver/ldap/admin/src create_instance.c, 1.52, 1.53
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17061
Modified Files:
create_instance.c
Log Message:
Resolves: 235143
Summary: Set correct default nsslapd-saslpath config setting on non-Linux platforms.
Index: create_instance.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/create_instance.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- create_instance.c 30 Mar 2007 18:12:30 -0000 1.52
+++ create_instance.c 3 Apr 2007 23:07:43 -0000 1.53
@@ -4318,7 +4318,7 @@
* cf->tmp_dir: <localstatedir>/tmp/PACKAGE_NAME/slapd-<servid>
* cf->ldif_dir: <datadir>/<brand-ds>/ldif
* cf->cert_dir: <sysconfdir>/PACKAGE_NAME/slapd-<servid>
- * cf->sasl_path: <sroot>/sasl2
+ * cf->sasl_path: %{_libdir}/sasl2
* cf->plugin_dir: <sroot>/plugins
*
* NOTES:
@@ -4379,7 +4379,7 @@
and always set it in the conf file. */
else
{
- cf->sasl_path = PR_smprintf("%s%csasl2", cf->sroot, FILE_PATHSEP);
+ cf->sasl_path = PR_smprintf("%s%s%csasl2", prefix, LIBDIR, FILE_PATHSEP);
}
#endif
cf->plugin_dir = PR_smprintf("%s%cplugins", cf->sroot, FILE_PATHSEP);
17 years, 1 month
- 1
- 0
[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.11, 1.12
by Doctor Conrad
Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2060
Modified Files:
ESC.js
Log Message:
Update admin table row correctly with phone home data.
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ESC.js 3 Mar 2007 02:46:36 -0000 1.11
+++ ESC.js 3 Apr 2007 20:25:09 -0000 1.12
@@ -2249,6 +2249,7 @@
}
function UpdateAdminListRow( keyType, keyID)
{
+
if(!gAdminPage)
return;
@@ -2527,6 +2528,7 @@
{
recordMessage("EnrollCoolKey failed.");
}
+
if(gAdminPage)
{
UpdateAdminListRow(keyType,keyID);
@@ -3778,11 +3780,14 @@
UpdateEnrollmentArea(keyType,keyID,1);
}
- if(gAdminPage)
+
+ var adminWnd = IsPageWindowPresent(ADMIN_WINDOW);
+
+ if(adminWnd)
{
- SelectRowByKeyID(keyType, keyID);
- UpdateAdminListRow(keyType,keyID);
- UpdateAdminKeyDetailsArea(keyType,keyID);
+ adminWnd.SelectRowByKeyID(keyType, keyID);
+ adminWnd.UpdateAdminListRow(keyType,keyID);
+ adminWnd.UpdateAdminKeyDetailsArea(keyType,keyID);
}
}
17 years, 1 month
- 1
- 0