diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-01-14 06:17:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:07 -0500 |
| commit | f3db23ac75578198ee411b21a7ba2ec49dedafab (patch) | |
| tree | 4625f46ea496e475be03e8c94d968d15f56e9693 /source4/libnet | |
| parent | ae51cc9bec8bc5d6efd035ac6e594aa7cc108ffe (diff) | |
| download | samba-f3db23ac75578198ee411b21a7ba2ec49dedafab.tar.gz samba-f3db23ac75578198ee411b21a7ba2ec49dedafab.tar.bz2 samba-f3db23ac75578198ee411b21a7ba2ec49dedafab.zip | |
r12928: This patch improves the interaction between the vampire and provsion code.
Previously, we had to know (or guess) the host and domain guid at the
provision stage. Now we query the database post-provision, to extract
the values and fill in the zone file.
This allows us to generate a correct zone file in the Windows migration case.
In an effort to make SWAT easier to use, I have removed and renamed
some of the provision options.
I have also fixed a nasty issue in my js code. I had implictly
declared a global variable of the name 'join', with disasterious
results for any subsequent user of the string utility function:
esp exception - ASSERT at lib/appweb/ejs/ejsParser.c:2064, 0
Backtrace:
[ 0] substitute_var:20 -> list[i] = join("", list2)
[ 1] setup_file:9 -> data = substitute_var(data, subobj)
Andrew Bartlett
(This used to be commit a38ceefd11f8b748f30383ef36a4752f178bfca1)
Diffstat (limited to 'source4/libnet')
| -rw-r--r-- | source4/libnet/libnet_samsync_ldb.c | 3 | ||||
| -rw-r--r-- | source4/libnet/libnet_vampire.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c index 5140aa87ae..4bedbbf119 100644 --- a/source4/libnet/libnet_samsync_ldb.c +++ b/source4/libnet/libnet_samsync_ldb.c @@ -1199,7 +1199,8 @@ NTSTATUS libnet_samsync_ldb(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, str state->secrets = NULL; state->trusted_domains = NULL; - state->sam_ldb = samdb_connect(state, system_session(state)); + state->sam_ldb = ldb_wrap_connect(mem_ctx, lp_sam_url(), r->in.session_info, + ctx->cred, 0, NULL); r2.out.error_string = NULL; r2.in.binding_string = r->in.binding_string; diff --git a/source4/libnet/libnet_vampire.h b/source4/libnet/libnet_vampire.h index 5fd6504737..fcd93c3654 100644 --- a/source4/libnet/libnet_vampire.h +++ b/source4/libnet/libnet_vampire.h @@ -75,6 +75,7 @@ struct libnet_samsync_ldb { struct { const char *binding_string; struct cli_credentials *machine_account; + struct auth_session_info *session_info; } in; struct { const char *error_string; |