diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-18 18:21:52 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-18 18:21:52 +0200 |
| commit | 0321bc02598087685c6ea144e3920a64ab909b83 (patch) | |
| tree | 01fa776e99c876a7e6a7a94285db90e844cd8b08 | |
| parent | bfbcfc41f55c7a428ee89f67d739bb3d1028507d (diff) | |
| parent | 93c9de03afd907015108bbb53bd8453da3cc8115 (diff) | |
| download | samba-0321bc02598087685c6ea144e3920a64ab909b83.tar.gz samba-0321bc02598087685c6ea144e3920a64ab909b83.tar.bz2 samba-0321bc02598087685c6ea144e3920a64ab909b83.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit e8da1559f7282127264c671c485e812f669b97ba)
| -rw-r--r-- | source4/setup/idmap_init.ldif | 5 | ||||
| -rw-r--r-- | source4/winbind/wb_init_domain.c | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source4/setup/idmap_init.ldif b/source4/setup/idmap_init.ldif index a397cfd0d2..43e5b65562 100644 --- a/source4/setup/idmap_init.ldif +++ b/source4/setup/idmap_init.ldif @@ -1,5 +1,4 @@ dn: CN=CONFIG cn: CONFIG -lowerBound: 10000 -upperBound: 20000 - +lowerBound: 3000000 +upperBound: 4000000 diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c index c1325bfe09..8b82ab711e 100644 --- a/source4/winbind/wb_init_domain.c +++ b/source4/winbind/wb_init_domain.c @@ -209,7 +209,6 @@ static void init_domain_recv_netlogonpipe(struct composite_context *ctx) &state->domain->netlogon_pipe); if (!composite_is_ok(state->ctx)) { - talloc_free(state->domain->netlogon_binding); return; } talloc_steal(state->domain->netlogon_pipe, state->domain->netlogon_binding); |