Make getpwnam_alloc() static to lib/username.c, and ensure all username lookups go

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

diff --git a/source3/passdb/util_unixsids.c b/source3/passdb/util_unixsids.c
index ee8cf2d8f0275e62b295da9e0dc5244ed698adc2..1f830b35c5e8948b5c0854880bc86caa1feb92b4 100644 (file)
--- a/source3/passdb/util_unixsids.c
+++ b/source3/passdb/util_unixsids.c
@@ -2,74 +2,95 @@
    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 2 of the License, or
+   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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "../libcli/security/security.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);
+       return dom_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);
 }
 
+void uid_to_unix_users_sid(uid_t uid, struct dom_sid *sid)
+{
+       /*
+        * This can never fail, we know that global_sid_Unix_Users is
+        * short enough for a domain sid.
+        */
+       sid_compose(sid, &global_sid_Unix_Users, uid);
+}
+
+void gid_to_unix_groups_sid(gid_t gid, struct dom_sid *sid)
+{
+       /*
+        * This can never fail, we know that global_sid_Unix_Groups is
+        * short enough for a domain sid.
+        */
+       sid_compose(sid, &global_sid_Unix_Groups, gid);
+}
+
 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(NULL, name);
+       pwd = Get_Pwnam_alloc(talloc_tos(), name);
        if (pwd == NULL) {
                return False;
        }
 
-       sid_copy(sid, &global_sid_Unix_Users);
-       sid_append_rid(sid, pwd->pw_uid); /* For 64-bit uid's we have enough
-                                         * space ... */
-       talloc_free(pwd);
-       return True;
+       /*
+        * 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 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);
+       return dom_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);
 }
 
@@ -78,17 +99,18 @@ 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;
 
-       grp = getgrnam(name);
+       grp = sys_getgrnam(name);
        if (grp == NULL) {
                return False;
        }
 
-       sid_copy(sid, &global_sid_Unix_Groups);
-       sid_append_rid(sid, 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);
 }