This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to...

[samba.git] / source3 / rpc_server / srv_lsa_nt.c

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index fb6538db39f9d8b14fa8ab8bc5945f906b5294f2..10c583b70d633a44287c5fdbdb387671a9f11484 100644 (file)
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -645,7 +645,7 @@ NTSTATUS _lsa_lookup_sids(pipes_struct *p, LSA_Q_LOOKUP_SIDS *q_u, LSA_R_LOOKUP_
                num_entries = MAX_LOOKUP_SIDS;
                DEBUG(5,("_lsa_lookup_sids: truncating SID lookup list to %d\n", num_entries));
        }
-               
+
        ref = (DOM_R_REF *)talloc_zero(p->mem_ctx, sizeof(DOM_R_REF));
        names = (LSA_TRANS_NAME_ENUM *)talloc_zero(p->mem_ctx, sizeof(LSA_TRANS_NAME_ENUM));
 
@@ -1265,140 +1265,3 @@ NTSTATUS _lsa_query_info2(pipes_struct *p, LSA_Q_QUERY_INFO2 *q_u, LSA_R_QUERY_I
 
        return r_u->status;
 }
-
-
-/***************************************************************************
- For a given SID, enumerate all the privilege this account has.
- ***************************************************************************/
-NTSTATUS _lsa_enum_acct_rights(pipes_struct *p, LSA_Q_ENUM_ACCT_RIGHTS *q_u, LSA_R_ENUM_ACCT_RIGHTS *r_u)
-{
-       struct lsa_info *info=NULL;
-       char **rights = NULL;
-       int num_rights = 0;
-       int i;
-
-       r_u->status = NT_STATUS_OK;
-
-       /* find the connection policy handle. */
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
-               return NT_STATUS_INVALID_HANDLE;
-
-       r_u->status = privilege_enum_account_rights(&q_u->sid.sid, &num_rights, &rights);
-
-       init_r_enum_acct_rights(r_u, num_rights, (const char **)rights);
-
-       for (i=0;i<num_rights;i++) {
-               free(rights[i]);
-       }
-       safe_free(rights);
-
-       return r_u->status;
-}
-
-/***************************************************************************
-return a list of SIDs for a particular privilege
- ***************************************************************************/
-NTSTATUS _lsa_enum_acct_with_right(pipes_struct *p, 
-                                  LSA_Q_ENUM_ACCT_WITH_RIGHT *q_u, 
-                                  LSA_R_ENUM_ACCT_WITH_RIGHT *r_u)
-{
-       struct lsa_info *info=NULL;
-       char *right;
-       DOM_SID *sids = NULL;
-       uint32 count = 0;
-
-       r_u->status = NT_STATUS_OK;
-
-       /* find the connection policy handle. */
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
-               return NT_STATUS_INVALID_HANDLE;
-
-       right = unistr2_tdup(p->mem_ctx, &q_u->right);
-
-       DEBUG(5,("lsa_enum_acct_with_right on right %s\n", right));
-
-       r_u->status = privilege_enum_account_with_right(right, &count, &sids);
-
-       init_r_enum_acct_with_right(r_u, count, sids);
-
-       safe_free(sids);
-
-       return r_u->status;
-}
-
-/***************************************************************************
- add privileges to a acct by SID
- ***************************************************************************/
-NTSTATUS _lsa_add_acct_rights(pipes_struct *p, LSA_Q_ADD_ACCT_RIGHTS *q_u, LSA_R_ADD_ACCT_RIGHTS *r_u)
-{
-       struct lsa_info *info=NULL;
-       int i;
-
-       r_u->status = NT_STATUS_OK;
-
-       /* find the connection policy handle. */
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
-               return NT_STATUS_INVALID_HANDLE;
-
-       DEBUG(5,("_lsa_add_acct_rights to %s (%d rights)\n", 
-                sid_string_static(&q_u->sid.sid), q_u->rights.count));
-
-       for (i=0;i<q_u->rights.count;i++) {
-               DEBUG(5,("\t%s\n", unistr2_static(&q_u->rights.strings[i].string)));
-       }
-
-
-       for (i=0;i<q_u->rights.count;i++) {
-               r_u->status = privilege_add_account_right(unistr2_static(&q_u->rights.strings[i].string),
-                                                         &q_u->sid.sid);
-               if (!NT_STATUS_IS_OK(r_u->status)) {
-                       DEBUG(2,("Failed to add right '%s'\n", 
-                                unistr2_static(&q_u->rights.strings[i].string)));
-                       break;
-               }
-       }
-
-       init_r_add_acct_rights(r_u);
-
-       return r_u->status;
-}
-
-
-/***************************************************************************
- remove privileges from a acct by SID
- ***************************************************************************/
-NTSTATUS _lsa_remove_acct_rights(pipes_struct *p, LSA_Q_REMOVE_ACCT_RIGHTS *q_u, LSA_R_REMOVE_ACCT_RIGHTS *r_u)
-{
-       struct lsa_info *info=NULL;
-       int i;
-
-       r_u->status = NT_STATUS_OK;
-
-       /* find the connection policy handle. */
-       if (!find_policy_by_hnd(p, &q_u->pol, (void **)&info))
-               return NT_STATUS_INVALID_HANDLE;
-
-
-       DEBUG(5,("_lsa_remove_acct_rights from %s all=%d (%d rights)\n", 
-                sid_string_static(&q_u->sid.sid),
-                q_u->removeall,
-                q_u->rights.count));
-
-       for (i=0;i<q_u->rights.count;i++) {
-               DEBUG(5,("\t%s\n", unistr2_static(&q_u->rights.strings[i].string)));
-       }
-
-       for (i=0;i<q_u->rights.count;i++) {
-               r_u->status = privilege_remove_account_right(unistr2_static(&q_u->rights.strings[i].string),
-                                                            &q_u->sid.sid);
-               if (!NT_STATUS_IS_OK(r_u->status)) {
-                       DEBUG(2,("Failed to remove right '%s'\n", 
-                                unistr2_static(&q_u->rights.strings[i].string)));
-                       break;
-               }
-       }
-
-       init_r_remove_acct_rights(r_u);
-
-       return r_u->status;
-}