Author: jelmer Date: 2007-12-03 23:32:59 +0000 (Mon, 03 Dec 2007) New Revision: 26269
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26269 Log: Fix a couple more references to global_loadparm. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/auth/credentials/credentials.c branches/SAMBA_4_0/source/client/cifsdd.c branches/SAMBA_4_0/source/client/smbmount.c branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c branches/SAMBA_4_0/source/smbd/server.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 21:25:17 UTC (rev 26268) +++ branches/SAMBA_4_0/source/auth/credentials/credentials.c 2007-12-03 23:32:59 UTC (rev 26269) @@ -77,7 +77,7 @@ * Create a new anonymous credential * @param mem_ctx TALLOC_CTX parent for credentials structure */ -struct cli_credentials *cli_credentials_init_anon(TALLOC_CTX *mem_ctx) +struct cli_credentials *cli_credentials_init_anon(TALLOC_CTX *mem_ctx) { struct cli_credentials *anon_credentials; Modified: branches/SAMBA_4_0/source/client/cifsdd.c =================================================================== --- branches/SAMBA_4_0/source/client/cifsdd.c 2007-12-03 21:25:17 UTC (rev 26268) +++ branches/SAMBA_4_0/source/client/cifsdd.c 2007-12-03 23:32:59 UTC (rev 26269) @@ -398,7 +398,7 @@ lp_set_cmdline(lp_ctx, "max xmit", buf); } -static int copy_files(void) +static int copy_files(struct loadparm_context *lp_ctx) { uint8_t * iobuf; /* IO buffer. */ uint64_t iomax; /* Size of the IO buffer. */ @@ -595,7 +595,7 @@ CatchSignal(SIGINT, dd_handle_signal); CatchSignal(SIGUSR1, dd_handle_signal); - return(copy_files()); + return(copy_files(global_loadparm)); } /* vim: set sw=8 sts=8 ts=8 tw=79 : */ Modified: branches/SAMBA_4_0/source/client/smbmount.c =================================================================== --- branches/SAMBA_4_0/source/client/smbmount.c 2007-12-03 21:25:17 UTC (rev 26268) +++ branches/SAMBA_4_0/source/client/smbmount.c 2007-12-03 23:32:59 UTC (rev 26269) @@ -245,7 +245,7 @@ Code blatently stolen from smbumount.c -mhw- ****************************************************************************/ -static void smb_umount(char *mount_point) +static void smb_umount(const char *mount_point) { int fd; struct mntent *mnt; @@ -323,7 +323,7 @@ * not exit after open_sockets() or send_login() errors, * as the smbfs mount would then have no way to recover. */ -static void send_fs_socket(const char *the_service, char *mount_point, struct smbcli_state *c) +static void send_fs_socket(const char *the_service, const char *mount_point, struct smbcli_state *c) { int fd, closed = 0, res = 1; pid_t parentpid = getppid(); Modified: branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c =================================================================== --- branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c 2007-12-03 21:25:17 UTC (rev 26268) +++ branches/SAMBA_4_0/source/cluster/ctdb/ctdb_cluster.c 2007-12-03 23:32:59 UTC (rev 26269) @@ -197,12 +197,13 @@ }; /* initialise ctdb */ -void cluster_ctdb_init(struct event_context *ev, const char *model) +void cluster_ctdb_init(struct loadparm_context *lp_ctx, + struct event_context *ev, const char *model) { struct cluster_state *state; int ret; - if (!lp_parm_bool(global_loadparm, NULL, "ctdb", "enable", false)) { + if (!lp_parm_bool(lp_ctx, NULL, "ctdb", "enable", false)) { return; } Modified: branches/SAMBA_4_0/source/smbd/server.c =================================================================== --- branches/SAMBA_4_0/source/smbd/server.c 2007-12-03 21:25:17 UTC (rev 26268) +++ branches/SAMBA_4_0/source/smbd/server.c 2007-12-03 23:32:59 UTC (rev 26269) @@ -313,7 +313,7 @@ } /* initialise clustering if needed */ - cluster_ctdb_init(event_ctx, model); + cluster_ctdb_init(global_loadparm, event_ctx, model); if (opt_interactive) { /* catch EOF on stdin */
