sync up with 2.2

diff --git a/source/include/doserr.h b/source/include/doserr.h
index 3dcfe02827f506b651d319a8f02cfbf0257bc5a9..43a325bc52f1fe2045a3385f56e9ed58f6023093 100644 (file)
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -78,6 +78,14 @@
 /* here's a special one from observing NT */
 #define ERRnoipc 66 /* don't support ipc */
 
+/* These errors seem to be only returned by the NT printer driver system */
+
+#define ERRunknownprinterdriver 1797 /* ERROR_UNKNOWN_PRINTER_DRIVER */
+#define ERRinvalidprintername 1801 /* ERROR_INVALID_PRINTER_NAME */
+#define ERRinvaliddatatype 1804 /* ERROR_INVALID_DATATYPE */
+#define ERRinvalidenvironment 1805 /* ERROR_INVALID_ENVIRONMENT */
+#define ERRprinterdriverinuse 3001 /* ERROR_PRINTER_DRIVER_IN_USE */
+
 /* Error codes for the ERRSRV class */
 
 #define ERRerror 1 /* Non specific error code */
@@ -136,6 +144,7 @@
 /* these are win32 error codes. There are only a few places where
    these matter for Samba, primarily in the NT printing code */
 #define WERR_OK W_ERROR(0)
+#define WERR_BADFILE W_ERROR(2)
 #define WERR_ACCESS_DENIED W_ERROR(5)
 #define WERR_BADFID W_ERROR(6)
 #define WERR_BADFUNC W_ERROR(1)