diff options
| author | Günther Deschner <gd@samba.org> | 2008-01-29 17:49:38 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-01-29 17:51:05 +0100 |
| commit | 80b2e330f939d9877352f8fbdbec3a4e0e395c7b (patch) | |
| tree | be8483d0f1124e888cca37b3d5bcb18b6ea5a883 /source3/winbindd/winbindd_cm.c | |
| parent | 1a7583dd0b34d5276ee36b69fe7b8d37a701c408 (diff) | |
| download | samba-80b2e330f939d9877352f8fbdbec3a4e0e395c7b.tar.gz samba-80b2e330f939d9877352f8fbdbec3a4e0e395c7b.tar.bz2 samba-80b2e330f939d9877352f8fbdbec3a4e0e395c7b.zip | |
Remove include/rpc_ds.h and all references to it completly.
Jerry, please have a look if you're fine with that.
Guenther
(This used to be commit beae25c808a3a03d645f247e9befcd05e3ecca2c)
Diffstat (limited to 'source3/winbindd/winbindd_cm.c')
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index c22022d79a..66787a0d6d 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1718,9 +1718,9 @@ static bool set_dc_type_and_flags_trustinfo( struct winbindd_domain *domain ) NTSTATUS result = NT_STATUS_UNSUCCESSFUL; struct netr_DomainTrustList trusts; int i; - uint32 flags = (DS_DOMAIN_IN_FOREST | - DS_DOMAIN_DIRECT_OUTBOUND | - DS_DOMAIN_DIRECT_INBOUND); + uint32 flags = (NETR_TRUST_FLAG_IN_FOREST | + NETR_TRUST_FLAG_OUTBOUND | + NETR_TRUST_FLAG_INBOUND); struct rpc_pipe_client *cli; 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_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; /* This flag is only set if the domain is *our* primary domain and the primary domain is in 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 " "native mode.\n", domain->name, @@ -1937,7 +1937,7 @@ no_dssetup: fstrcpy(domain->forest_name, forest_name); if (strequal(domain->forest_name, domain->alt_name)) { - domain->domain_flags = DS_DOMAIN_TREE_ROOT; + domain->domain_flags = NETR_TRUST_FLAG_TREEROOT; } } |