svn commit: samba r11438 - in branches/SAMBA_4_0/source: librpc/idl rpc_server/samr

[abartlet]

Author: abartlet
Date: 2005-11-01 13:30:09 +0000 (Tue, 01 Nov 2005)
New Revision: 11438

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11438

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

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/librpc/idl/misc.idl
   branches/SAMBA_4_0/source/librpc/idl/samr.idl
   branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/misc.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/misc.idl       2005-11-01 13:29:22 UTC 
(rev 11437)
+++ branches/SAMBA_4_0/source/librpc/idl/misc.idl       2005-11-01 13:30:09 UTC 
(rev 11438)
@@ -39,5 +39,11 @@
                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;
 
+
 }

Modified: branches/SAMBA_4_0/source/librpc/idl/samr.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/samr.idl       2005-11-01 13:29:22 UTC 
(rev 11437)
+++ branches/SAMBA_4_0/source/librpc/idl/samr.idl       2005-11-01 13:30:09 UTC 
(rev 11438)
@@ -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;

Modified: branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c   2005-11-01 
13:29:22 UTC (rev 11437)
+++ branches/SAMBA_4_0/source/rpc_server/samr/samr_password.c   2005-11-01 
13:30:09 UTC (rev 11438)
@@ -830,7 +830,7 @@
                                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;