summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-07-13 09:14:40 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-07-13 09:14:40 +0000
commit04538bfb6c0196bb0a121ad2caead5448e1186da (patch)
treea984f47c72352a23b90600b55d00be5651d57e9d
parent35150ef8b50efcd871ec00dee586e5d15905a414 (diff)
downloadsamba-04538bfb6c0196bb0a121ad2caead5448e1186da.tar.gz
samba-04538bfb6c0196bb0a121ad2caead5448e1186da.tar.bz2
samba-04538bfb6c0196bb0a121ad2caead5448e1186da.zip
Make smbmnt a standalone program from a linker point of view. Hopefully this
will make it easier to prove this package correct from an audit point of view. smbumount to follow, but it uses pstrcpy() so I'll need to decide what to do with that. Andrew Bartlett (This used to be commit 62c56f97248109ca80cc155974584bea9704cd50)
-rw-r--r--source3/Makefile.in3
-rw-r--r--source3/client/smbmnt.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d54584c853..46cbfcd210 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -381,8 +381,7 @@ CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
MOUNT_OBJ = client/smbmount.o \
$(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
-MNT_OBJ = client/smbmnt.o \
- $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
+MNT_OBJ = client/smbmnt.o
UMOUNT_OBJ = client/smbumount.o \
$(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
diff --git a/source3/client/smbmnt.c b/source3/client/smbmnt.c
index 36248987b1..ba2b1e9435 100644
--- a/source3/client/smbmnt.c
+++ b/source3/client/smbmnt.c
@@ -111,13 +111,13 @@ fullpath(const char *p)
OK then we change into that directory - this prevents race conditions */
static int mount_ok(char *mount_point)
{
- SMB_STRUCT_STAT st;
+ struct stat st;
if (chdir(mount_point) != 0) {
return -1;
}
- if (sys_stat(".", &st) != 0) {
+ if (stat(".", &st) != 0) {
return -1;
}