sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

Remove include/rpc_ds.h and all references to it completly.

Browse Source 
Jerry, please have a look if you're fine with that.

Guenther
(This used to be commit beae25c808)
This commit is contained in:
Günther Deschner
2008-01-29 17:49:38 +01:00
parent 1a7583dd0b
commit 80b2e330f9
9 changed files with 30 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source3/Makefile.in
View File

@ -714,7 +714,7 @@ RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \
rpcclient/cmd_samr.o rpcclient/cmd_spoolss.o \ rpcclient/cmd_samr.o rpcclient/cmd_spoolss.o \
rpcclient/cmd_netlogon.o rpcclient/cmd_srvsvc.o \ rpcclient/cmd_netlogon.o rpcclient/cmd_srvsvc.o \
rpcclient/cmd_dfs.o \ rpcclient/cmd_dfs.o \
rpcclient/cmd_ds.o rpcclient/cmd_echo.o \ rpcclient/cmd_dssetup.o rpcclient/cmd_echo.o \
rpcclient/cmd_shutdown.o rpcclient/cmd_test.o \ rpcclient/cmd_shutdown.o rpcclient/cmd_test.o \
rpcclient/cmd_wkssvc.o \ rpcclient/cmd_wkssvc.o \
$(DISPLAY_SEC_OBJ) $(DISPLAY_DSDCINFO_OBJ) $(DISPLAY_SEC_OBJ) $(DISPLAY_DSDCINFO_OBJ)

1
source3/include/includes.h
View File

@ -698,7 +698,6 @@ typedef char fstring[FSTRING_LEN];
#include "rpc_srvsvc.h" #include "rpc_srvsvc.h"
#include "rpc_spoolss.h" #include "rpc_spoolss.h"
#include "rpc_eventlog.h" #include "rpc_eventlog.h"
#include "rpc_ds.h"
#include "rpc_perfcount.h" #include "rpc_perfcount.h"
#include "rpc_perfcount_defs.h" #include "rpc_perfcount_defs.h"
#include "librpc/gen_ndr/notify.h" #include "librpc/gen_ndr/notify.h"

48
source3/include/rpc_ds.h
View File

@ -1,48 +0,0 @@
/*
Unix SMB/CIFS implementation.
SMB parameters and setup
Copyright (C) Gerald Carter 2002
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/>.
*/
#ifndef _RPC_DS_H /* _RPC_LSA_H */
#define _RPC_DS_H
/* Trust flags */
#define DS_DOMAIN_IN_FOREST 0x0001 /* domains in the forest to which
we belong; even different domain trees */
#define DS_DOMAIN_DIRECT_OUTBOUND 0x0002 /* trusted domains */
#define DS_DOMAIN_TREE_ROOT 0x0004 /* root of a forest */
#define DS_DOMAIN_PRIMARY 0x0008 /* our domain */
#define DS_DOMAIN_NATIVE_MODE 0x0010 /* native mode AD servers */
#define DS_DOMAIN_DIRECT_INBOUND 0x0020 /* trusting domains */
/* Trust types */
#define DS_DOMAIN_TRUST_TYPE_DOWNLEVEL 0x00000001
#define DS_DOMAIN_TRUST_TYPE_UPLEVEL 0x00000002
/* Trust attributes */
#define DS_DOMAIN_TRUST_ATTRIB_NON_TRANSITIVE 0x00000001
#define DS_DOMAIN_TRUST_ATTRIB_UPLEVEL_ONLY 0x00000002
#define DS_DOMAIN_TRUST_ATTRIB_QUARANTINED_DOMAIN 0x00000004
#define DS_DOMAIN_TRUST_ATTRIB_FOREST_TRANSITIVE 0x00000008
#define DS_DOMAIN_TRUST_ATTRIB_CROSS_ORG 0x00000010
#define DS_DOMAIN_TRUST_ATTRIB_IN_FOREST 0x00000020
#define DS_DOMAIN_TRUST_ATTRIB_EXTERNAL 0x00000040
#endif /* _RPC_DS_H */

4
source3/rpcclient/cmd_ds.c → source3/rpcclient/cmd_dssetup.c
View File

@ -9,12 +9,12 @@
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or the Free Software Foundation; either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */

6
source3/winbindd/winbindd.h
View File

