summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2011-06-16 08:39:03 +0200
committerMatthias Dieter Wallnöfer <mdw@samba.org>2011-06-16 09:05:31 +0200
commit75e77f9fa023d81a57e7913bcbd712eae7a677b1 (patch)
tree16a24314aa86c2f9a20a713826baee890f2b7379 /source4/ntvfs
parent9ba10877aa558c016e2a40f209d1eaf694e47965 (diff)
downloadsamba-75e77f9fa023d81a57e7913bcbd712eae7a677b1.tar.gz
samba-75e77f9fa023d81a57e7913bcbd712eae7a677b1.tar.bz2
samba-75e77f9fa023d81a57e7913bcbd712eae7a677b1.zip
s4:ntvfs subsystems - rework it using concrete enum values
This changes commit 260bc987b00b3fff6c9b99211627b14e9bd0789a to comply with metze's plans.
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/ntvfs_generic.c14
-rw-r--r--source4/ntvfs/posix/pvfs_qfileinfo.c6
-rw-r--r--source4/ntvfs/posix/pvfs_search.c6
3 files changed, 22 insertions, 4 deletions
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 9aa8e04787..bed9c9c755 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -664,9 +664,12 @@ static NTSTATUS ntvfs_map_fsinfo_finish(struct ntvfs_module_context *ntvfs,
ZERO_STRUCT(fs->objectid_information.out.unknown);
return NT_STATUS_OK;
- default:
+ case RAW_QFS_GENERIC:
+ case RAW_QFS_UNIX_INFO:
return NT_STATUS_INVALID_LEVEL;
}
+
+ return NT_STATUS_INVALID_LEVEL;
}
/*
@@ -926,9 +929,16 @@ NTSTATUS ntvfs_map_fileinfo(TALLOC_CTX *mem_ctx,
info->unix_link_info.out.link_dest = info2->generic.out.link_dest;
return NT_STATUS_OK;
#endif
- default:
+ case RAW_FILEINFO_GENERIC:
+ case RAW_FILEINFO_SEC_DESC:
+ case RAW_FILEINFO_EA_LIST:
+ case RAW_FILEINFO_UNIX_INFO2:
+ case RAW_FILEINFO_SMB2_ALL_EAS:
+ case RAW_FILEINFO_SMB2_ALL_INFORMATION:
return NT_STATUS_INVALID_LEVEL;
}
+
+ return NT_STATUS_INVALID_LEVEL;
}
/*
diff --git a/source4/ntvfs/posix/pvfs_qfileinfo.c b/source4/ntvfs/posix/pvfs_qfileinfo.c
index 515819b6ee..9284306753 100644
--- a/source4/ntvfs/posix/pvfs_qfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_qfileinfo.c
@@ -331,10 +331,14 @@ static NTSTATUS pvfs_map_fileinfo(struct pvfs_state *pvfs,
NT_STATUS_HAVE_NO_MEMORY(info->all_info2.out.fname.s);
return NT_STATUS_OK;
- default:
+ case RAW_FILEINFO_GENERIC:
+ case RAW_FILEINFO_UNIX_BASIC:
+ case RAW_FILEINFO_UNIX_INFO2:
+ case RAW_FILEINFO_UNIX_LINK:
return NT_STATUS_INVALID_LEVEL;
}
+ return NT_STATUS_INVALID_LEVEL;
}
/*
diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index 668f8d741e..893f55c5ac 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -220,9 +220,13 @@ static NTSTATUS fill_search_info(struct pvfs_state *pvfs,
file->id_both_directory_info.name.s = fname;
return NT_STATUS_OK;
- default:
+ case RAW_SEARCH_DATA_GENERIC:
+ case RAW_SEARCH_DATA_UNIX_INFO:
+ case RAW_SEARCH_DATA_UNIX_INFO2:
return NT_STATUS_INVALID_LEVEL;
}
+
+ return NT_STATUS_INVALID_LEVEL;
}