diff options
| author | Alexander Bokovoy <ab@samba.org> | 2008-01-24 14:06:22 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2008-01-24 14:06:22 +0300 |
| commit | eba5fbff749b84a3e1bcd1f849c3454417532454 (patch) | |
| tree | 42b9da9b96fb26706f4c8486cd01821f83e318f3 /source3/client/smbmount.c | |
| parent | c17c64530ec479334f88679ef780691e06ccd65a (diff) | |
| parent | 9344628bef74ac759197601dc5dd44514b836e3e (diff) | |
| download | samba-eba5fbff749b84a3e1bcd1f849c3454417532454.tar.gz samba-eba5fbff749b84a3e1bcd1f849c3454417532454.tar.xz samba-eba5fbff749b84a3e1bcd1f849c3454417532454.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into ctdb-merge
(This used to be commit 42d06d41bf2e9fb094f6064dc04f549d880b5f8d)
Diffstat (limited to 'source3/client/smbmount.c')
| -rw-r--r-- | source3/client/smbmount.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c index 98c61a30d8..9fe2d36bd3 100644 --- a/source3/client/smbmount.c +++ b/source3/client/smbmount.c @@ -764,6 +764,7 @@ static void parse_mount_smb(int argc, char **argv) char *opts; char *opteq; int val; + char *saveptr; TALLOC_CTX *ctx = talloc_tos(); /* FIXME: This function can silently fail if the arguments are @@ -813,7 +814,8 @@ static void parse_mount_smb(int argc, char **argv) /* * option parsing from nfsmount.c (util-linux-2.9u) */ - for (opts = strtok(optarg, ","); opts; opts = strtok(NULL, ",")) { + for (opts = strtok_r(optarg, ",", &saveptr); opts; + opts = strtok_r(NULL, ",", &saveptr)) { DEBUG(3, ("opts: %s\n", opts)); if ((opteq = strchr_m(opts, '='))) { val = atoi(opteq + 1); |