summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-03 23:32:59 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:47:49 +0100
commit0184e5ef2d4ebd19e1617ca8daaf2102b8e5a9f0 (patch)
tree4537bee59d492fb68f89a4f7e27ed8d014cbb5fb
parentb83a7a135f3247f553cb04173646b2d871b97235 (diff)
downloadsamba-0184e5ef2d4ebd19e1617ca8daaf2102b8e5a9f0.tar.gz
samba-0184e5ef2d4ebd19e1617ca8daaf2102b8e5a9f0.tar.bz2
samba-0184e5ef2d4ebd19e1617ca8daaf2102b8e5a9f0.zip
r26269: Fix a couple more references to global_loadparm.
(This used to be commit 1cb849dfba21b9b5d00b20ba8201f0e142bfeb07)
-rw-r--r--source4/auth/credentials/credentials.c2
-rw-r--r--source4/client/cifsdd.c4
-rw-r--r--source4/client/smbmount.c4
-rw-r--r--source4/cluster/ctdb/ctdb_cluster.c5
-rw-r--r--source4/smbd/server.c2
5 files changed, 9 insertions, 8 deletions
diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c
index 8510a1f711..0c5f5b0f3b 100644
--- a/source4/auth/credentials/credentials.c
+++ b/source4/auth/credentials/credentials.c
@@ -77,7 +77,7 @@ struct cli_credentials *cli_credentials_init(TALLOC_CTX *mem_ctx)
* 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;
diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index 6c3edeb892..aa63edcd7a 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -398,7 +398,7 @@ static void set_max_xmit(struct loadparm_context *lp_ctx, uint64_t iomax)
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 @@ int main(int argc, const char ** argv)
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 : */
diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c
index 34fb90fca6..8c0a6fcdf1 100644
--- a/source4/client/smbmount.c
+++ b/source4/client/smbmount.c
@@ -245,7 +245,7 @@ unmount smbfs (this is a bailout routine to clean up if a reconnect fails)
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 @@ static void smb_umount(char *mount_point)
* 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();
diff --git a/source4/cluster/ctdb/ctdb_cluster.c b/source4/cluster/ctdb/ctdb_cluster.c
index e4a9742401..cf24829a3e 100644
--- a/source4/cluster/ctdb/ctdb_cluster.c
+++ b/source4/cluster/ctdb/ctdb_cluster.c
@@ -197,12 +197,13 @@ static struct cluster_ops cluster_ctdb_ops = {
};
/* 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;
}
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index faddd23937..a62846b091 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -313,7 +313,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
}
/* 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 */