diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-11-01 13:30:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:37 -0500 |
| commit | d0375cfd43abf3d809ef85c198dd147eb1ffb09a (patch) | |
| tree | 589c656153e12feea0fd9abe19de21efc55b79fa | |
| parent | 15c1df2e8a71b0e61b6db116c99ed40b1180567d (diff) | |
| download | samba-d0375cfd43abf3d809ef85c198dd147eb1ffb09a.tar.gz samba-d0375cfd43abf3d809ef85c198dd147eb1ffb09a.tar.bz2 samba-d0375cfd43abf3d809ef85c198dd147eb1ffb09a.zip | |
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)
| -rw-r--r-- | source4/librpc/idl/misc.idl | 6 | ||||
| -rw-r--r-- | source4/librpc/idl/samr.idl | 6 | ||||
| -rw-r--r-- | source4/rpc_server/samr/samr_password.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl index 5d40753448..2f21b63105 100644 --- 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 1555dadfeb..c6ad14ce04 100644 --- 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 acbb02a795..95524c22a9 100644 --- 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; |