r11438: Move enum samr_RejectReason into misc.idl so I can use it in a global

prototype.

Andrew Bartlett
(This used to be commit a3abffc75805c8e333f387a96a1dbc352669d359)

diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl
index 5d40753448431b2a0292f5476fbdd095bce15c0e..2f21b631051a8859238303dd0cd52a579601235d 100644 (file)
--- a/source4/librpc/idl/misc.idl
+++ b/source4/librpc/idl/misc.idl
@@ -39,5 +39,11 @@ interface misc
                SAM_DATABASE_PRIVS   = 2 /* Privileges */
        } netr_SamDatabaseID;
 
+       typedef [public,v1_enum] enum {
+               SAMR_REJECT_OTHER      = 0,
+               SAMR_REJECT_TOO_SHORT  = 1,
+               SAMR_REJECT_COMPLEXITY = 2
+       } samr_RejectReason;
+
 
 }

diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index 1555dadfeb6e38322f909e9804403946509049b4..c6ad14ce0453f8a8b8130aedfe9f6c42f6180ff1 100644 (file)
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -1141,11 +1141,7 @@
        /************************/
        /* Function    0x3f     */
 
-       typedef [v1_enum] enum {
-               SAMR_REJECT_OTHER      = 0,
-               SAMR_REJECT_TOO_SHORT  = 1,
-               SAMR_REJECT_COMPLEXITY = 2
-       } samr_RejectReason;
+       declare enum samr_RejectReason;
 
        typedef struct {
                samr_RejectReason reason;

diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index acbb02a7950f5e420e163ed049d6f7c6e63a77b8..95524c22a93f4cc906a1674ca826f9513c0bcfea 100644 (file)
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -830,7 +830,7 @@ NTSTATUS samdb_set_password_sid(struct ldb_context *ctx, TALLOC_CTX *mem_ctx,
                                struct samr_Password *ntNewHash,
                                BOOL user_change,
                                BOOL restrictions,
-                               uint32_t *reject_reason,
+                               enum samr_RejectReason *reject_reason,
                                struct samr_DomInfo1 **_dominfo) 
 {
        NTSTATUS nt_status;