summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-08-15 15:14:14 +0000
committerAndrew Tridgell <tridge@samba.org>2003-08-15 15:14:14 +0000
commitd3bc355533af429be645bb1c965350fa532d03d4 (patch)
treecdc2fed2781f4fc2f4cd0bf3446bdb2c00d732bc
parent0efd81efec653f97e6d24e9b19cc6bd6f72185fe (diff)
downloadsamba-d3bc355533af429be645bb1c965350fa532d03d4.tar.gz
samba-d3bc355533af429be645bb1c965350fa532d03d4.tar.bz2
samba-d3bc355533af429be645bb1c965350fa532d03d4.zip
some servers don't return a fs_type and dev_type
(This used to be commit eaec1bdaadd744c63fb270b3807bc284dfadb37d)
-rw-r--r--source4/libcli/raw/clitree.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index 60e8610bd8..a088ae7023 100644
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -283,8 +283,12 @@ NTSTATUS cli_tree_full_connection(struct cli_tree **ret_tree,
}
tree->tid = tcon.tconx.out.cnum;
- tree->device = talloc_strdup(tree->mem_ctx, tcon.tconx.out.dev_type);
- tree->fs_type = talloc_strdup(tree->mem_ctx, tcon.tconx.out.fs_type);
+ if (tcon.tconx.out.dev_type) {
+ tree->device = talloc_strdup(tree->mem_ctx, tcon.tconx.out.dev_type);
+ }
+ if (tcon.tconx.out.fs_type) {
+ tree->fs_type = talloc_strdup(tree->mem_ctx, tcon.tconx.out.fs_type);
+ }
talloc_destroy(mem_ctx);