diff options
| author | Günter Kukkukk <linux@kukkukk.com> | 2007-10-15 01:16:01 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@sernet.de> | 2007-10-15 12:31:21 +0200 |
| commit | d3a7f49c6f68e740aa42b586efd687c840f963ff (patch) | |
| tree | bd043b8b3e862d26d475f0005fef292b93cec1e6 /source3/client/smbmount.c | |
| parent | c9165b99e9d04a48cacd416c049c44e46ec5a365 (diff) | |
| download | samba-d3a7f49c6f68e740aa42b586efd687c840f963ff.tar.gz samba-d3a7f49c6f68e740aa42b586efd687c840f963ff.tar.bz2 samba-d3a7f49c6f68e740aa42b586efd687c840f963ff.zip | |
Latest ipv6 changes broke (deprecated) smbmount, smbmnt and smbctool
In addition some cleanup has been done to avoid compiler warnings.
(This used to be commit 29eb4d0e2d8ce4a0bd2a081265417684c8c69d6d)
Diffstat (limited to 'source3/client/smbmount.c')
| -rw-r--r-- | source3/client/smbmount.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c index b68dbfe346..d2a4b9a909 100644 --- a/source3/client/smbmount.c +++ b/source3/client/smbmount.c @@ -146,7 +146,7 @@ static struct cli_state *do_connection(char *the_service) make_nmb_name(&called , server, 0x20); again: - zero_ip(&ip); + zero_ip_v4(&ip); if (have_ip) ip = dest_ip; /* have to open a new connection */ @@ -435,7 +435,7 @@ static void init_mount(void) pstring tmp; pstring svc2; struct cli_state *c; - char *args[20]; + const char *args[20]; int i, status; if (realpath(mpoint, mount_point) == NULL) { @@ -503,12 +503,12 @@ static void init_mount(void) asprintf(&smbmnt_path, "%s/smbmnt", dyn_BINDIR); if (file_exist(smbmnt_path, NULL)) { - execv(smbmnt_path, args); + execv(smbmnt_path, (char * const *)args); fprintf(stderr, "smbfs/init_mount: execv of %s failed. Error was %s.", smbmnt_path, strerror(errno)); } else { - execvp("smbmnt", args); + execvp("smbmnt", (char * const *)args); fprintf(stderr, "smbfs/init_mount: execv of %s failed. Error was %s.", "smbmnt", strerror(errno)); @@ -799,7 +799,7 @@ static void parse_mount_smb(int argc, char **argv) DEBUGLEVEL = val; } else if(!strcmp(opts, "ip")) { dest_ip = *interpret_addr2(opteq+1); - if (is_zero_ip(dest_ip)) { + if (is_zero_ip_v4(dest_ip)) { fprintf(stderr,"Can't resolve address %s\n", opteq+1); exit(1); } |