Use pidl for _lsa_EnumAccountRights().

Guenther

diff --git a/source/rpc_server/srv_lsa.c b/source/rpc_server/srv_lsa.c
index 33686e575f8b2db54dccf3486c33e95994c1f136..14cf0b3cc9a1a21d67f9ba1b44d09c4555d80c65 100644 (file)
--- a/source/rpc_server/srv_lsa.c
+++ b/source/rpc_server/srv_lsa.c
@@ -316,29 +316,7 @@ static bool api_lsa_remove_acct_rights(pipes_struct *p)
 
 static bool api_lsa_enum_acct_rights(pipes_struct *p)
 {
-       LSA_Q_ENUM_ACCT_RIGHTS q_u;
-       LSA_R_ENUM_ACCT_RIGHTS r_u;
-       
-       prs_struct *data = &p->in_data.data;
-       prs_struct *rdata = &p->out_data.rdata;
-
-       ZERO_STRUCT(q_u);
-       ZERO_STRUCT(r_u);
-
-       if(!lsa_io_q_enum_acct_rights("", &q_u, data, 0)) {
-               DEBUG(0,("api_lsa_enum_acct_rights: failed to unmarshall LSA_Q_ENUM_ACCT_RIGHTS.\n"));
-               return False;
-       }
-
-       r_u.status = _lsa_enum_acct_rights(p, &q_u, &r_u);
-
-       /* store the response in the SMB stream */
-       if(!lsa_io_r_enum_acct_rights("", &r_u, rdata, 0)) {
-               DEBUG(0,("api_lsa_enum_acct_rights: Failed to marshall LSA_R_ENUM_ACCT_RIGHTS.\n"));
-               return False;
-       }
-
-       return True;
+       return proxy_lsa_call(p, NDR_LSA_ENUMACCOUNTRIGHTS);
 }
 
 /***************************************************************************

diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index 0be72c5d75c68eb31bca044e6eb7fdc89da8f06a..a709877d6e0e320bfe5cd44ef489f1a71b3a33c9 100644 (file)
--- a/source/rpc_server/srv_lsa_nt.c
+++ b/source/rpc_server/srv_lsa_nt.c
@@ -2149,27 +2149,69 @@ NTSTATUS _lsa_remove_acct_rights(pipes_struct *p, LSA_Q_REMOVE_ACCT_RIGHTS *q_u,
        return NT_STATUS_OK;
 }
 
+/*******************************************************************
+********************************************************************/
+
+static NTSTATUS init_lsa_right_set(TALLOC_CTX *mem_ctx,
+                                  struct lsa_RightSet *r,
+                                  PRIVILEGE_SET *privileges)
+{
+       uint32 i;
+       const char *privname;
+       const char **privname_array = NULL;
+       int num_priv = 0;
+
+       for (i=0; i<privileges->count; i++) {
+
+               privname = luid_to_privilege_name(&privileges->set[i].luid);
+               if (privname) {
+                       if (!add_string_to_array(mem_ctx, privname,
+                                                &privname_array, &num_priv)) {
+                               return NT_STATUS_NO_MEMORY;
+                       }
+               }
+       }
+
+       if (num_priv) {
+
+               r->names = TALLOC_ZERO_ARRAY(mem_ctx, struct lsa_StringLarge,
+                                            num_priv);
+               if (!r->names) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+
+               for (i=0; i<num_priv; i++) {
+                       init_lsa_StringLarge(&r->names[i], privname_array[i]);
+               }
+
+               r->count = num_priv;
+       }
+
+       return NT_STATUS_OK;
+}
 
 /***************************************************************************
+ _lsa_EnumAccountRights
  ***************************************************************************/
 
-NTSTATUS _lsa_enum_acct_rights(pipes_struct *p, LSA_Q_ENUM_ACCT_RIGHTS *q_u, LSA_R_ENUM_ACCT_RIGHTS *r_u)
+NTSTATUS _lsa_EnumAccountRights(pipes_struct *p,
+                               struct lsa_EnumAccountRights *r)
 {
+       NTSTATUS status;
        struct lsa_info *info = NULL;
        DOM_SID sid;
        PRIVILEGE_SET privileges;
        SE_PRIV mask;
 
-
        /* find the connection policy handle. */
 
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)(void *)&info))
+       if (!find_policy_by_hnd(p, r->in.handle, (void **)(void *)&info))
                return NT_STATUS_INVALID_HANDLE;
 
        /* according to an NT4 PDC, you can add privileges to SIDs even without
           call_lsa_create_account() first.  And you can use any arbitrary SID. */
 
-       sid_copy( &sid, &q_u->sid.sid );
+       sid_copy( &sid, r->in.sid );
 
        if ( !get_privileges_for_sids( &mask, &sid, 1 ) )
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
@@ -2178,20 +2220,19 @@ NTSTATUS _lsa_enum_acct_rights(pipes_struct *p, LSA_Q_ENUM_ACCT_RIGHTS *q_u, LSA
 
        if ( se_priv_to_privilege_set( &privileges, &mask ) ) {
 
-               DEBUG(10,("_lsa_enum_acct_rights: %s has %d privileges\n",
+               DEBUG(10,("_lsa_EnumAccountRights: %s has %d privileges\n",
                          sid_string_dbg(&sid), privileges.count));
 
-               r_u->status = init_r_enum_acct_rights( r_u, &privileges );
+               status = init_lsa_right_set(p->mem_ctx, r->out.rights, &privileges);
+       } else {
+               status = NT_STATUS_NO_SUCH_PRIVILEGE;
        }
-       else
-               r_u->status = NT_STATUS_NO_SUCH_PRIVILEGE;
 
        privilege_set_free( &privileges );
 
-       return r_u->status;
+       return status;
 }
 
-
 /***************************************************************************
  _lsa_LookupPrivValue
  ***************************************************************************/
@@ -2314,12 +2355,6 @@ NTSTATUS _lsa_EnumAccountsWithUserRight(pipes_struct *p, struct lsa_EnumAccounts
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-NTSTATUS _lsa_EnumAccountRights(pipes_struct *p, struct lsa_EnumAccountRights *r)
-{
-       p->rng_fault_state = True;
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 NTSTATUS _lsa_RemoveAccountRights(pipes_struct *p, struct lsa_RemoveAccountRights *r)
 {
        p->rng_fault_state = True;