summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-05-07 06:18:50 +0000
committerTim Potter <tpot@samba.org>2002-05-07 06:18:50 +0000
commite8682b6c8e0bf0ed6e2cdec3c2e83e8771f88755 (patch)
tree5080c8258ad866c51ec43cbcb586880a50374623
parent9935aaec4766c0a57311301f234e19e79c27c0c1 (diff)
downloadsamba-e8682b6c8e0bf0ed6e2cdec3c2e83e8771f88755.tar.gz
samba-e8682b6c8e0bf0ed6e2cdec3c2e83e8771f88755.tar.bz2
samba-e8682b6c8e0bf0ed6e2cdec3c2e83e8771f88755.zip
Merge from HEAD:
>DOS error 1307 is returned when an invalid owner for a security descriptor >is detected. (This used to be commit 8b5cb1c2dda39ab4eaa5f61272cebcba072c332b)
-rw-r--r--source3/include/doserr.h1
-rw-r--r--source3/libsmb/doserr.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/source3/include/doserr.h b/source3/include/doserr.h
index 9750dd7489..45898f6375 100644
--- a/source3/include/doserr.h
+++ b/source3/include/doserr.h
@@ -164,6 +164,7 @@
#define WERR_OBJECT_PATH_INVALID W_ERROR(161)
#define WERR_NO_MORE_ITEMS W_ERROR(259)
#define WERR_MORE_DATA W_ERROR(234)
+#define WERR_INVALID_OWNER W_ERROR(1307)
#define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(1338)
#define WERR_UNKNOWN_PRINTER_DRIVER W_ERROR(1797)
#define WERR_INVALID_PRINTER_NAME W_ERROR(1801)
diff --git a/source3/libsmb/doserr.c b/source3/libsmb/doserr.c
index 116a54e76f..02db625685 100644
--- a/source3/libsmb/doserr.c
+++ b/source3/libsmb/doserr.c
@@ -66,6 +66,7 @@ werror_code_struct dos_errs[] =
{ "WERR_DFS_INTERNAL_ERROR", WERR_DFS_INTERNAL_ERROR },
{ "WERR_DFS_CANT_CREATE_JUNCT", WERR_DFS_CANT_CREATE_JUNCT },
{ "WERR_INVALID_SECURITY_DESCRIPTOR", WERR_INVALID_SECURITY_DESCRIPTOR },
+ { "WERR_INVALID_OWNER", WERR_INVALID_OWNER },
{ NULL, W_ERROR(0) }
};