diff options
| -rw-r--r-- | source4/auth/credentials/credentials.c | 2 | ||||
| -rw-r--r-- | source4/auth/credentials/credentials_krb5.c | 6 | ||||
| -rw-r--r-- | source4/cluster/ctdb/ctdb_cluster.c | 4 | ||||
| -rw-r--r-- | source4/cluster/local.c | 4 | ||||
| -rw-r--r-- | source4/kdc/hdb-ldb.c | 4 | ||||
| -rw-r--r-- | source4/kdc/kdc.c | 3 | ||||
| -rw-r--r-- | source4/smbd/service_stream.c | 2 |
7 files changed, 15 insertions, 10 deletions
diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c index 1889731781..f4530f4b3c 100644 --- a/source4/auth/credentials/credentials.c +++ b/source4/auth/credentials/credentials.c @@ -641,7 +641,7 @@ void cli_credentials_guess(struct cli_credentials *cred, char *p; if (lp_ctx != NULL) { - cli_credentials_set_conf(cred, global_loadparm); + cli_credentials_set_conf(cred, lp_ctx); } if (getenv("LOGNAME")) { diff --git a/source4/auth/credentials/credentials_krb5.c b/source4/auth/credentials/credentials_krb5.c index b963b61f1f..fe71d98b43 100644 --- a/source4/auth/credentials/credentials_krb5.c +++ b/source4/auth/credentials/credentials_krb5.c @@ -199,7 +199,8 @@ int cli_credentials_set_ccache(struct cli_credentials *cred, } -static int cli_credentials_new_ccache(struct cli_credentials *cred, struct ccache_container **_ccc) +static int cli_credentials_new_ccache(struct cli_credentials *cred, + struct ccache_container **_ccc) { krb5_error_code ret; struct ccache_container *ccc = talloc(cred, struct ccache_container); @@ -466,7 +467,8 @@ int cli_credentials_get_keytab(struct cli_credentials *cred, return EINVAL; } - ret = cli_credentials_get_krb5_context(cred, global_loadparm, &smb_krb5_context); + ret = cli_credentials_get_krb5_context(cred, global_loadparm, + &smb_krb5_context); if (ret) { return ret; } diff --git a/source4/cluster/ctdb/ctdb_cluster.c b/source4/cluster/ctdb/ctdb_cluster.c index cf24829a3e..6bac350805 100644 --- a/source4/cluster/ctdb/ctdb_cluster.c +++ b/source4/cluster/ctdb/ctdb_cluster.c @@ -79,8 +79,8 @@ static const char *ctdb_id_string(struct cluster_ops *ops, correct operation of fcntl locks on the shared fileystem. */ static struct tdb_wrap *ctdb_tdb_tmp_open(struct cluster_ops *ops, - TALLOC_CTX *mem_ctx, const char *dbname, - int flags) + TALLOC_CTX *mem_ctx, + const char *dbname, int flags) { const char *dir = lp_parm_string(global_loadparm, NULL, "ctdb", "shared data"); char *path; diff --git a/source4/cluster/local.c b/source4/cluster/local.c index 110bc295eb..c994596930 100644 --- a/source4/cluster/local.c +++ b/source4/cluster/local.c @@ -55,8 +55,8 @@ static const char *local_id_string(struct cluster_ops *ops, TDB_CLEAR_IF_FIRST as the tmp path is wiped at startup */ static struct tdb_wrap *local_tdb_tmp_open(struct cluster_ops *ops, - TALLOC_CTX *mem_ctx, const char *dbname, - int flags) + TALLOC_CTX *mem_ctx, + const char *dbname, int flags) { char *path = smbd_tmp_path(mem_ctx, global_loadparm, dbname); struct tdb_wrap *w; diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c index 672086a786..95a6b502a4 100644 --- a/source4/kdc/hdb-ldb.c +++ b/source4/kdc/hdb-ldb.c @@ -1103,6 +1103,7 @@ static krb5_error_code LDB_destroy(krb5_context context, HDB *db) * code */ NTSTATUS kdc_hdb_ldb_create(TALLOC_CTX *mem_ctx, + struct loadparm_context *lp_ctx, krb5_context context, struct HDB **db, const char *arg) { NTSTATUS nt_status; @@ -1164,7 +1165,8 @@ krb5_error_code hdb_ldb_create(krb5_context context, struct HDB **db, const char { NTSTATUS nt_status; /* The global kdc_mem_ctx, Disgusting, ugly hack, but it means one less private hook */ - nt_status = kdc_hdb_ldb_create(kdc_mem_ctx, context, db, arg); + nt_status = kdc_hdb_ldb_create(kdc_mem_ctx, global_loadparm, + context, db, arg); if (NT_STATUS_IS_OK(nt_status)) { return 0; diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index da19d3be26..2aa9ddd22e 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -609,7 +609,8 @@ static void kdc_task_init(struct task_server *task) } kdc->config->num_db = 1; - status = kdc_hdb_ldb_create(kdc, kdc->smb_krb5_context->krb5_context, + status = kdc_hdb_ldb_create(kdc, task->lp_ctx, + kdc->smb_krb5_context->krb5_context, &kdc->config->db[0], NULL); if (!NT_STATUS_IS_OK(status)) { task_server_terminate(task, "kdc: hdb_ldb_create (setup KDC database) failed"); diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index e939bda8f5..2ad2650486 100644 --- a/source4/smbd/service_stream.c +++ b/source4/smbd/service_stream.c @@ -79,7 +79,7 @@ void stream_terminate_connection(struct stream_connection *srv_conn, const char model_ops->terminate(event_ctx, reason); } -/* +/** the select loop has indicated that a stream is ready for IO */ static void stream_io_handler(struct stream_connection *conn, uint16_t flags) |