git.samba.org / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Removed save directory argument to become_root() calls. Probably most of
[samba.git] / source3 / rpc_server / srv_lookup.c
diff --git a/source3/rpc_server/srv_lookup.c b/source3/rpc_server/srv_lookup.c
index 4f09360d93d6f8c4bafbc15246b0a40ac6fff794..e81f3051f3dcccbb1ab8eb676a36582adf4d7736 100644 (file)
--- a/source3/rpc_server/srv_lookup.c
+++ b/source3/rpc_server/srv_lookup.c
@@ -1,4 +1,3 @@
-
 /* 
  *  Unix SMB/Netbios implementation.
  *  Version 1.9.
@@ -44,7 +43,6 @@
  */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 
@@ -115,9 +113,9 @@ int make_dom_gids(DOMAIN_GRP *mem, int num_members, DOM_GID **ppgids)
                uint8  attr  = mem[count].attr;
                char   *name = mem[count].name;
 
-               become_root(True);
+               become_root();
                status = lookup_grp_rid(name, &rid, &type);
-               unbecome_root(True);
+               unbecome_root();
 
                if (status == 0x0)
                {
@@ -170,13 +168,13 @@ int get_domain_user_groups(DOMAIN_GRP_MEMBER **grp_members, uint32 group_rid)
 /*******************************************************************
  lookup_builtin_names
  ********************************************************************/
-uint32 lookup_builtin_names(DOM_SID *sid, char *name, uint8 *type)
+uint32 lookup_builtin_names(uint32 rid, char *name, uint8 *type)
 {
        uint32 status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
 
-       status = (status != 0x0) ? lookup_wk_user_name (sid, name, type) : status;
-       status = (status != 0x0) ? lookup_wk_group_name(sid, name, type) : status;
-       status = (status != 0x0) ? lookup_wk_alias_name(sid, name, type) : status;
+       status = (status != 0x0) ? lookup_wk_user_name (rid, name, type) : status;
+       status = (status != 0x0) ? lookup_wk_group_name(rid, name, type) : status;
+       status = (status != 0x0) ? lookup_wk_alias_name(rid, name, type) : status;
 
        return status;
 }
@@ -185,13 +183,13 @@ uint32 lookup_builtin_names(DOM_SID *sid, char *name, uint8 *type)
 /*******************************************************************
  lookup_added_name - names that have been added to the SAM database by admins.
  ********************************************************************/
-uint32 lookup_added_name(DOM_SID *sid, char *name, uint8 *type)
+uint32 lookup_added_name(uint32 rid, char *name, uint8 *type)
 {
        uint32 status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
 
-       status = (status != 0x0) ? lookup_user_name (sid, name, type) : status;
-       status = (status != 0x0) ? lookup_group_name(sid, name, type) : status;
-       status = (status != 0x0) ? lookup_alias_name(sid, name, type) : status;
+       status = (status != 0x0) ? lookup_user_name (rid, name, type) : status;
+       status = (status != 0x0) ? lookup_group_name(rid, name, type) : status;
+       status = (status != 0x0) ? lookup_alias_name(rid, name, type) : status;
 
        return status;
 }
@@ -200,12 +198,12 @@ uint32 lookup_added_name(DOM_SID *sid, char *name, uint8 *type)
 /*******************************************************************
  lookup_name
  ********************************************************************/
-uint32 lookup_name(DOM_SID *sid, char *name, uint8 *type)
+uint32 lookup_name(uint32 rid, char *name, uint8 *type)
 {
        uint32 status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
 
-       status = (status != 0x0) ? lookup_builtin_names(sid, name, type) : status;
-       status = (status != 0x0) ? lookup_added_name   (sid, name, type) : status;
+       status = (status != 0x0) ? lookup_builtin_names(rid, name, type) : status;
+       status = (status != 0x0) ? lookup_added_name   (rid, name, type) : status;
 
        return status;
 }
@@ -214,22 +212,11 @@ uint32 lookup_name(DOM_SID *sid, char *name, uint8 *type)
 /*******************************************************************
  lookup_wk_group_name
  ********************************************************************/
-uint32 lookup_wk_group_name(DOM_SID *sid, char *group_name, uint8 *type)
+uint32 lookup_wk_group_name(uint32 rid, char *group_name, uint8 *type)
 {
        int i = 0; 
-       uint32 rid;
-       DOM_SID tmp;
-
        (*type) = SID_NAME_WKN_GRP;
 
-       sid_copy(&tmp, sid);
-       sid_split_rid(&tmp, &rid);
-
-       if (!sid_equal(&global_sid_S_1_5_20, &tmp))
-       {
-               return 0xC0000000 | NT_STATUS_NONE_MAPPED;
-       }
-
        DEBUG(5,("lookup_wk_group_name: rid: %d", rid));
 
        while (domain_group_rids[i].rid != rid && domain_group_rids[i].rid != 0)
@@ -251,25 +238,19 @@ uint32 lookup_wk_group_name(DOM_SID *sid, char *group_name, uint8 *type)
 /*******************************************************************
  lookup_group_name
  ********************************************************************/
-uint32 lookup_group_name(DOM_SID *sid, char *group_name, uint8 *type)
+uint32 lookup_group_name(uint32 rid, char *group_name, uint8 *type)
 {
        uint32 status = 0xC0000000 | NT_STATUS_NONE_MAPPED;
-       uint32 rid;
-       DOM_SID tmp;
-
-       (*type) = SID_NAME_DOM_GRP;
+       DOM_SID sid;
 
-       sid_copy(&tmp, sid);
-       sid_split_rid(&tmp, &rid);
+       DEBUG(5,("lookup_group_name: rid: 0x%x", rid));
 
-       if (!sid_equal(&global_sid_S_1_5_20, &tmp))
-       {
-               return status;
-       }
+       sid_copy      (&sid, &global_sam_sid);
+       sid_append_rid(&sid, rid);
 
-       DEBUG(5,("lookup_group_name: rid: 0x%x", rid));
+       (*type) = SID_NAME_DOM_GRP;
 
-       if (map_group_sid_to_name(sid, group_name, NULL))
+       if (map_group_sid_to_name(&sid, group_name, NULL))
        {
                status = 0x0;
        }
@@ -289,22 +270,11 @@ uint32 lookup_group_name(DOM_SID *sid, char *group_name, uint8 *type)
 /*******************************************************************
  lookup_wk_alias_name
  ********************************************************************/
-uint32 lookup_wk_alias_name(DOM_SID *sid, char *alias_name, uint8 *type)
+uint32 lookup_wk_alias_name(uint32 rid, char *alias_name, uint8 *type)
 {
        int i = 0; 
-       uint32 rid;
-       DOM_SID tmp;
-
        (*type) = SID_NAME_ALIAS;
 
-       sid_copy(&tmp, sid);
-       sid_split_rid(&tmp, &rid);
-
-       if (!sid_equal(&global_sid_S_1_5_20, &tmp))
-       {
-               return 0xC0000000 | NT_STATUS_NONE_MAPPED;
-       }
-
        DEBUG(5,("lookup_wk_alias_name: rid: %d", rid));
 
        while (builtin_alias_rids[i].rid != rid && builtin_alias_rids[i].rid != 0)
@@ -326,14 +296,11 @@ uint32 lookup_wk_alias_name(DOM_SID *sid, char *alias_name, uint8 *type)
 /*******************************************************************
  lookup_alias_name
  ********************************************************************/
-uint32 lookup_alias_name(DOM_SID *sid, char *alias_name, uint8 *type)
+uint32 lookup_alias_name(uint32 rid, char *alias_name, uint8 *type)
 {
-       fstring sid_str;
        (*type) = SID_NAME_ALIAS;
 
-       sid_to_string(sid_str, sid);
-
-       DEBUG(2,("lookup_alias_name: sid: %d\n", sid_str));
+       DEBUG(2,("lookup_alias_name: rid: %d\n", rid));
        DEBUG(2,(" NOT IMPLEMENTED\n"));
 
        return 0xC0000000 | NT_STATUS_NONE_MAPPED;
@@ -342,22 +309,11 @@ uint32 lookup_alias_name(DOM_SID *sid, char *alias_name, uint8 *type)
 /*******************************************************************
  lookup well-known user name
  ********************************************************************/
-uint32 lookup_wk_user_name(DOM_SID *sid, char *user_name, uint8 *type)
+uint32 lookup_wk_user_name(uint32 rid, char *user_name, uint8 *type)
 {
        int i = 0;
-       uint32 rid;
-       DOM_SID tmp;
-
        (*type) = SID_NAME_USER;
 
-       sid_copy(&tmp, sid);
-       sid_split_rid(&tmp, &rid);
-
-       if (!sid_equal(&global_sid_S_1_5_20, &tmp))
-       {
-               return 0xC0000000 | NT_STATUS_NONE_MAPPED;
-       }
-
        DEBUG(5,("lookup_wk_user_name: rid: %d", rid));
 
        /* look up the well-known domain user rids first */
@@ -380,37 +336,26 @@ uint32 lookup_wk_user_name(DOM_SID *sid, char *user_name, uint8 *type)
 /*******************************************************************
  lookup user name
  ********************************************************************/
-uint32 lookup_user_name(DOM_SID *sid, char *user_name, uint8 *type)
+uint32 lookup_user_name(uint32 rid, char *user_name, uint8 *type)
 {
        struct sam_disp_info *disp_info;
-       uint32 rid;
-       DOM_SID tmp;
-
        (*type) = SID_NAME_USER;
 
-       sid_copy(&tmp, sid);
-       sid_split_rid(&tmp, &rid);
-
-       if (sid_equal(&global_sam_sid, &tmp))
-       {
-               DEBUG(5,("lookup_user_name in SAM %s: rid: %d",
-                         global_sam_name, rid));
-
-               /* find the user account */
-               become_root(True);
-               disp_info = getsamdisprid(rid);
-               unbecome_root(True);
+       DEBUG(5,("lookup_user_name: rid: %d", rid));
 
-               if (disp_info != NULL)
-               {
-                       fstrcpy(user_name, disp_info->smb_name);
-                       DEBUG(5,(" = %s\n", user_name));
-                       return 0x0;
-               }
+       /* find the user account */
+       become_root();
+       disp_info = getsamdisprid(rid);
+       unbecome_root();
 
-               DEBUG(5,(" none mapped\n"));
+       if (disp_info != NULL)
+       {
+               fstrcpy(user_name, disp_info->smb_name);
+               DEBUG(5,(" = %s\n", user_name));
+               return 0x0;
        }
 
+       DEBUG(5,(" none mapped\n"));
        return 0xC0000000 | NT_STATUS_NONE_MAPPED;
 }
 
@@ -592,9 +537,9 @@ uint32 lookup_added_user_rids(char *user_name,
        (*grp_rid) = 0;
 
        /* find the user account */
-       become_root(True);
+       become_root();
        sam_pass = getsam21pwnam(user_name);
-       unbecome_root(True);
+       unbecome_root();
 
        if (sam_pass != NULL)
        {
@@ -616,9 +561,9 @@ uint32 lookup_added_user_rid(char *user_name, uint32 *rid, uint8 *type)
        (*type) = SID_NAME_USER;
 
        /* find the user account */
-       become_root(True);
+       become_root();
        sam_pass = getsam21pwnam(user_name);
-       unbecome_root(True);
+       unbecome_root();
 
        if (sam_pass != NULL)
        {
Samba Shared Repository