r26332: Add samr_ValidationStatus error mapping to samr_ValidatePassword().
authorGünther Deschner <gd@samba.org>
Fri, 7 Dec 2007 10:45:17 +0000 (11:45 +0100)
committerStefan Metzmacher <metze@samba.org>
Fri, 21 Dec 2007 04:48:44 +0000 (05:48 +0100)
Torture test to follow.

Guenther
(This used to be commit 10ccfb4c8970bdb140aa9daf945caea72a4ab7cd)

source4/librpc/idl/samr.idl

index 2497ec569f62a431b801ee08aee6905dcafdfce7..f008637e99307636e8c16cbcfcf5c549c3391e69 100644 (file)
@@ -1324,6 +1324,26 @@ import "misc.idl", "lsa.idl", "security.idl";
                NetValidatePasswordReset = 3
        } samr_ValidatePasswordLevel;
 
+       /* NetApi maps samr_ValidationStatus errors to WERRORs. Haven't
+        * identified the mapping of
+        * - NERR_PasswordFilterError
+        * - NERR_PasswordExpired and
+        * - NERR_PasswordCantChange
+        * yet - Guenther
+        */
+
+       typedef enum {
+               SAMR_VALIDATION_STATUS_SUCCESS = 0,
+               SAMR_VALIDATION_STATUS_PASSWORD_MUST_CHANGE = 1,
+               SAMR_VALIDATION_STATUS_ACCOUNT_LOCKED_OUT = 2,
+               SAMR_VALIDATION_STATUS_BAD_PASSWORD = 4,
+               SAMR_VALIDATION_STATUS_PWD_HISTORY_CONFLICT = 5,
+               SAMR_VALIDATION_STATUS_PWD_TOO_SHORT = 6,
+               SAMR_VALIDATION_STATUS_PWD_TOO_LONG = 7,
+               SAMR_VALIDATION_STATUS_NOT_COMPLEX_ENOUGH = 8,
+               SAMR_VALIDATION_STATUS_PASSWORD_TOO_RECENT = 9
+       } samr_ValidationStatus;
+
        typedef struct {
                uint32 length;
                [size_is(length)] uint8 *data;
@@ -1341,7 +1361,7 @@ import "misc.idl", "lsa.idl", "security.idl";
 
        typedef struct {
                samr_ValidatePasswordInfo info;
-               uint16 status;
+               samr_ValidationStatus status;
        } samr_ValidatePasswordRepCtr;
 
        typedef [switch_type(uint16)] union {