ldap/servers/slapd/proto-slap.h | 2 +- ldap/servers/slapd/schema.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit cb54dfed19d860e3fef0890fc5946787a93b3a19 Author: Mark Reynolds mreynolds@redhat.com Date: Tue Nov 12 10:07:22 2013 -0500
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 9487bf7..0c4702b 100644 --- a/ldap/servers/slapd/proto-slap.h +++ b/ldap/servers/slapd/proto-slap.h @@ -1004,7 +1004,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 1e677c9..ef85be3 100644 --- a/ldap/servers/slapd/schema.c +++ b/ldap/servers/slapd/schema.c @@ -6023,7 +6023,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){ @@ -6071,7 +6070,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 " @@ -6081,7 +6082,6 @@ schema_at_superset_check(struct asyntaxinfo *at_list1, struct asyntaxinfo *at_li break; } } - */ } else { rc = 1; if(debug_logging){ @@ -6463,7 +6463,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@lists.fedoraproject.org