summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-04-24 05:45:04 +0000
committerTim Potter <tpot@samba.org>2002-04-24 05:45:04 +0000
commit9935aaec4766c0a57311301f234e19e79c27c0c1 (patch)
treebe0c5cccb664626628ce754210968c49a5a83141 /source3
parent5c820d063736507441921e7faf597b033095f0c7 (diff)
downloadsamba-9935aaec4766c0a57311301f234e19e79c27c0c1.tar.gz
samba-9935aaec4766c0a57311301f234e19e79c27c0c1.tar.bz2
samba-9935aaec4766c0a57311301f234e19e79c27c0c1.zip
Merge from HEAD:
>Added constant and message for invalid security descriptor dos error. (This used to be commit f16c85caff9adb640c70ce6b932f33bdec696665)
Diffstat (limited to 'source3')
-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 4945bc69d7..9750dd7489 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_SECURITY_DESCRIPTOR W_ERROR(1338)
#define WERR_UNKNOWN_PRINTER_DRIVER W_ERROR(1797)
#define WERR_INVALID_PRINTER_NAME W_ERROR(1801)
#define WERR_PRINTER_ALREADY_EXISTS W_ERROR(1802)
diff --git a/source3/libsmb/doserr.c b/source3/libsmb/doserr.c
index adc001bf29..116a54e76f 100644
--- a/source3/libsmb/doserr.c
+++ b/source3/libsmb/doserr.c
@@ -65,6 +65,7 @@ werror_code_struct dos_errs[] =
{ "WERR_DFS_NO_SUCH_SERVER", WERR_DFS_NO_SUCH_SERVER },
{ "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 },
{ NULL, W_ERROR(0) }
};