s3:dom_sid Global replace of DOM_SID with struct dom_sid

[idra/samba.git] / source3 / passdb / util_unixsids.c

diff --git a/source3/passdb/util_unixsids.c b/source3/passdb/util_unixsids.c
index ad4e70256dddc23a6786413e89db4cd2fff9977b..08c887e9fa182ebf62ff12207cac82b1034d18e8 100644 (file)
--- a/source3/passdb/util_unixsids.c
+++ b/source3/passdb/util_unixsids.c
@@ -2,49 +2,47 @@
    Unix SMB/CIFS implementation.
    Translate unix-defined names to SIDs and vice versa
    Copyright (C) Volker Lendecke 2005
-      
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 
-bool sid_check_is_unix_users(const DOM_SID *sid)
+bool sid_check_is_unix_users(const struct dom_sid *sid)
 {
        return sid_equal(sid, &global_sid_Unix_Users);
 }
 
-bool sid_check_is_in_unix_users(const DOM_SID *sid)
+bool sid_check_is_in_unix_users(const struct dom_sid *sid)
 {
-       DOM_SID dom_sid;
+       struct dom_sid dom_sid;
        uint32 rid;
 
        sid_copy(&dom_sid, sid);
        sid_split_rid(&dom_sid, &rid);
-       
+
        return sid_check_is_unix_users(&dom_sid);
 }
 
-bool uid_to_unix_users_sid(uid_t uid, DOM_SID *sid)
+bool uid_to_unix_users_sid(uid_t uid, struct dom_sid *sid)
 {
-       sid_copy(sid, &global_sid_Unix_Users);
-       return sid_append_rid(sid, (uint32_t)uid);
+       return sid_compose(sid, &global_sid_Unix_Users, uid);
 }
 
-bool gid_to_unix_groups_sid(gid_t gid, DOM_SID *sid)
+bool gid_to_unix_groups_sid(gid_t gid, struct dom_sid *sid)
 {
-       sid_copy(sid, &global_sid_Unix_Groups);
-       return sid_append_rid(sid, (uint32_t)gid);
+       return sid_compose(sid, &global_sid_Unix_Groups, gid);
 }
 
 const char *unix_users_domain_name(void)
@@ -52,35 +50,38 @@ const char *unix_users_domain_name(void)
        return "Unix User";
 }
 
-bool lookup_unix_user_name(const char *name, DOM_SID *sid)
+bool lookup_unix_user_name(const char *name, struct dom_sid *sid)
 {
        struct passwd *pwd;
+       bool ret;
 
        pwd = getpwnam_alloc(talloc_autofree_context(), name);
        if (pwd == NULL) {
                return False;
        }
 
-       sid_copy(sid, &global_sid_Unix_Users);
-       sid_append_rid(sid, (uint32_t)pwd->pw_uid); /* For 64-bit uid's we have enough
-                                         * space ... */
+       /*
+        * For 64-bit uid's we have enough space in the whole SID,
+        * should they become necessary
+        */
+       ret = sid_compose(sid, &global_sid_Unix_Users, pwd->pw_uid);
        TALLOC_FREE(pwd);
-       return True;
+       return ret;
 }
 
-bool sid_check_is_unix_groups(const DOM_SID *sid)
+bool sid_check_is_unix_groups(const struct dom_sid *sid)
 {
        return sid_equal(sid, &global_sid_Unix_Groups);
 }
 
-bool sid_check_is_in_unix_groups(const DOM_SID *sid)
+bool sid_check_is_in_unix_groups(const struct dom_sid *sid)
 {
-       DOM_SID dom_sid;
+       struct dom_sid dom_sid;
        uint32 rid;
 
        sid_copy(&dom_sid, sid);
        sid_split_rid(&dom_sid, &rid);
-       
+
        return sid_check_is_unix_groups(&dom_sid);
 }
 
@@ -89,7 +90,7 @@ const char *unix_groups_domain_name(void)
        return "Unix Group";
 }
 
-bool lookup_unix_group_name(const char *name, DOM_SID *sid)
+bool lookup_unix_group_name(const char *name, struct dom_sid *sid)
 {
        struct group *grp;
 
@@ -98,8 +99,9 @@ bool lookup_unix_group_name(const char *name, DOM_SID *sid)
                return False;
        }
 
-       sid_copy(sid, &global_sid_Unix_Groups);
-       sid_append_rid(sid, (uint32_t)grp->gr_gid); /* For 64-bit uid's we have enough
-                                          * space ... */
-       return True;
+       /*
+        * For 64-bit gid's we have enough space in the whole SID,
+        * should they become necessary
+        */
+       return sid_compose(sid, &global_sid_Unix_Groups, grp->gr_gid);
 }