s4:ntvfs subsystems - rework it using concrete enum values

This changes commit 260bc987b00b3fff6c9b99211627b14e9bd0789a to comply
with metze's plans.

diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 9aa8e04787230165b872c0bbf88448658db90dfd..bed9c9c7556882fb914cbfd6e023aaeaea000f7d 100644 (file)
--- 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 515819b6eeae374655c4b0db067001d6394ec9bf..92843067539fe3168f085c69d049ca18b60761f8 100644 (file)
--- 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 668f8d741eeaa815b34d688967dbf8480cad8b20..893f55c5acadea07ed35061e512f90ffcc674416 100644 (file)
--- 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;
 }
 
 

diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 28e6953683b1578fcd5049faacc2e9130c7e65f5..9b6e7fc0fd51bfeeafc3716eb8558f723bc455fa 100644 (file)
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -2309,7 +2309,27 @@ static void gen_setfileinfo(int instance, union smb_setfileinfo *info)
                info->full_ea_information.in.eas = gen_ea_list();
                break;
 
-       default:
+       case RAW_SFILEINFO_GENERIC:
+       case RAW_SFILEINFO_SEC_DESC:
+       case RAW_SFILEINFO_1025:
+       case RAW_SFILEINFO_1029:
+       case RAW_SFILEINFO_1032:
+       case RAW_SFILEINFO_UNIX_BASIC:
+       case RAW_SFILEINFO_UNIX_INFO2:
+       case RAW_SFILEINFO_UNIX_LINK:
+       case RAW_SFILEINFO_UNIX_HLINK:
+       case RAW_SFILEINFO_LINK_INFORMATION:
+       case RAW_SFILEINFO_PIPE_INFORMATION:
+       case RAW_SFILEINFO_VALID_DATA_INFORMATION:
+       case RAW_SFILEINFO_SHORT_NAME_INFORMATION:
+       case RAW_SFILEINFO_1027:
+       case RAW_SFILEINFO_1030:
+       case RAW_SFILEINFO_1031:
+       case RAW_SFILEINFO_1036:
+       case RAW_SFILEINFO_1041:
+       case RAW_SFILEINFO_1042:
+       case RAW_SFILEINFO_1043:
+       case RAW_SFILEINFO_1044:
                /* Untested */
                break;
        }