diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2016-07-06 16:57:26 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2016-07-08 10:01:20 +0200 |
| commit | 657e31450c704b4d62423d9386372fc3bb248669 (patch) | |
| tree | 9ac2b739aff275c596916e6cc66c950f7457cf49 /source4/ldap_server | |
| parent | 769230a49aeb504adc9f5ead36acaa12e3418198 (diff) | |
| download | samba-657e31450c704b4d62423d9386372fc3bb248669.tar.gz | |
schema: Remove unnecessary schema reload code
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/ldap_server')
| -rw-r--r-- | source4/ldap_server/ldap_backend.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c index 6a8a0cf5494..dc6a44c8237 100644 --- a/source4/ldap_server/ldap_backend.c +++ b/source4/ldap_server/ldap_backend.c @@ -1226,10 +1226,7 @@ NTSTATUS ldapsrv_do_call(struct ldapsrv_call *call) { unsigned int i; struct ldap_message *msg = call->request; - struct ldb_context *samdb = call->conn->ldb; NTSTATUS status; - time_t *lastts; - bool recheck_schema = false; /* Check for undecoded critical extensions */ for (i=0; msg->controls && msg->controls[i]; i++) { @@ -1249,11 +1246,9 @@ NTSTATUS ldapsrv_do_call(struct ldapsrv_call *call) case LDAP_TAG_SearchRequest: return ldapsrv_SearchRequest(call); case LDAP_TAG_ModifyRequest: - recheck_schema = true; status = ldapsrv_ModifyRequest(call); break; case LDAP_TAG_AddRequest: - recheck_schema = true; status = ldapsrv_AddRequest(call); break; case LDAP_TAG_DelRequest: @@ -1273,23 +1268,6 @@ NTSTATUS ldapsrv_do_call(struct ldapsrv_call *call) return ldapsrv_unwilling(call, LDAP_PROTOCOL_ERROR); } - if (NT_STATUS_IS_OK(status) && recheck_schema) { - lastts = (time_t *)ldb_get_opaque(samdb, DSDB_OPAQUE_LAST_SCHEMA_UPDATE_MSG_OPAQUE_NAME); - if (lastts && !*lastts) { - DEBUG(10, ("Schema update now was requested, " - "fullfilling the request ts = %d\n", - (int)*lastts)); - /* - * Just requesting the schema will do the trick - * as the delay for reload is experied, we will have a reload - * from the schema as expected as we are not yet in a transaction! - */ - dsdb_get_schema(samdb, NULL); - *lastts = time(NULL); - ldb_set_opaque(samdb, DSDB_OPAQUE_LAST_SCHEMA_UPDATE_MSG_OPAQUE_NAME, lastts); - } - } - if (NT_STATUS_IS_OK(status)) { ldapsrv_notification_retry_setup(call->conn->service, true); } |