r619: Remove more code that is no longer called.

Andrew Bartlett
(This used to be commit 4e614cbe922ddc591b17b2357e17eff8ce1d546c)

diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c
index 7bb8c8a5585e233300258aefe1e18f9d8b8061a4..6becf8c8b5d6e24e3abddba9755f6f7d4d397091 100644 (file)
--- a/source4/auth/auth_util.c
+++ b/source4/auth/auth_util.c
@@ -531,50 +531,6 @@ static NTSTATUS create_nt_user_token(const DOM_SID *user_sid, const DOM_SID *gro
        return nt_status;
 }
 
-/****************************************************************************
- Create the SID list for this user.
-****************************************************************************/
-
-struct nt_user_token *create_nt_token(uid_t uid, gid_t gid, int ngroups, gid_t *groups, BOOL is_guest)
-{
-       DOM_SID user_sid;
-       DOM_SID group_sid;
-       DOM_SID *group_sids;
-       NT_USER_TOKEN *token;
-       int i;
-
-       if (!uid_to_sid(&user_sid, uid)) {
-               return NULL;
-       }
-       if (!gid_to_sid(&group_sid, gid)) {
-               return NULL;
-       }
-
-       group_sids = malloc(sizeof(DOM_SID) * ngroups);
-       if (!group_sids) {
-               DEBUG(0, ("create_nt_token: malloc() failed for DOM_SID list!\n"));
-               return NULL;
-       }
-
-       for (i = 0; i < ngroups; i++) {
-               if (!gid_to_sid(&(group_sids)[i], (groups)[i])) {
-                       DEBUG(1, ("create_nt_token: failed to convert gid %ld to a sid!\n", (long int)groups[i]));
-                       SAFE_FREE(group_sids);
-                       return NULL;
-               }
-       }
-
-       if (!NT_STATUS_IS_OK(create_nt_user_token(&user_sid, &group_sid, 
-                                                 ngroups, group_sids, is_guest, &token))) {
-               SAFE_FREE(group_sids);
-               return NULL;
-       }
-
-       SAFE_FREE(group_sids);
-
-       return token;
-}
-
 /***************************************************************************
  Make a user_info struct
 ***************************************************************************/

diff --git a/source4/smbd/rewrite.c b/source4/smbd/rewrite.c
index 5e30db1192f4a1cebe2665643b30d3290deddc51..91ccbaf4e4680b49c0f40b9e48334850d4efc0b8 100644 (file)
--- a/source4/smbd/rewrite.c
+++ b/source4/smbd/rewrite.c
@@ -59,19 +59,6 @@ BOOL share_access_check(struct request_context *req, struct tcon_context *conn,
 BOOL init_names(void)
 { return True; }
 
-BOOL uid_to_sid(DOM_SID *sid, uid_t uid)
-{
-       ZERO_STRUCTP(sid);
-       return True;
-}
-
-BOOL gid_to_sid(DOM_SID *sid, gid_t gid)
-{
-       ZERO_STRUCTP(sid);
-       return True;
-}
-
-
 BOOL become_user_permanently(uid_t uid, gid_t gid)
 { return True; }