summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-23 03:29:20 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-23 03:29:20 +0200
commit94c522b1ab2e969f8697f386ba6a933d0984a1dc (patch)
tree174c1d8bf9a3fe01dcdd039a413f3ab0e3a9b7f4
parente56dff3f7b0d7535ea208081dbbc4e67dcc1709a (diff)
downloadsamba-94c522b1ab2e969f8697f386ba6a933d0984a1dc.tar.gz
samba-94c522b1ab2e969f8697f386ba6a933d0984a1dc.tar.bz2
samba-94c522b1ab2e969f8697f386ba6a933d0984a1dc.zip
Import NTSTATUS defines from Samba 3.
-rw-r--r--lib/util/asn1_proto.h8
-rw-r--r--libcli/util/ntstatus.h (renamed from source4/libcli/util/ntstatus.h)6
2 files changed, 9 insertions, 5 deletions
diff --git a/lib/util/asn1_proto.h b/lib/util/asn1_proto.h
index bcaf2c2121..9b7b4d26d5 100644
--- a/lib/util/asn1_proto.h
+++ b/lib/util/asn1_proto.h
@@ -1,5 +1,5 @@
-#ifndef ___LIB_UTIL_ASN1_PROTO_H__
-#define ___LIB_UTIL_ASN1_PROTO_H__
+#ifndef _____LIB_UTIL_ASN1_PROTO_H__
+#define _____LIB_UTIL_ASN1_PROTO_H__
#undef _PRINTF_ATTRIBUTE
#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
@@ -10,7 +10,7 @@
* used outside this particular subsystem! */
-/* The following definitions come from lib/util/asn1.c */
+/* The following definitions come from ../lib/util/asn1.c */
struct asn1_data *asn1_init(TALLOC_CTX *mem_ctx);
void asn1_free(struct asn1_data *data);
@@ -55,5 +55,5 @@ NTSTATUS asn1_full_tag(DATA_BLOB blob, uint8_t tag, size_t *packet_size);
#undef _PRINTF_ATTRIBUTE
#define _PRINTF_ATTRIBUTE(a1, a2)
-#endif /* ___LIB_UTIL_ASN1_PROTO_H__ */
+#endif /* _____LIB_UTIL_ASN1_PROTO_H__ */
diff --git a/source4/libcli/util/ntstatus.h b/libcli/util/ntstatus.h
index 7d223ae789..b7195a41b4 100644
--- a/source4/libcli/util/ntstatus.h
+++ b/libcli/util/ntstatus.h
@@ -50,6 +50,8 @@ typedef uint32_t NTSTATUS;
#define NT_STATUS_NO_MORE_ENTRIES NT_STATUS(0x8000001a)
#define STATUS_PENDING NT_STATUS(0x0103)
+/* Vista Status codes. */
+#define NT_STATUS_INACCESSIBLE_SYSTEM_SHORTCUT NT_STATUS(0x8000002d)
#define STATUS_MORE_ENTRIES NT_STATUS(0x0105)
#define STATUS_SOME_UNMAPPED NT_STATUS(0x0107)
#define STATUS_NOTIFY_CLEANUP NT_STATUS(0x010b)
@@ -590,11 +592,13 @@ typedef uint32_t NTSTATUS;
#define NT_STATUS_TOO_MANY_LINKS NT_STATUS(0xC0000000 | 0x0265)
#define NT_STATUS_QUOTA_LIST_INCONSISTENT NT_STATUS(0xC0000000 | 0x0266)
#define NT_STATUS_FILE_IS_OFFLINE NT_STATUS(0xC0000000 | 0x0267)
+#define NT_STATUS_DS_NO_MORE_RIDS NT_STATUS(0xC0000000 | 0x02a8)
#define NT_STATUS_NOT_A_REPARSE_POINT NT_STATUS(0xC0000000 | 0x0275)
#define NT_STATUS_CURRENT_DOMAIN_NOT_ALLOWED NT_STATUS(0xC0000000 | 0x02E9)
#define NT_STATUS_OBJECTID_NOT_FOUND NT_STATUS(0xC0000000 | 0x02F0)
#define NT_STATUS_NO_SUCH_JOB NT_STATUS(0xC0000000 | 0xEDE) /* scheduler */
#define NT_STATUS_DOWNGRADE_DETECTED NT_STATUS(0xC0000000 | 0x0388)
+#define NT_STATUS_NO_SUCH_JOB NT_STATUS(0xC0000000 | 0xEDE) /* scheduler */
#define NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED NT_STATUS(0xC0000000 | 0x20004)
#define NT_STATUS_RPC_UNSUPPORTED_NAME_SYNTAX NT_STATUS(0xC0000000 | 0x20026)
#define NT_STATUS_RPC_NT_CALL_FAILED NT_STATUS(0xC0000000 | 0x2001B)
@@ -673,6 +677,6 @@ NTSTATUS nt_status_string_to_code(const char *nt_status_str);
#define NT_STATUS_IS_LDAP(status) ((NT_STATUS_V(status) & 0xFF000000) == 0xF2000000)
#define NT_STATUS_LDAP_CODE(status) (NT_STATUS_V(status) & ~0xFF000000)
-
+#define NT_STATUS_RPC_CANNOT_SUPPORT NT_STATUS(0xC0000000 | 0x20041)
#endif /* _NTSTATUS_H */