diff options
| -rw-r--r-- | source3/include/doserr.h | 12 | ||||
| -rw-r--r-- | source3/include/rpc_dfs.h | 21 |
2 files changed, 17 insertions, 16 deletions
diff --git a/source3/include/doserr.h b/source3/include/doserr.h index bdb7da5956..dc5bd0414a 100644 --- a/source3/include/doserr.h +++ b/source3/include/doserr.h @@ -158,4 +158,16 @@ #define WERR_PRINTER_DRIVER_IN_USE W_ERROR(3001) #define WERR_STATUS_MORE_ENTRIES W_ERROR(0x0105) +/* DFS errors */ + +#ifndef NERR_BASE +#define NERR_BASE (2100) +#endif + +#define WERR_DFS_NO_SUCH_VOL W_ERROR(NERR_BASE+562) +#define WERR_DFS_NO_SUCH_SHARE W_ERROR(NERR_BASE+565) +#define WERR_DFS_NO_SUCH_SERVER W_ERROR(NERR_BASE+573) +#define WERR_DFS_INTERNAL_ERROR W_ERROR(NERR_BASE+590) +#define WERR_DFS_CANT_CREATE_JUNCT W_ERROR(NERR_BASE+569) + #endif /* _DOSERR_H */ diff --git a/source3/include/rpc_dfs.h b/source3/include/rpc_dfs.h index 85be2cdabd..5222d6b356 100644 --- a/source3/include/rpc_dfs.h +++ b/source3/include/rpc_dfs.h @@ -35,17 +35,6 @@ #define DFSFLAG_ADD_VOLUME 0x00000001 #define DFSFLAG_RESTORE_VOLUME 0x00000002 -/* API errors from lmerr.h */ -#ifndef NERR_BASE -#define NERR_BASE (2100) -#endif - -#define NERR_DfsNoSuchVolume (NERR_BASE+562) -#define NERR_DfsNoSuchShare (NERR_BASE+565) -#define NERR_DfsNoSuchServer (NERR_BASE+573) -#define NERR_DfsInternalError (NERR_BASE+590) -#define NERR_DfsCantCreateJunctionPoint (NERR_BASE+569) - typedef struct dfs_q_dfs_exist { uint32 dummy; @@ -55,7 +44,7 @@ DFS_Q_DFS_EXIST; /* status == 1 if dfs exists. */ typedef struct dfs_r_dfs_exist { - uint32 status; + uint32 status; /* Not a WERROR or NTSTATUS code */ } DFS_R_DFS_EXIST; @@ -75,7 +64,7 @@ DFS_Q_DFS_ADD; typedef struct dfs_r_dfs_add { - NTSTATUS status; + WERROR status; } DFS_R_DFS_ADD; @@ -92,7 +81,7 @@ DFS_Q_DFS_REMOVE; typedef struct dfs_r_dfs_remove { - NTSTATUS status; + WERROR status; } DFS_R_DFS_REMOVE; @@ -173,7 +162,7 @@ typedef struct dfs_r_dfs_get_info uint32 level; uint32 ptr_ctr; DFS_INFO_CTR ctr; - NTSTATUS status; + WERROR status; } DFS_R_DFS_GET_INFO; @@ -202,7 +191,7 @@ typedef struct dfs_r_dfs_enum uint32 ptr_num_entries2; uint32 num_entries2; ENUM_HND reshnd; - NTSTATUS status; + WERROR status; } DFS_R_DFS_ENUM; |