summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-11-14 03:53:24 +0000
committerAndrew Tridgell <tridge@samba.org>1998-11-14 03:53:24 +0000
commitfedc62d17a971650f0dc18c7a1fd1185bf6e9905 (patch)
treecb17e429cd6bc37b7424dd06bffb07e3deb80f83 /source3
parent328b91d2c957ff2e17301068c961d81a1b46213e (diff)
downloadsamba-fedc62d17a971650f0dc18c7a1fd1185bf6e9905.tar.gz
samba-fedc62d17a971650f0dc18c7a1fd1185bf6e9905.tar.bz2
samba-fedc62d17a971650f0dc18c7a1fd1185bf6e9905.zip
- handle servers that don't support getattrE (ie. NT)
- use * in clitar instead of *.* (This used to be commit 2d9335fe2a6fc3bb6687360c99d8fc69cb2d555a)
Diffstat (limited to 'source3')
-rw-r--r--source3/client/client.c8
-rw-r--r--source3/client/clitar.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index 4abb812e89..b450ed0cf9 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -505,12 +505,14 @@ static void do_get(char *rname,char *lname)
}
- if (!cli_getattrE(cli, fnum, &attr, &size, NULL, NULL, NULL)) {
- DEBUG(0,("getattrE: %s\n",cli_errstr(cli)));
+ if (!cli_qfileinfo(cli, fnum,
+ &attr, &size, NULL, NULL, NULL, NULL, NULL) &&
+ !cli_getattrE(cli, fnum,
+ &attr, &size, NULL, NULL, NULL)) {
+ DEBUG(0,("getattrib: %s\n",cli_errstr(cli)));
return;
}
-
DEBUG(2,("getting file %s of size %.0f as %s ",
lname, (double)size, lname));
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index e7ddfc5fa0..49b076b5e6 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -848,7 +848,7 @@ static void do_tar(file_info *finfo)
}
ntarf++; /* Make sure we have a file on there */
safe_strcpy(mtar_mask,cur_dir, sizeof(pstring));
- safe_strcat(mtar_mask,"*.*", sizeof(pstring));
+ safe_strcat(mtar_mask,"*", sizeof(pstring));
do_list(mtar_mask, attribute, do_tar, False, True);
safe_strcpy(cur_dir,saved_curdir, sizeof(pstring));
}