[Fedora-directory-commits] ldapserver/ldap/servers/plugins/acl acleffectiverights.c, 1.8, 1.9
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/acl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12494
Modified Files:
acleffectiverights.c
Log Message:
Resolves: #456296
Summary: GER: attribute types which do not belong to an entry should not be returned with effective rights
Description: when an attribute was given to the search request and the attribute
in the list does not belong to the entry, it was returning "*:none", which was
not true. The star should be the attribute type.
Index: acleffectiverights.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/acl/acleffectiverights.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- acleffectiverights.c 27 Jun 2008 19:28:22 -0000 1.8
+++ acleffectiverights.c 23 Jul 2008 15:14:11 -0000 1.9
@@ -666,6 +666,18 @@
gerstr, gerstrsize, gerstrcap, isfirstattr, errbuf );
isfirstattr = 0;
}
+ else
+ {
+ /* if the attr does not belong to the entry,
+ "<attr>:none" is returned */
+ if (!isfirstattr)
+ {
+ _append_gerstr(gerstr, gerstrsize, gerstrcap, ", ", NULL);
+ }
+ _append_gerstr(gerstr, gerstrsize, gerstrcap, attrs[i], ":");
+ _append_gerstr(gerstr, gerstrsize, gerstrcap, "none", NULL);
+ isfirstattr = 0;
+ }
}
}
charray_free(allattrs);
15 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/syntaxes string.c, 1.9.2.2, 1.9.2.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14583
Modified Files:
Tag: Directory_Server_8_0_Branch
string.c
Log Message:
Resolves: #448831
Summary: attacker can tie up CPU in regex code (comment #11)
Description: string_filter_sub always expected SLAPI_SEARCH_TIMELIMIT and
SLAPI_OPINITIATED_TIME were set in pblock, but it was not true. Fixed to check
the container of these values first, and retrieve them only if the container is
in the pblock. Otherwise, set -1 to timelimit (no timelimit).
Index: string.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/string.c,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- string.c 11 Jul 2008 17:18:43 -0000 1.9.2.2
+++ string.c 18 Jul 2008 23:13:41 -0000 1.9.2.3
@@ -199,11 +199,18 @@
time_t time_up = 0;
time_t optime = 0; /* time op was initiated */
int timelimit = 0; /* search timelimit */
+ Operation *op = NULL;
LDAPDebug( LDAP_DEBUG_FILTER, "=> string_filter_sub\n",
0, 0, 0 );
- slapi_pblock_get( pb, SLAPI_SEARCH_TIMELIMIT, &timelimit );
- slapi_pblock_get( pb, SLAPI_OPINITIATED_TIME, &optime );
+ slapi_pblock_get( pb, SLAPI_OPERATION, &op );
+ if (NULL != op) {
+ slapi_pblock_get( pb, SLAPI_SEARCH_TIMELIMIT, &timelimit );
+ slapi_pblock_get( pb, SLAPI_OPINITIATED_TIME, &optime );
+ } else {
+ /* timelimit is not passed via pblock */
+ timelimit = -1;
+ }
/*
* (timelimit==-1) means no time limit
*/
15 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/syntaxes string.c, 1.12, 1.13
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4466
Modified Files:
string.c
Log Message:
Resolves: #448831
Summary: attacker can tie up CPU in regex code (comment #11)
Description: string_filter_sub always expected SLAPI_SEARCH_TIMELIMIT and
SLAPI_OPINITIATED_TIME were set in pblock, but it was not true. Fixed to check
the container of these values first, and retrieve them only if the container is
in the pblock. Otherwise, set -1 to timelimit (no timelimit).
Index: string.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/syntaxes/string.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- string.c 15 Jul 2008 16:49:41 -0000 1.12
+++ string.c 18 Jul 2008 22:45:36 -0000 1.13
@@ -201,11 +201,18 @@
time_t time_up = 0;
time_t optime = 0; /* time op was initiated */
int timelimit = 0; /* search timelimit */
+ Operation *op = NULL;
LDAPDebug( LDAP_DEBUG_FILTER, "=> string_filter_sub\n",
0, 0, 0 );
- slapi_pblock_get( pb, SLAPI_SEARCH_TIMELIMIT, &timelimit );
- slapi_pblock_get( pb, SLAPI_OPINITIATED_TIME, &optime );
+ slapi_pblock_get( pb, SLAPI_OPERATION, &op );
+ if (NULL != op) {
+ slapi_pblock_get( pb, SLAPI_SEARCH_TIMELIMIT, &timelimit );
+ slapi_pblock_get( pb, SLAPI_OPINITIATED_TIME, &optime );
+ } else {
+ /* timelimit is not passed via pblock */
+ timelimit = -1;
+ }
/*
* (timelimit==-1) means no time limit
*/
15 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/memberof memberof.c, 1.12, 1.13
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29995/plugins/memberof
Modified Files:
memberof.c
Log Message:
Resolves: 455913
Summary: Don't use Slapi_Mod on the stack.
Index: memberof.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof/memberof.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- memberof.c 8 Jul 2008 19:59:39 -0000 1.12
+++ memberof.c 18 Jul 2008 18:11:30 -0000 1.13
@@ -2115,24 +2115,25 @@
{
Slapi_PBlock *mod_pb = slapi_pblock_new();
Slapi_Value *val = 0;
- Slapi_Mod smod;
+ Slapi_Mod *smod;
LDAPMod **mods = (LDAPMod **) slapi_ch_malloc(2 * sizeof(LDAPMod *));
int hint = 0;
- slapi_mod_init(&smod, 0);
- slapi_mod_set_operation(&smod, LDAP_MOD_REPLACE | LDAP_MOD_BVALUES);
- slapi_mod_set_type(&smod, config->memberof_attr);
+ smod = slapi_mod_new();
+ slapi_mod_init(smod, 0);
+ slapi_mod_set_operation(smod, LDAP_MOD_REPLACE | LDAP_MOD_BVALUES);
+ slapi_mod_set_type(smod, config->memberof_attr);
/* Loop through all of our values and add them to smod */
hint = slapi_valueset_first_value(groups, &val);
while (val)
{
/* this makes a copy of the berval */
- slapi_mod_add_value(&smod, slapi_value_get_berval(val));
+ slapi_mod_add_value(smod, slapi_value_get_berval(val));
hint = slapi_valueset_next_value(groups, hint, &val);
}
- mods[0] = slapi_mod_get_ldapmod_passout(&smod);
+ mods[0] = slapi_mod_get_ldapmod_passout(smod);
mods[1] = 0;
slapi_modify_internal_set_pb(
@@ -2144,7 +2145,7 @@
slapi_pblock_get(mod_pb, SLAPI_PLUGIN_INTOP_RESULT, &rc);
ldap_mods_free(mods, 1);
- slapi_mod_done(&smod);
+ slapi_mod_free(&smod);
slapi_pblock_destroy(mod_pb);
} else {
/* No groups were found, so remove the memberOf attribute
15 years, 9 months
[Fedora-directory-commits] ldapserver/ldap/servers/plugins/schema_reload schema_reload.c, 1.2, 1.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/schema_reload
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4275
Modified Files:
schema_reload.c
Log Message:
Resolves: #436837
Summary: Dynamically reload schema via task interface
Description: cleaned up compile warnings.
Index: schema_reload.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/schema_reload/schema_reload.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- schema_reload.c 27 Jun 2008 19:28:22 -0000 1.2
+++ schema_reload.c 16 Jul 2008 18:07:40 -0000 1.3
@@ -71,6 +71,7 @@
* [ schemadir: path to reload files from ]
*/
+#include "slap.h"
#include "slapi-plugin.h"
#include "nspr.h"
#include "dirver.h" /* PRODUCTTEXT */
@@ -133,7 +134,7 @@
schemareload_thread(void *arg)
{
Slapi_Task *task = (Slapi_Task *)arg;
- int i, rv = 0;
+ int rv = 0;
int total_work = 2;
/* fetch our argument from the task */
char *schemadir = (char *)slapi_task_get_data(task);
@@ -216,7 +217,6 @@
const char *cn;
const char *schemadir = NULL;
int rv = SLAPI_DSE_CALLBACK_OK;
- Slapi_PBlock *mypb = NULL;
Slapi_Task *task = NULL;
*returncode = LDAP_SUCCESS;
15 years, 9 months
[Fedora-directory-commits] mod_nss nss_engine_init.c,1.33,1.34
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30189
Modified Files:
nss_engine_init.c
Log Message:
Restore moduleKill function so that NSS remains initialized during the
entire configuration state. Other modules were relying on mod_nss
leaving NSS initialized.
453508
Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- nss_engine_init.c 14 Jul 2008 20:25:53 -0000 1.33
+++ nss_engine_init.c 16 Jul 2008 15:15:39 -0000 1.34
@@ -315,6 +315,13 @@
mc->nInitCount++;
+ /*
+ * Let us cleanup on restarts and exists
+ */
+ apr_pool_cleanup_register(p, base_server,
+ nss_init_ModuleKill,
+ apr_pool_cleanup_null);
+
mc->ptemp = ptemp;
/*
@@ -491,9 +498,6 @@
*/
nss_init_ConfigureServer(s, p, ptemp, sc);
}
-
- nss_init_ChildKill(base_server);
- nss_init_ModuleKill(base_server);
}
/*
@@ -1144,12 +1148,16 @@
apr_status_t nss_init_ModuleKill(void *data)
{
server_rec *base_server = (server_rec *)data;
+ SSLModConfigRec *mc = myModConfig(base_server);
ap_log_error(APLOG_MARK, APLOG_INFO, 0, base_server,
"Shutting down SSL Session ID Cache");
SSL_ShutdownServerSessionIDCache();
+ if (mc->nInitCount == 1)
+ nss_init_ChildKill(base_server);
+
/* NSS_Shutdown() gets called in nss_init_ChildKill */
return APR_SUCCESS;
}
15 years, 9 months
[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/task NewInstanceDialog.java, 1.2, 1.3 Export.java, 1.1.1.1, NONE Import.java, 1.1.1.1, NONE
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/task
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19945/directoryconsole/src/com/netscape/admin/dirserv/task
Modified Files:
NewInstanceDialog.java
Removed Files:
Export.java Import.java
Log Message:
Bump version to 1.1.2
Remove unused Import and Export tasks
Fix new instance creation dialog
Index: NewInstanceDialog.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/task/NewInstanceDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewInstanceDialog.java 2 Jul 2007 19:44:11 -0000 1.2
+++ NewInstanceDialog.java 15 Jul 2008 17:49:03 -0000 1.3
@@ -339,17 +339,11 @@
return;
}
}
- Debug.println(9, "NewInstanceDialog.actionPerformed(): " +
- "before setVisible()");
- setVisible(false);
- Debug.println(9, "NewInstanceDialog.actionPerformed(): " +
- "before dispose()");
- dispose();
- Debug.println(9, "NewInstanceDialog.actionPerformed(): " +
- "before dialogCleanup()");
- DSUtil.dialogCleanup();
- Debug.println(9, "NewInstanceDialog.actionPerformed(): " +
- "after dialogCleanup()");
+ Debug.println(9, "NewInstanceDialog.okInvoked(): " +
+ "before super.okInvoked()");
+ super.okInvoked();
+ Debug.println(9, "NewInstanceDialog.okInvoked(): " +
+ "after super.okInvoked()");
}
/**
--- Export.java DELETED ---
--- Import.java DELETED ---
15 years, 9 months
[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv/panel DatabaseImportPanel.java, 1.1.1.1, 1.2 LDAPAddPanel.java, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19945/directoryconsole/src/com/netscape/admin/dirserv/panel
Modified Files:
DatabaseImportPanel.java LDAPAddPanel.java
Log Message:
Bump version to 1.1.2
Remove unused Import and Export tasks
Fix new instance creation dialog
Index: DatabaseImportPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/DatabaseImportPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- DatabaseImportPanel.java 18 Jul 2005 00:55:56 -0000 1.1.1.1
+++ DatabaseImportPanel.java 15 Jul 2008 17:49:02 -0000 1.2
@@ -45,7 +45,6 @@
import com.netscape.management.client.console.ConsoleInfo;
import com.netscape.management.client.components.Table;
import com.netscape.admin.dirserv.*;
-import com.netscape.admin.dirserv.task.Import;
import netscape.ldap.*;
import netscape.ldap.util.*;
import java.text.SimpleDateFormat;
Index: LDAPAddPanel.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/LDAPAddPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- LDAPAddPanel.java 18 Jul 2005 00:55:58 -0000 1.1.1.1
+++ LDAPAddPanel.java 15 Jul 2008 17:49:02 -0000 1.2
@@ -34,7 +34,6 @@
import com.netscape.management.client.util.LDAPUtil;
import com.netscape.management.client.console.ConsoleInfo;
import com.netscape.admin.dirserv.*;
-import com.netscape.admin.dirserv.task.Import;
import netscape.ldap.*;
import netscape.ldap.util.*;
import java.text.SimpleDateFormat;
15 years, 9 months
[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSAdmin.java, 1.6, 1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19945/directoryconsole/src/com/netscape/admin/dirserv
Modified Files:
DSAdmin.java
Log Message:
Bump version to 1.1.2
Remove unused Import and Export tasks
Fix new instance creation dialog
Index: DSAdmin.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DSAdmin.java 30 Jul 2007 17:16:40 -0000 1.6
+++ DSAdmin.java 15 Jul 2008 17:49:02 -0000 1.7
@@ -313,12 +313,14 @@
_serverInfo.setPort( port );
_serverInfo.setLDAPConnection(
DSUtil.makeLDAPConnection( false ) );
+ Debug.println("DSAdmin.getInfo: created an LDAP connection to " +
+ _serverInfo.getHost() + ":" + _serverInfo.getPort());
} else {
/* Secure connection */
_serverInfo.setPort( securePort );
_serverInfo.setLDAPConnection(
DSUtil.makeLDAPConnection( true ) );
- Debug.println("DSAdmin.getInfo: created an SSL connection to " +
+ Debug.println("DSAdmin.getInfo: created an LDAPS connection to " +
_serverInfo.getHost() + ":" + _serverInfo.getPort());
}
}
@@ -639,7 +641,7 @@
return false;
}
- Debug.println("DSAdmin.run: begin");
+ Debug.println("DSAdmin.run: begin for server " + _serverInfo);
String host = _serverInfo.getHost();
int port = _serverInfo.getPort();
15 years, 9 months
[Fedora-directory-commits] directoryconsole build.properties, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19945/directoryconsole
Modified Files:
build.properties
Log Message:
Bump version to 1.1.2
Remove unused Import and Export tasks
Fix new instance creation dialog
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.properties 14 Jan 2008 19:39:20 -0000 1.8
+++ build.properties 15 Jul 2008 17:49:02 -0000 1.9
@@ -21,7 +21,7 @@
lang=en
ldapconsole.root=..
-ldapconsole.version=1.1.1
+ldapconsole.version=1.1.2
ldapconsole.gen.version=1.1
brand=fedora
ldapconsole.name=${brand}-ds-${ldapconsole.version}
15 years, 9 months