mirror of
https://github.com/samba-team/samba.git
synced 2025-12-21 20:23:50 +03:00
e358d7b24c
setups. - split up the ads structure into logical pieces. This makes it much easier to keep things like the authentication realm and the server realm separate (they can be different). - allow ads callers to specify that no sasl bind should be performed (used by "net ads info" for example) - fix an error with handing ADS_ERROR_SYSTEM() when errno is 0 - completely rewrote the code for finding the LDAP server. Now try DNS methods first, and try all DNS servers returned from the SRV DNS query, sorted by closeness to our interfaces (using the same sort code as we use in replies from WINS servers). This allows us to cope with ADS DCs that are down, and ensures we don't pick one that is on the other side of the country unless absolutely necessary. - recognise dnsRecords as binary when displaying them - cope with the realm not being configured in smb.conf (work it out from the LDAP server) - look at the trustDirection when looking up trusted domains and don't include trusts that trust our domains but we don't trust theirs. - use LDAP to query the alternate (netbios) name for a realm, and make sure that both and long and short forms of the name are accepted by winbindd. Use the short form by default for listing users/groups. - rescan the list of trusted domains every 5 minutes in case new trust relationships are added while winbindd is running - include transient trust relationships (ie. C trusts B, B trusts A, so C trusts A) in winbindd. - don't do a gratuituous node status lookup when finding an ADS DC (we don't need it and it could fail) - remove unused sid_to_distinguished_name function - make sure we find the allternate name of our primary domain when operating with a netbiosless ADS DC (using LDAP to do the lookup) - fixed the rpc trusted domain enumeration to support up to approx 2000 trusted domains (the old limit was 3) - use the IP for the remote_machine (%m) macro when the client doesn't supply us with a name via a netbios session request (eg. port 445) - if the client uses SPNEGO then use the machine name from the SPNEGO auth packet for remote_machine (%m) macro - add new 'net ads workgroup' command to find the netbios workgroup name for a realm
-
139 lines
3.2 KiB
C
139 lines
3.2 KiB
C
/*
|
|
Unix SMB/CIFS implementation.
|
|
ads (active directory) utility library
|
|
Copyright (C) Andrew Tridgell 2001
|
|
Copyright (C) Andrew Bartlett 2001
|
|
|
|
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"
|
|
|
|
/* return a ldap dn path from a string, given separators and field name
|
|
caller must free
|
|
*/
|
|
char *ads_build_path(const char *realm, const char *sep, const char *field, int reverse)
|
|
{
|
|
char *p, *r;
|
|
int numbits = 0;
|
|
char *ret;
|
|
int len;
|
|
|
|
r = strdup(realm);
|
|
|
|
if (!r || !*r) return r;
|
|
|
|
for (p=r; *p; p++) {
|
|
if (strchr(sep, *p)) numbits++;
|
|
}
|
|
|
|
len = (numbits+1)*(strlen(field)+1) + strlen(r) + 1;
|
|
|
|
ret = malloc(len);
|
|
strlcpy(ret,field, len);
|
|
p=strtok(r,sep);
|
|
strlcat(ret, p, len);
|
|
|
|
while ((p=strtok(NULL,sep))) {
|
|
char *s;
|
|
if (reverse) {
|
|
asprintf(&s, "%s%s,%s", field, p, ret);
|
|
} else {
|
|
asprintf(&s, "%s,%s%s", ret, field, p);
|
|
}
|
|
free(ret);
|
|
ret = s;
|
|
}
|
|
|
|
free(r);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* return a dn of the form "dc=AA,dc=BB,dc=CC" from a
|
|
realm of the form AA.BB.CC
|
|
caller must free
|
|
*/
|
|
char *ads_build_dn(const char *realm)
|
|
{
|
|
return ads_build_path(realm, ".", "dc=", 0);
|
|
}
|
|
|
|
|
|
#ifndef LDAP_PORT
|
|
#define LDAP_PORT 389
|
|
#endif
|
|
|
|
/*
|
|
initialise a ADS_STRUCT, ready for some ads_ ops
|
|
*/
|
|
ADS_STRUCT *ads_init(const char *realm,
|
|
const char *workgroup,
|
|
const char *ldap_server)
|
|
{
|
|
ADS_STRUCT *ads;
|
|
|
|
ads = (ADS_STRUCT *)smb_xmalloc(sizeof(*ads));
|
|
ZERO_STRUCTP(ads);
|
|
|
|
ads->server.realm = realm? strdup(realm) : NULL;
|
|
ads->server.workgroup = workgroup ? strdup(workgroup) : NULL;
|
|
ads->server.ldap_server = ldap_server? strdup(ldap_server) : NULL;
|
|
|
|
/* we need to know if this is a foreign realm to know if we can
|
|
use lp_ads_server() */
|
|
if (realm && strcasecmp(lp_realm(), realm) != 0) {
|
|
ads->server.foreign = 1;
|
|
}
|
|
if (workgroup && strcasecmp(lp_workgroup(), workgroup) != 0) {
|
|
ads->server.foreign = 1;
|
|
}
|
|
|
|
return ads;
|
|
}
|
|
|
|
/* a simpler ads_init() interface using all defaults */
|
|
ADS_STRUCT *ads_init_simple(void)
|
|
{
|
|
return ads_init(NULL, NULL, NULL);
|
|
}
|
|
|
|
/*
|
|
free the memory used by the ADS structure initialized with 'ads_init(...)'
|
|
*/
|
|
void ads_destroy(ADS_STRUCT **ads)
|
|
{
|
|
if (ads && *ads) {
|
|
#if HAVE_LDAP
|
|
if ((*ads)->ld) ldap_unbind((*ads)->ld);
|
|
#endif
|
|
SAFE_FREE((*ads)->server.realm);
|
|
SAFE_FREE((*ads)->server.workgroup);
|
|
SAFE_FREE((*ads)->server.ldap_server);
|
|
|
|
SAFE_FREE((*ads)->auth.realm);
|
|
SAFE_FREE((*ads)->auth.password);
|
|
SAFE_FREE((*ads)->auth.user_name);
|
|
SAFE_FREE((*ads)->auth.kdc_server);
|
|
|
|
SAFE_FREE((*ads)->config.realm);
|
|
SAFE_FREE((*ads)->config.bind_path);
|
|
SAFE_FREE((*ads)->config.ldap_server_name);
|
|
|
|
ZERO_STRUCTP(*ads);
|
|
SAFE_FREE(*ads);
|
|
}
|
|
}
|