@ -164,9 +164,9 @@ struct winbindd_domain {
fstring alt_name; /* alt Domain name, if any (FQDN for ADS) */ fstring alt_name; /* alt Domain name, if any (FQDN for ADS) */
fstring forest_name; /* Name of the AD forest we're in */ fstring forest_name; /* Name of the AD forest we're in */
DOM_SID sid; /* SID for this domain */ DOM_SID sid; /* SID for this domain */
uint32 domain_flags; /* Domain flags from rpc_ds.h */ uint32 domain_flags; /* Domain flags from netlogon.h */
uint32 domain_type; /* Domain type from rpc_ds.h */ uint32 domain_type; /* Domain type from netlogon.h */
uint32 domain_trust_attribs; /* Trust attribs from rpc_ds.h */ uint32 domain_trust_attribs; /* Trust attribs from netlogon.h */
bool initialized; /* Did we already ask for the domain mode? */ bool initialized; /* Did we already ask for the domain mode? */
bool native_mode; /* is this a win2k domain in native mode ? */ bool native_mode; /* is this a win2k domain in native mode ? */
bool active_directory; /* is this a win2k active directory ? */ bool active_directory; /* is this a win2k active directory ? */

12
source3/winbindd/winbindd_ads.c
View File

@ -1161,7 +1161,7 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
int i; int i;
uint32 flags; uint32 flags;
struct rpc_pipe_client *cli; struct rpc_pipe_client *cli;
uint32 fr_flags = (DS_DOMAIN_IN_FOREST | DS_DOMAIN_TREE_ROOT); uint32 fr_flags = (NETR_TRUST_FLAG_IN_FOREST | NETR_TRUST_FLAG_TREEROOT);
int ret_count; int ret_count;
DEBUG(3,("ads: trusted_domains\n")); DEBUG(3,("ads: trusted_domains\n"));
@ -1178,11 +1178,11 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
if ( domain->primary || if ( domain->primary ||
((domain->domain_flags&fr_flags) == fr_flags) ) ((domain->domain_flags&fr_flags) == fr_flags) )
{ {
flags = DS_DOMAIN_DIRECT_OUTBOUND | flags = NETR_TRUST_FLAG_OUTBOUND |
DS_DOMAIN_DIRECT_INBOUND | NETR_TRUST_FLAG_INBOUND |
DS_DOMAIN_IN_FOREST; NETR_TRUST_FLAG_IN_FOREST;
} else { } else {
flags = DS_DOMAIN_IN_FOREST; flags = NETR_TRUST_FLAG_IN_FOREST;
} }
result = cm_connect_netlogon(domain, &cli); result = cm_connect_netlogon(domain, &cli);
@ -1230,7 +1230,7 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
domains may be less that the ones actually trusted domains may be less that the ones actually trusted
by the DC. */ by the DC. */
if ( (trusts.array[i].trust_attributes == DS_DOMAIN_TRUST_ATTRIB_QUARANTINED_DOMAIN) && if ( (trusts.array[i].trust_attributes == NETR_TRUST_ATTRIBUTE_QUARANTINED_DOMAIN) &&
!domain->primary ) !domain->primary )
{ {
DEBUG(10,("trusted_domains: Skipping external trusted domain " DEBUG(10,("trusted_domains: Skipping external trusted domain "

12
source3/winbindd/winbindd_cm.c
View File

@ -1718,9 +1718,9 @@ static bool set_dc_type_and_flags_trustinfo( struct winbindd_domain *domain )
NTSTATUS result = NT_STATUS_UNSUCCESSFUL; NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
struct netr_DomainTrustList trusts; struct netr_DomainTrustList trusts;
int i; int i;
uint32 flags = (DS_DOMAIN_IN_FOREST | uint32 flags = (NETR_TRUST_FLAG_IN_FOREST |
DS_DOMAIN_DIRECT_OUTBOUND | NETR_TRUST_FLAG_OUTBOUND |
DS_DOMAIN_DIRECT_INBOUND); NETR_TRUST_FLAG_INBOUND);
struct rpc_pipe_client *cli; struct rpc_pipe_client *cli;
TALLOC_CTX *mem_ctx = NULL; TALLOC_CTX *mem_ctx = NULL;
@ -1783,14 +1783,14 @@ static bool set_dc_type_and_flags_trustinfo( struct winbindd_domain *domain )
domain->domain_type = trusts.array[i].trust_type; domain->domain_type = trusts.array[i].trust_type;
domain->domain_trust_attribs = trusts.array[i].trust_attributes; domain->domain_trust_attribs = trusts.array[i].trust_attributes;
if ( domain->domain_type == DS_DOMAIN_TRUST_TYPE_UPLEVEL ) if ( domain->domain_type == NETR_TRUST_TYPE_UPLEVEL )
domain->active_directory = True; domain->active_directory = True;
/* This flag is only set if the domain is *our* /* This flag is only set if the domain is *our*
primary domain and the primary domain is in primary domain and the primary domain is in
native mode */ native mode */
domain->native_mode = (domain->domain_flags & DS_DOMAIN_NATIVE_MODE); domain->native_mode = (domain->domain_flags & NETR_TRUST_FLAG_NATIVE);
DEBUG(5, ("set_dc_type_and_flags_trustinfo: domain %s is %sin " DEBUG(5, ("set_dc_type_and_flags_trustinfo: domain %s is %sin "
"native mode.\n", domain->name, "native mode.\n", domain->name,
@ -1937,7 +1937,7 @@ no_dssetup:
fstrcpy(domain->forest_name, forest_name); fstrcpy(domain->forest_name, forest_name);
if (strequal(domain->forest_name, domain->alt_name)) { if (strequal(domain->forest_name, domain->alt_name)) {
domain->domain_flags = DS_DOMAIN_TREE_ROOT; domain->domain_flags = NETR_TRUST_FLAG_TREEROOT;
} }
} }

2
source3/winbindd/winbindd_pam.c
View File

@ -964,7 +964,7 @@ NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
#ifdef HAVE_KRB5 #ifdef HAVE_KRB5
if ((state->request.flags & WBFLAG_PAM_KRB5) && if ((state->request.flags & WBFLAG_PAM_KRB5) &&
((tdc_domain = wcache_tdc_fetch_domain(state->mem_ctx, name_domain)) != NULL) && ((tdc_domain = wcache_tdc_fetch_domain(state->mem_ctx, name_domain)) != NULL) &&
(tdc_domain->trust_type & DS_DOMAIN_TRUST_TYPE_UPLEVEL)) { (tdc_domain->trust_type & NETR_TRUST_TYPE_UPLEVEL)) {
uid_t uid = -1; uid_t uid = -1;
const char *cc = NULL; const char *cc = NULL;

22
source3/winbindd/winbindd_util.c
View File

@ -218,7 +218,7 @@ static void add_trusted_domains( struct winbindd_domain *domain )
TALLOC_CTX *mem_ctx; TALLOC_CTX *mem_ctx;
struct winbindd_request *request; struct winbindd_request *request;
struct winbindd_response *response; struct winbindd_response *response;
uint32 fr_flags = (DS_DOMAIN_TREE_ROOT|DS_DOMAIN_IN_FOREST); uint32 fr_flags = (NETR_TRUST_FLAG_TREEROOT|NETR_TRUST_FLAG_IN_FOREST);
struct trustdom_state *state; struct trustdom_state *state;
@ -391,8 +391,8 @@ static void rescan_forest_root_trusts( void )
the domain_list() as our primary domain may not the domain_list() as our primary domain may not
have been initialized. */ have been initialized. */
if ( !(dom_list[i].trust_flags & DS_DOMAIN_TREE_ROOT) ) { if ( !(dom_list[i].trust_flags & NETR_TRUST_FLAG_TREEROOT) ) {
continue; continue;
} }
/* Here's the forest root */ /* Here's the forest root */
@ -456,10 +456,10 @@ static void rescan_forest_trusts( void )
if ( d && (d->internal || d->primary ) ) if ( d && (d->internal || d->primary ) )
continue; continue;
if ( (flags & DS_DOMAIN_DIRECT_INBOUND) && if ( (flags & NETR_TRUST_FLAG_INBOUND) &&
(type == DS_DOMAIN_TRUST_TYPE_UPLEVEL) && (type == NETR_TRUST_TYPE_UPLEVEL) &&
(attribs == DS_DOMAIN_TRUST_ATTRIB_FOREST_TRANSITIVE) ) (attribs == NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE) )
{ {
/* add the trusted domain if we don't know /* add the trusted domain if we don't know
about it */ about it */
@ -770,8 +770,8 @@ void check_domain_trusted( const char *name, const DOM_SID *user_sid )
forest trust */ forest trust */
domain->active_directory = True; domain->active_directory = True;
domain->domain_flags = DS_DOMAIN_DIRECT_OUTBOUND; domain->domain_flags = NETR_TRUST_FLAG_OUTBOUND;
domain->domain_type = DS_DOMAIN_TRUST_TYPE_UPLEVEL; domain->domain_type = NETR_TRUST_TYPE_UPLEVEL;
domain->internal = False; domain->internal = False;
domain->online = True; domain->online = True;
@ -1408,7 +1408,7 @@ bool winbindd_can_contact_domain(struct winbindd_domain *domain)
/* Can always contact a domain that is in out forest */ /* Can always contact a domain that is in out forest */
if (tdc->trust_flags & DS_DOMAIN_IN_FOREST) { if (tdc->trust_flags & NETR_TRUST_FLAG_IN_FOREST) {
ret = true; ret = true;
goto done; goto done;
} }
@ -1420,7 +1420,7 @@ bool winbindd_can_contact_domain(struct winbindd_domain *domain)
if (!IS_DC && if (!IS_DC &&
domain->active_directory && domain->active_directory &&
((tdc->trust_flags&DS_DOMAIN_DIRECT_INBOUND) != DS_DOMAIN_DIRECT_INBOUND)) ((tdc->trust_flags & NETR_TRUST_FLAG_INBOUND) != NETR_TRUST_FLAG_INBOUND))
{ {
DEBUG(10, ("winbindd_can_contact_domain: %s is an AD domain " DEBUG(10, ("winbindd_can_contact_domain: %s is an AD domain "
"and we have no inbound trust.\n", domain->name)); "and we have no inbound trust.\n", domain->name));