[389-commits] Branch '389-ds-base-1.3.2' - ldap/servers

ldap/servers/slapd/proto-slap.h | 2 +-
ldap/servers/slapd/schema.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit dd543aacb050f59b0b9730b6556163c55ea64df2
Author: Thierry bordaz (tbordaz) <tbordaz@redhat.com>
Date: Tue May 20 10:34:49 2014 +0200

Ticket 47541 - Fix Jenkins errors

Removed unused variables.

https://fedorahosted.org/389//ticket/47541

diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
index 2424dce..3aa2170 100644
--- a/ldap/servers/slapd/proto-slap.h
+++ b/ldap/servers/slapd/proto-slap.h
@@ -1015,7 +1015,7 @@ int slapi_reload_schema_files(char *schemadir);
void schema_free_extensions(schemaext *extensions);
schemaext *schema_copy_extensions(schemaext *extensions);
int schema_objectclasses_superset_check(struct berval **remote_schema, char *type);
-int schema_attributypes_superset_check(struct berval **remote_schema, char *type);
+int schema_attributetypes_superset_check(struct berval **remote_schema, char *type);

/*
* schemaparse.c
diff --git a/ldap/servers/slapd/schema.c b/ldap/servers/slapd/schema.c
index 42689f4..d7eed74 100644
--- a/ldap/servers/slapd/schema.c
+++ b/ldap/servers/slapd/schema.c
@@ -6043,7 +6043,6 @@ schema_at_superset_check(struct asyntaxinfo *at_list1, struct asyntaxinfo *at_li
struct asyntaxinfo *at_1, *at_2;
char *info = NULL;
int debug_logging = 0;
- int found = 0;
int rc = 0;

if(at_list1 == NULL || at_list2 == NULL){
@@ -6091,7 +6090,9 @@ schema_at_superset_check(struct asyntaxinfo *at_list1, struct asyntaxinfo *at_li
/*
* Check some matching rules - not finished yet...
*
- if(schema_at_superset_check_mr(at_1, at_2, info)){
+ * For now, skip the matching rule check (rc is never equal to -1)
+ */
+ if(rc == -1 && schema_at_superset_check_mr(at_1, at_2, info)){
rc = 1;
if(debug_logging){
slapi_log_error(SLAPI_LOG_REPL, "schema", "%s schema attribute [%s] matching "
@@ -6101,7 +6102,6 @@ schema_at_superset_check(struct asyntaxinfo *at_list1, struct asyntaxinfo *at_li
break;
}
}
- */
} else {
rc = 1;
if(debug_logging){
@@ -6483,7 +6483,7 @@ schema_berval_to_oclist(struct berval **oc_berval)
static struct asyntaxinfo *
schema_berval_to_atlist(struct berval **at_berval)
{
- struct asyntaxinfo *at, *head = NULL, *prev, *at_list = NULL;
+ struct asyntaxinfo *at, *head = NULL, *at_list = NULL;
char errorbuf[BUFSIZ];
int schema_ds4x_compat, rc = 0, i;

--
389 commits mailing list
389-commits@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/389-commits