diff options
Diffstat (limited to 'source4/winbind')
| -rw-r--r-- | source4/winbind/idmap.c | 2 | ||||
| -rw-r--r-- | source4/winbind/wb_init_domain.c | 2 | ||||
| -rw-r--r-- | source4/winbind/wb_samba3_protocol.c | 7 | ||||
| -rw-r--r-- | source4/winbind/wb_server.h | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/source4/winbind/idmap.c b/source4/winbind/idmap.c index ff57064d48..4f2a54384c 100644 --- a/source4/winbind/idmap.c +++ b/source4/winbind/idmap.c @@ -164,7 +164,7 @@ struct idmap_context *idmap_init(TALLOC_CTX *mem_ctx, idmap_ctx->lp_ctx = lp_ctx; idmap_ctx->ldb_ctx = ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, - lpcfg_idmap_url(lp_ctx), + "idmap.ldb", system_session(lp_ctx), NULL, 0); if (idmap_ctx->ldb_ctx == NULL) { diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c index 50a6af05fd..9847afbba0 100644 --- a/source4/winbind/wb_init_domain.c +++ b/source4/winbind/wb_init_domain.c @@ -154,7 +154,7 @@ struct composite_context *wb_init_domain_send(TALLOC_CTX *mem_ctx, (lpcfg_server_role(service->task->lp_ctx) == ROLE_DOMAIN_CONTROLLER)) && (dom_sid_equal(state->domain->info->sid, state->service->primary_sid))) { - state->domain->netlogon_binding->flags |= DCERPC_SCHANNEL; + state->domain->netlogon_binding->flags |= DCERPC_SCHANNEL | DCERPC_SCHANNEL_128; /* For debugging, it can be a real pain if all the traffic is encrypted */ if (lpcfg_winbind_sealed_pipes(service->task->lp_ctx)) { diff --git a/source4/winbind/wb_samba3_protocol.c b/source4/winbind/wb_samba3_protocol.c index 4bb0582cd2..f0f803dac5 100644 --- a/source4/winbind/wb_samba3_protocol.c +++ b/source4/winbind/wb_samba3_protocol.c @@ -183,6 +183,7 @@ NTSTATUS wbsrv_samba3_handle_call(struct wbsrv_samba3_call *s3call) case WINBINDD_PAM_CHAUTHTOK: case WINBINDD_PAM_CHNG_PSWD_AUTH_CRAP: case WINBINDD_LOOKUPRIDS: + case WINBINDD_LOOKUPSIDS: case WINBINDD_SIDS_TO_XIDS: case WINBINDD_ALLOCATE_UID: case WINBINDD_ALLOCATE_GID: @@ -199,7 +200,11 @@ NTSTATUS wbsrv_samba3_handle_call(struct wbsrv_samba3_call *s3call) case WINBINDD_DUAL_NDRCMD: case WINBINDD_CCACHE_NTLMAUTH: case WINBINDD_NUM_CMDS: - DEBUG(10, ("Unimplemented winbind samba3 request %d\n", + case WINBINDD_CHANGE_MACHACC: + case WINBINDD_PING_DC: + case WINBINDD_DC_INFO: + case WINBINDD_CCACHE_SAVE: + DEBUG(10, ("Unimplemented winbind samba3 request %d\n", s3call->request->cmd)); break; } diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h index f20bc0aa51..12dd1888ed 100644 --- a/source4/winbind/wb_server.h +++ b/source4/winbind/wb_server.h @@ -104,7 +104,7 @@ struct wbsrv_connection { #define WBSRV_SAMBA3_SET_STRING(dest, src) do { \ memset(dest, 0, sizeof(dest));\ - safe_strcpy(dest, src, sizeof(dest)-1);\ + strlcpy((dest), (src) ? (src) : "", sizeof(dest));\ } while(0) /* |