svn commit: samba r26274 - in branches/SAMBA_4_0: .
source/auth/credentials source/cluster source/cluster/ctdb
source/kdc source/smbd
jelmer at samba.org
jelmer at samba.org
Tue Dec 4 00:12:05 GMT 2007
Author: jelmer
Date: 2007-12-04 00:12:03 +0000 (Tue, 04 Dec 2007)
New Revision: 26274
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26274
Log:
Some syntax fixes, remove more global_loadparm instances.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/auth/credentials/credentials.c
branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c
branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c
branches/SAMBA_4_0/source/cluster/local.c
branches/SAMBA_4_0/source/kdc/hdb-ldb.c
branches/SAMBA_4_0/source/kdc/kdc.c
branches/SAMBA_4_0/source/smbd/service_stream.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials.c
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials.c 2007-12-03 23:38:54 UTC (rev 26273)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials.c 2007-12-04 00:12:03 UTC (rev 26274)
@@ -641,7 +641,7 @@
char *p;
if (lp_ctx != NULL) {
- cli_credentials_set_conf(cred, global_loadparm);
+ cli_credentials_set_conf(cred, lp_ctx);
}
if (getenv("LOGNAME")) {
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c 2007-12-03 23:38:54 UTC (rev 26273)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c 2007-12-04 00:12:03 UTC (rev 26274)
@@ -199,7 +199,8 @@
}
-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 @@
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;
}
Modified: branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c 2007-12-03 23:38:54 UTC (rev 26273)
+++ branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c 2007-12-04 00:12:03 UTC (rev 26274)
@@ -79,8 +79,8 @@
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;
Modified: branches/SAMBA_4_0/source/cluster/local.c
===================================================================
--- branches/SAMBA_4_0/source/cluster/local.c 2007-12-03 23:38:54 UTC (rev 26273)
+++ branches/SAMBA_4_0/source/cluster/local.c 2007-12-04 00:12:03 UTC (rev 26274)
@@ -55,8 +55,8 @@
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;
Modified: branches/SAMBA_4_0/source/kdc/hdb-ldb.c
===================================================================
--- branches/SAMBA_4_0/source/kdc/hdb-ldb.c 2007-12-03 23:38:54 UTC (rev 26273)
+++ branches/SAMBA_4_0/source/kdc/hdb-ldb.c 2007-12-04 00:12:03 UTC (rev 26274)
@@ -1103,6 +1103,7 @@
* 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 @@
{
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;
Modified: branches/SAMBA_4_0/source/kdc/kdc.c
===================================================================
--- branches/SAMBA_4_0/source/kdc/kdc.c 2007-12-03 23:38:54 UTC (rev 26273)
+++ branches/SAMBA_4_0/source/kdc/kdc.c 2007-12-04 00:12:03 UTC (rev 26274)
@@ -609,7 +609,8 @@
}
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");
Modified: branches/SAMBA_4_0/source/smbd/service_stream.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/service_stream.c 2007-12-03 23:38:54 UTC (rev 26273)
+++ branches/SAMBA_4_0/source/smbd/service_stream.c 2007-12-04 00:12:03 UTC (rev 26274)
@@ -79,7 +79,7 @@
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)
More information about the samba-cvs
mailing list