merge from 2.2 removing the 'domain XXX' parameters.

(This used to be commit 9aefc86e355bf160300580acb85a58a18207ccdf)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 59f80c99ae50be704974adac05ca5c75cc219a38..0e71a833e98db3e6bd29d1a062dd23a747a6ac75 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1758,11 +1758,8 @@ char *lp_delgroup_script(void);
 char *lp_addusertogroup_script(void);
 char *lp_deluserfromgroup_script(void);
 char *lp_wins_hook(void);
-char *lp_domain_groups(void);
 char *lp_domain_admin_group(void);
 char *lp_domain_guest_group(void);
-char *lp_domain_admin_users(void);
-char *lp_domain_guest_users(void);
 char *lp_winbind_uid(void);
 char *lp_winbind_gid(void);
 char *lp_template_homedir(void);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 793cbf79518ca1c46be2b976a20dcb8790cab299..d166d8c048d888f7ae4a2ebe29b6a589aaf19449 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -153,7 +153,6 @@ typedef struct
        char *szAnnounceVersion;        /* This is initialised in init_globals */
        char *szNetbiosAliases;
        char *szDomainOtherSIDs;
-       char *szDomainGroups;
        char *szNameResolveOrder;
        char *szLdapServer;
        char *szLdapSuffix;
@@ -888,13 +887,10 @@ static struct parm_struct parm_table[] = {
 
        {"Domain Options", P_SEP, P_SEPARATOR},
        
-       {"domain groups", P_STRING, P_GLOBAL, &Globals.szDomainGroups, NULL, NULL, 0},
        {"domain admin group", P_STRING, P_GLOBAL, &Globals.szDomainAdminGroup, NULL, NULL, 0},
        {"domain guest group", P_STRING, P_GLOBAL, &Globals.szDomainGuestGroup, NULL, NULL, 0},
-       {"domain admin users", P_STRING, P_GLOBAL, &Globals.szDomainAdminUsers, NULL, NULL, 0},
-       {"domain guest users", P_STRING, P_GLOBAL, &Globals.szDomainGuestUsers, NULL, NULL, 0},
+
 #ifdef USING_GROUPNAME_MAP
-       
        {"groupname map", P_STRING, P_GLOBAL, &Globals.szGroupnameMap, NULL, NULL, 0},
 #endif /* USING_GROUPNAME_MAP */
        
@@ -1489,11 +1485,8 @@ FN_GLOBAL_STRING(lp_addusertogroup_script, &Globals.szAddUserToGroupScript)
 FN_GLOBAL_STRING(lp_deluserfromgroup_script, &Globals.szDelUserToGroupScript)
 
 FN_GLOBAL_STRING(lp_wins_hook, &Globals.szWINSHook)
-FN_GLOBAL_STRING(lp_domain_groups, &Globals.szDomainGroups)
 FN_GLOBAL_STRING(lp_domain_admin_group, &Globals.szDomainAdminGroup)
 FN_GLOBAL_STRING(lp_domain_guest_group, &Globals.szDomainGuestGroup)
-FN_GLOBAL_STRING(lp_domain_admin_users, &Globals.szDomainAdminUsers)
-FN_GLOBAL_STRING(lp_domain_guest_users, &Globals.szDomainGuestUsers)
 FN_GLOBAL_STRING(lp_winbind_uid, &Globals.szWinbindUID)
 FN_GLOBAL_STRING(lp_winbind_gid, &Globals.szWinbindGID)
 FN_GLOBAL_STRING(lp_template_homedir, &Globals.szTemplateHomedir)

diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 396eaf61f2d1da247794e3a72cafa9de2aecd6f0..05572e3de251d1f51ee8129b27d2ba2e60841e85 100644 (file)
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -352,20 +352,9 @@ BOOL pdb_name_to_rid(char *user_name, uint32 *u_rid, uint32 *g_rid)
                return False;
        }
 
-       if (user_in_list(user_name, lp_domain_guest_users()))
-       {
-               *u_rid = DOMAIN_USER_RID_GUEST;
-       }
-       else if (user_in_list(user_name, lp_domain_admin_users()))
-       {
-               *u_rid = DOMAIN_USER_RID_ADMIN;
-       }
-       else
-       {
-               /* turn the unix UID into a Domain RID.  this is what the posix
-                  sub-system does (adds 1000 to the uid) */
-               *u_rid = pdb_uid_to_user_rid(pw->pw_uid);
-       }
+       /* turn the unix UID into a Domain RID.  this is what the posix
+          sub-system does (adds 1000 to the uid) */
+       *u_rid = pdb_uid_to_user_rid(pw->pw_uid);
 
        /* absolutely no idea what to do about the unix GID to Domain RID mapping */
        *g_rid = pdb_gid_to_group_rid(pw->pw_gid);
@@ -454,13 +443,11 @@ BOOL local_lookup_rid(uint32 rid, char *name, enum SID_NAME_USE *psid_name_use)
                if(rid == DOMAIN_USER_RID_ADMIN) {
                        pstring admin_users;
                        char *p = admin_users;
-                       pstrcpy( admin_users, lp_domain_admin_users());
                        if(!next_token(&p, name, NULL, sizeof(fstring)))
                                fstrcpy(name, "Administrator");
                } else if (rid == DOMAIN_USER_RID_GUEST) {
                        pstring guest_users;
                        char *p = guest_users;
-                       pstrcpy( guest_users, lp_domain_guest_users());
                        if(!next_token(&p, name, NULL, sizeof(fstring)))
                                fstrcpy(name, "Guest");
                } else {

diff --git a/source3/rpc_server/srv_util.c b/source3/rpc_server/srv_util.c
index 861d47b9d8f269798b38e6974881d8b75bdc8d3b..deaa6008b9ab6b4b31768afa5ca02feaa973f6c1 100644 (file)
--- a/source3/rpc_server/srv_util.c
+++ b/source3/rpc_server/srv_util.c
@@ -162,9 +162,6 @@ void get_domain_user_groups(char *domain_groups, char *user)
 
        if (domain_groups == NULL || user == NULL) return;
 
-       /* any additional groups this user is in.  e.g power users */
-       pstrcpy(domain_groups, lp_domain_groups());
-
        /* can only be a user or a guest.  cannot be guest _and_ admin */
        if (user_in_list(user, lp_domain_guest_group()))
        {