[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-844-geefd03d

[Günther Deschner]

The branch, v3-2-test has been updated
       via  eefd03d39b107598e9b0d1f35def7b17073d8ebc (commit)
       via  2453375ee04f466800f53a0f2991d8d5dee0bd8e (commit)
      from  bf638d97d7668292ef9abf890eebc402645b8327 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit eefd03d39b107598e9b0d1f35def7b17073d8ebc
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 12 18:30:14 2008 +0200

    Add WERR_USER_ALREADY_EXISTS and WERR_PASSWORD_RESTRICTION.
    
    Guenther

commit 2453375ee04f466800f53a0f2991d8d5dee0bd8e
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 12 18:29:13 2008 +0200

    Move some WERRORs down to the NERR_BASE block.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/include/doserr.h |   29 +++++++++++++----------------
 source/libsmb/doserr.c  |    4 ++++
 2 files changed, 17 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/doserr.h b/source/include/doserr.h
index d5892c1..1d1cc49 100644
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -206,6 +206,8 @@
 #define WERR_MACHINE_LOCKED W_ERROR(1271)
 #define WERR_NO_LOGON_SERVERS W_ERROR(1311)
 #define WERR_NO_SUCH_LOGON_SESSION W_ERROR(1312)
+#define WERR_USER_ALREADY_EXISTS W_ERROR(1316)
+#define WERR_PASSWORD_RESTRICTION W_ERROR(1325)
 #define WERR_LOGON_FAILURE W_ERROR(1326)
 #define WERR_NO_SUCH_DOMAIN W_ERROR(1355)
 #define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(1338)
@@ -218,19 +220,6 @@
 #define WERR_DOMAIN_CONTROLLER_NOT_FOUND W_ERROR(1908)
 #define WERR_ACCOUNT_LOCKED_OUT W_ERROR(1909)
 
-/* should these go down to NERR_BASE ? */
-#define WERR_BUF_TOO_SMALL W_ERROR(2123)
-#define WERR_JOB_NOT_FOUND W_ERROR(2151)
-#define WERR_DEST_NOT_FOUND W_ERROR(2152)
-#define WERR_USER_EXISTS W_ERROR(2224)
-#define WERR_NOT_LOCAL_DOMAIN W_ERROR(2320)
-#define WERR_DC_NOT_FOUND W_ERROR(2453)
-
-#define WERR_SETUP_ALREADY_JOINED W_ERROR(2691)
-#define WERR_SETUP_NOT_JOINED W_ERROR(2692)
-#define WERR_SETUP_DOMAIN_CONTROLLER W_ERROR(2693)
-#define WERR_DEFAULT_JOIN_REQUIRED W_ERROR(2694)
-
 #define WERR_DEVICE_NOT_AVAILABLE W_ERROR(4319)
 #define WERR_STATUS_MORE_ENTRIES   W_ERROR(0x0105)
 
@@ -274,13 +263,21 @@
 #define MAX_NERR (NERR_BASE+899)
 #endif
 
+#define WERR_BUF_TOO_SMALL		W_ERROR(NERR_BASE+23)
+#define WERR_JOB_NOT_FOUND		W_ERROR(NERR_BASE+51)
+#define WERR_DEST_NOT_FOUND		W_ERROR(NERR_BASE+52)
+#define WERR_USER_EXISTS		W_ERROR(NERR_BASE+124)
+#define WERR_NET_NAME_NOT_FOUND		W_ERROR(NERR_BASE+210)
+#define WERR_NOT_LOCAL_DOMAIN		W_ERROR(NERR_BASE+220)
+#define WERR_DC_NOT_FOUND		W_ERROR(NERR_BASE+353)
 #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)
-
-#define WERR_NET_NAME_NOT_FOUND		W_ERROR(NERR_BASE+210)
-
+#define WERR_SETUP_ALREADY_JOINED	W_ERROR(NERR_BASE+591)
+#define WERR_SETUP_NOT_JOINED		W_ERROR(NERR_BASE+592)
+#define WERR_SETUP_DOMAIN_CONTROLLER	W_ERROR(NERR_BASE+593)
+#define WERR_DEFAULT_JOIN_REQUIRED	W_ERROR(NERR_BASE+594)
 
 #endif /* _DOSERR_H */
diff --git a/source/libsmb/doserr.c b/source/libsmb/doserr.c
index 278875a..cd3c2fe 100644
--- a/source/libsmb/doserr.c
+++ b/source/libsmb/doserr.c
@@ -66,6 +66,7 @@ werror_code_struct dos_errs[] =
 	{ "WERR_USER_EXISTS", WERR_USER_EXISTS },
 	{ "WERR_NO_LOGON_SERVERS", WERR_NO_LOGON_SERVERS },
 	{ "WERR_NO_SUCH_LOGON_SESSION", WERR_NO_SUCH_LOGON_SESSION },
+	{ "WERR_USER_ALREADY_EXISTS", WERR_USER_ALREADY_EXISTS },
 	{ "WERR_PRINTER_DRIVER_IN_USE", WERR_PRINTER_DRIVER_IN_USE },
 	{ "WERR_STATUS_MORE_ENTRIES  ", WERR_STATUS_MORE_ENTRIES },
 	{ "WERR_DFS_NO_SUCH_VOL", WERR_DFS_NO_SUCH_VOL },
@@ -82,6 +83,7 @@ werror_code_struct dos_errs[] =
 	{ "WERR_DEFAULT_JOIN_REQUIRED", WERR_DEFAULT_JOIN_REQUIRED },
 	{ "WERR_DEVICE_NOT_AVAILABLE", WERR_DEVICE_NOT_AVAILABLE },
 	{ "WERR_LOGON_FAILURE", WERR_LOGON_FAILURE },
+	{ "WERR_PASSWORD_RESTRICTION", WERR_PASSWORD_RESTRICTION },
 	{ "WERR_NO_SUCH_DOMAIN", WERR_NO_SUCH_DOMAIN },
 	{ "WERR_INVALID_SECURITY_DESCRIPTOR", WERR_INVALID_SECURITY_DESCRIPTOR },
 	{ "WERR_TIME_SKEW", WERR_TIME_SKEW },
@@ -124,6 +126,8 @@ werror_str_struct dos_err_strs[] = {
 	{ WERR_PASSWORD_MUST_CHANGE, "The password must be changed" },
 	{ WERR_ACCOUNT_LOCKED_OUT, "Account locked out" },
 	{ WERR_TIME_SKEW, "Time difference between client and server" },
+	{ WERR_USER_ALREADY_EXISTS, "User already exists" },
+	{ WERR_PASSWORD_RESTRICTION, "Password does not meet restrictions" },
 };
 
 /*****************************************************************************


-- 
Samba Shared Repository