diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-11-20 14:59:17 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-01-17 15:10:10 +0100 |
| commit | 316fd085ad2b587b82d817358240f84ae054a543 (patch) | |
| tree | d5a376e76b97ae299b90501a4c22e8523dfc4cee /source4/dsdb/samdb/ldb_modules | |
| parent | 6a1025551eb5b343ec996ae0c642d542162e8910 (diff) | |
| download | samba-316fd085ad2b587b82d817358240f84ae054a543.tar.gz samba-316fd085ad2b587b82d817358240f84ae054a543.tar.bz2 samba-316fd085ad2b587b82d817358240f84ae054a543.zip | |
drs-fsmo: Improve handling of FSMO role takeover.
This needs to be more async, and give less scary errors.
Andrew Bartlett
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/rootdse.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c index ba71b5f8ff..add83d293a 100644 --- a/source4/dsdb/samdb/ldb_modules/rootdse.c +++ b/source4/dsdb/samdb/ldb_modules/rootdse.c @@ -1377,9 +1377,18 @@ static int rootdse_become_master(struct ldb_module *module, fsmo->ldb = ldb; fsmo->req = req; - /* we send the call asynchronously, as the ldap client is + /* + * we send the call asynchronously, as the ldap client is * expecting to get an error back if the role transfer fails + * + * We need more than the default 10 seconds IRPC allows, so + * set a longer timeout (default ldb timeout is 300 seconds). + * We send an async reply when we are done. + * + * We are the first module, so don't bother working out how + * long we have spent so far. */ + dcerpc_binding_handle_set_timeout(irpc_handle, req->timeout); treq = dcerpc_drepl_takeFSMORole_send(req, ldb_get_event_context(ldb), irpc_handle, role); if (treq == NULL) { |