This commit was manufactured by cvs2svn to create tagsamba-misc-tags/SAMBA_TNG_2_5_GOOD

'SAMBA_TNG_2_5_GOOD'.

1 files changed, 0 insertions, 401 deletions

diff --git a/source/nsswitch/winbindd_user.c b/source/nsswitch/winbindd_user.c
deleted file mode 100644
index d1ea38dbcac..00000000000
--- a/source/nsswitch/winbindd_user.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/* 
-   Unix SMB/Netbios implementation.
-   Version 2.0
-
-   Winbind daemon - user related function
-
-   Copyright (C) Tim Potter 2000
-   
-   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
-   (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.
-*/
-
-#include "includes.h"
-#include "nterr.h"
-
-/* Fill a pwent structure with information we have obtained */
-
-static void winbindd_fill_pwent(struct winbindd_pw *pw, char *username,
-                                uid_t unix_uid, gid_t unix_gid, 
-                                SAM_USERINFO_CTR *user_info)
-{
-    fstring temp;
-
-    if ((pw == NULL) || (username == NULL) || (user_info == NULL)) {
-        return;
-    }
-
-    /* Fill in uid/gid */
-
-    pw->pw_uid = unix_uid;
-    pw->pw_gid = unix_gid;
-
-    /* Username */
-
-    strncpy(pw->pw_name, username, sizeof(pw->pw_name) - 1);
-
-    /* Full name (gecos) */
-
-    unistr2_to_ascii(temp, &user_info->info.id21->uni_full_name, 
-                     sizeof(temp) - 1);
-
-
-    strncpy(pw->pw_gecos, temp, sizeof(pw->pw_gecos) - 1);
-
-    /* Home directory */
-
-    unistr2_to_ascii(temp, &user_info->info.id21->uni_dir_drive, 
-                     sizeof(temp));
-
-    strncpy(pw->pw_dir, temp, sizeof(pw->pw_dir) - 1);
-
-    /* Password */
-
-    strncpy(pw->pw_passwd, "*", sizeof(pw->pw_passwd) - 1);
-
-    /* Shell */
-
-    strncpy(pw->pw_shell, "/dev/null", sizeof(pw->pw_shell) - 1);
-}
-
-/* Return a password structure from a username */
-
-enum winbindd_result winbindd_getpwnam_from_user(struct winbindd_state *state) 
-{
-    uint32 name_type, user_rid;
-    SAM_USERINFO_CTR user_info;
-    DOM_SID domain_sid, user_sid, group_sid, tmp_sid;
-    fstring name_domain, name_user, tmp_name, domain_controller;
-    POSIX_ID uid, gid;
-
-    /* Look for user domain name */
-
-    fstrcpy(tmp_name, state->request.data.username);
-    fstrcpy(name_domain, strtok(tmp_name, "/\\"));
-    fstrcpy(name_user, strtok(NULL, ""));
-
-    /* Get domain sid for the domain */
-
-    if (!find_domain_sid_from_name(name_domain, &domain_sid,
-                                   domain_controller)) {
-        DEBUG(0, ("Could not get domain sid for domain %s\n", name_domain));
-        return WINBINDD_ERROR;
-    }
-
-    /* Get rid and name type from name */
-    
-    if (!winbindd_lookup_by_name(domain_controller, &domain_sid, name_user, 
-                                 &user_sid, &name_type)) {
-        DEBUG(1, ("user '%s' does not exist\n", name_user));
-        return WINBINDD_ERROR;
-    }
-
-    if (name_type != SID_NAME_USER) {
-        DEBUG(1, ("name '%s' is not a user name: %d\n", name_user, name_type));
-        return WINBINDD_ERROR;
-    }
-
-    /* Get some user info.  Split the user rid from the sid obtained from
-       the winbind_lookup_by_name() call and use it in a
-       winbind_lookup_userinfo() */
-    
-    sid_copy(&tmp_sid, &user_sid);
-    sid_split_rid(&tmp_sid, &user_rid);
-
-    if (!winbindd_lookup_userinfo(domain_controller, &domain_sid, user_rid, 
-                                  NULL, &user_info)) {
-        DEBUG(1, ("pwnam_from_user(): error getting user info for user '%s'\n",
-                  name_user));
-        return WINBINDD_ERROR;
-    }
-    
-    /* Resolve the uid number */
-
-    sid_copy(&user_sid, &domain_sid);
-    sid_append_rid(&user_sid, user_info.info.id21->user_rid);
-
-    if (!winbindd_surs_sam_sid_to_unixid(&user_sid, SID_NAME_USER, &uid)) {
-        DEBUG(1, ("error getting user id for user\n"));
-        return WINBINDD_ERROR;
-    }
-
-    /* Resolve the gid number */
-
-    sid_copy(&group_sid, &domain_sid);
-    sid_append_rid(&group_sid, user_info.info.id21->group_rid);
-    
-    if (!winbindd_surs_sam_sid_to_unixid(&group_sid, SID_NAME_DOM_GRP, &gid)) {
-        DEBUG(1, ("error getting group id for user %s\n", name_user));
-        return WINBINDD_ERROR;
-    }
-
-    /* Now take all this information and fill in a passwd structure */
-            
-    winbindd_fill_pwent(&state->response.data.pw, 
-                        state->request.data.username, uid.id, gid.id, 
-                        &user_info);
-            
-    /* Free user info */
-
-    free_samr_userinfo_ctr(&user_info);
-
-    return WINBINDD_OK;
-}       
-
-/* Return a password structure given a uid number */
-
-enum winbindd_result winbindd_getpwnam_from_uid(struct winbindd_state *state)
-{
-    DOM_SID domain_sid, tmp_sid, domain_user_sid;
-    uint32 user_rid;
-    fstring username, domain_controller;
-    enum SID_NAME_USE name_type;
-    SAM_USERINFO_CTR user_info;
-    POSIX_ID surs_uid, surs_gid;
-
-    /* Get sid from uid */
-
-    surs_uid.id = state->request.data.uid;
-    surs_uid.type = SURS_POSIX_UID_AS_USR;
-
-    if (!winbindd_surs_unixid_to_sam_sid(&surs_uid, &domain_user_sid, True)) {
-        DEBUG(1, ("Could not convert uid %d to domain sid\n", 
-                  state->request.data.uid));
-        return WINBINDD_ERROR;
-    }
-    
-    /* Find domain controller and domain sid */
-
-    if (!find_domain_sid_from_uid(state->request.data.uid, &domain_sid, 
-                                  NULL, domain_controller)) {
-        DEBUG(0, ("Could not find domain for uid %d\n", 
-                  state->request.data.uid));
-        return WINBINDD_ERROR;
-    }
-
-    /* Get name and name type from rid */
-
-    if (!winbindd_lookup_by_sid(domain_controller, &domain_sid, 
-                                &domain_user_sid, username, &name_type)) {
-        fstring temp;
-
-        sid_to_string(temp, &domain_user_sid);
-        DEBUG(1, ("Could not lookup sid %s\n", temp));
-        return WINBINDD_ERROR;
-    }
-
-    /* Get some user info */
-    
-    sid_copy(&tmp_sid, &domain_user_sid);
-    sid_split_rid(&tmp_sid, &user_rid);
-
-    if (!winbindd_lookup_userinfo(domain_controller, &domain_sid, user_rid, 
-                                  NULL, &user_info)) {
-        DEBUG(1, ("pwnam_from_uid(): error getting user info for user '%s'\n",
-                  username));
-        return WINBINDD_ERROR;
-    }
-
-    if (!winbindd_surs_sam_sid_to_unixid(&domain_user_sid, SID_NAME_USER,
-                                         &surs_uid)) {
-        DEBUG(1, ("error sursing unix uid\n"));
-        return WINBINDD_ERROR;
-    }
-
-    /* ??? Should be domain_group_sid??? */
-
-    if (!winbindd_surs_sam_sid_to_unixid(&domain_user_sid, SID_NAME_DOM_GRP,
-                                         &surs_gid)) {
-        DEBUG(1, ("error sursing gid\n"));
-        return WINBINDD_ERROR;
-    }
-
-    /* Fill in password structure */
-
-    winbindd_fill_pwent(&state->response.data.pw, username, surs_uid.id, 
-                        surs_gid.id, &user_info);
-
-    /* Free user info */
-
-    free_samr_userinfo_ctr(&user_info);
-
-    return WINBINDD_OK;
-}
-
-/*
- * set/get/endpwent functions
- */
-
-/* Rewind file pointer for ntdom passwd database */
-
-enum winbindd_result winbindd_setpwent(struct winbindd_state *state)
-{
-    struct winbindd_domain *tmp;
-
-    if (state == NULL) return WINBINDD_ERROR;
-    
-    /* Free old static data if it exists */
-
-    if (state->getpwent_state != NULL) {
-        free_getent_state(state->getpwent_state);
-        state->getpwent_state = NULL;
-    }
-
-    /* Create sam pipes for each domain we know about */
-
-    for(tmp = domain_list; tmp != NULL; tmp = tmp->next) {
-        struct getent_state *domain_state;
-        BOOL res;
-
-        /* No point looking up BUILTIN users as they don't exist */
-
-        if (strcmp(tmp->domain_name, "BUILTIN") == 0) {
-            continue;
-        }
-
-        /* Create a state record for this domain */
-
-        if ((domain_state = (struct getent_state *)
-             malloc(sizeof(struct getent_state))) == NULL) {
-
-            return WINBINDD_ERROR;
-        }
-
-        ZERO_STRUCTP(domain_state);
-
-        /* Connect to sam database */
-
-        res = samr_connect(tmp->domain_controller, SEC_RIGHTS_MAXIMUM_ALLOWED, 
-                           &domain_state->sam_handle);
-
-        res = res ? samr_open_domain(&domain_state->sam_handle,
-                                     0x304, &tmp->domain_sid, 
-                                     &domain_state->sam_dom_handle) : False;
-
-        if (res) {
-
-            /* Add to list of open domains */
-
-            fstrcpy(domain_state->domain_name, tmp->domain_name);
-            DLIST_ADD(state->getpwent_state, domain_state);
-
-        } else {
-
-            /* Error opening sam pipes */
-
-            samr_close(&domain_state->sam_dom_handle);
-            samr_close(&domain_state->sam_handle);
-
-            free(domain_state);
-        }
-
-    }
-
-    return WINBINDD_OK;
-}
-
-/* Close file pointer to ntdom passwd database */
-
-enum winbindd_result winbindd_endpwent(struct winbindd_state *state)
-{
-    if (state == NULL) return WINBINDD_ERROR;
-
-    free_getent_state(state->getpwent_state);    
-    state->getpwent_state = NULL;
-
-    return WINBINDD_OK;
-}
-
-/* Fetch next passwd entry from ntdom database */
-
-enum winbindd_result winbindd_getpwent(struct winbindd_state *state)
-{
-    if (state == NULL) return WINBINDD_ERROR;
-
-    /* Process the current head of the getent_state list */
-
-    while(state->getpwent_state != NULL) {
-        struct getent_state *ent = state->getpwent_state;
-
-        /* Get list of user entries for this pipe */
-
-        if (!ent->got_sam_entries) {
-            uint32 status, start_ndx = 0;
-            
-            do {
-                status =
-                    samr_enum_dom_users(
-                        &ent->sam_dom_handle, &start_ndx, 0, 0, 0x10000,
-                        &ent->sam_entries, &ent->num_sam_entries);
-            } while (status == STATUS_MORE_ENTRIES);
-            
-            samr_close(&ent->sam_dom_handle);
-            samr_close(&ent->sam_handle);
-
-            ent->got_sam_entries = True;
-        }
-        
-        /* Send back a user */
-
-        while (ent->sam_entry_index < ent->num_sam_entries) {
-            enum winbindd_result result;
-            fstring domain_user_name;
-            char *user_name = (ent->sam_entries)
-                [ent->sam_entry_index].acct_name; 
-                
-            /* Don't bother with machine accounts */
-
-            if (user_name[strlen(user_name) - 1] == '$') {
-                ent->sam_entry_index++;
-                continue;
-            }
-
-            /* Prepend domain to name */
-        
-            fstrcpy(domain_user_name, ent->domain_name);
-            fstrcat(domain_user_name, "/");
-            fstrcat(domain_user_name, user_name);
-                
-            /* Get passwd entry from user name */
-                
-            fstrcpy(state->request.data.username, domain_user_name);
-            result = winbindd_getpwnam_from_user(state);
-
-            ent->sam_entry_index++;
-                
-            /* Return if user lookup worked */
-                
-            if (result == WINBINDD_OK) {
-                return result;
-            }
-                
-            /* Try next user */
-            
-            DEBUG(1, ("could not getpwnam_from_user for username %s\n",
-                      domain_user_name));
-        }
-
-        /* We've exhausted all users for this pipe - close it down and
-           start on the next one. */
-        
-        if (ent->sam_entries != NULL) free(ent->sam_entries);
-        ent->sam_entries = NULL;
-
-        DLIST_REMOVE(state->getpwent_state, state->getpwent_state);
-    }
-
-    /* Out of pipes so we're done */
-
-    return WINBINDD_ERROR;
-}