summaryrefslogtreecommitdiff
path: root/source3/client/smbmount.c
diff options
context:
space:
mode:
authorMartin Pool <mbp@samba.org>2001-11-20 06:38:09 +0000
committerMartin Pool <mbp@samba.org>2001-11-20 06:38:09 +0000
commit5b1fb34731b3bc8331f99ae4e193b7c078ee9f7a (patch)
tree095766014748cff94fb44348ad565ddab0bfd542 /source3/client/smbmount.c
parent4950e6feb69ed73663faf2977520e90d97bbce03 (diff)
downloadsamba-5b1fb34731b3bc8331f99ae4e193b7c078ee9f7a.tar.gz
samba-5b1fb34731b3bc8331f99ae4e193b7c078ee9f7a.tar.bz2
samba-5b1fb34731b3bc8331f99ae4e193b7c078ee9f7a.zip
Rename xmalloc, xmemdup, xstrdup to smb_$1 to avoid conflicts with the
versions defined by libreadline on SCO (!). (This used to be commit 32480d7aff21ce1c14991e242aaf8a4e14ec6f2a)
Diffstat (limited to 'source3/client/smbmount.c')
-rw-r--r--source3/client/smbmount.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c
index d3265ee606..f8fc0558ce 100644
--- a/source3/client/smbmount.c
+++ b/source3/client/smbmount.c
@@ -452,22 +452,22 @@ static void init_mount(void)
if (mount_uid) {
slprintf(tmp, sizeof(tmp)-1, "%d", mount_uid);
args[i++] = "-u";
- args[i++] = xstrdup(tmp);
+ args[i++] = smb_xstrdup(tmp);
}
if (mount_gid) {
slprintf(tmp, sizeof(tmp)-1, "%d", mount_gid);
args[i++] = "-g";
- args[i++] = xstrdup(tmp);
+ args[i++] = smb_xstrdup(tmp);
}
if (mount_fmask) {
slprintf(tmp, sizeof(tmp)-1, "0%o", mount_fmask);
args[i++] = "-f";
- args[i++] = xstrdup(tmp);
+ args[i++] = smb_xstrdup(tmp);
}
if (mount_dmask) {
slprintf(tmp, sizeof(tmp)-1, "0%o", mount_dmask);
args[i++] = "-d";
- args[i++] = xstrdup(tmp);
+ args[i++] = smb_xstrdup(tmp);
}
if (options) {
args[i++] = "-o";