diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 23:32:59 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:49 +0100 |
| commit | 0184e5ef2d4ebd19e1617ca8daaf2102b8e5a9f0 (patch) | |
| tree | 4537bee59d492fb68f89a4f7e27ed8d014cbb5fb /source4/client | |
| parent | b83a7a135f3247f553cb04173646b2d871b97235 (diff) | |
| download | samba-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)
Diffstat (limited to 'source4/client')
| -rw-r--r-- | source4/client/cifsdd.c | 4 | ||||
| -rw-r--r-- | source4/client/smbmount.c | 4 |
2 files changed, 4 insertions, 4 deletions
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(); |