summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-06-30 23:09:05 +0200
committerGünther Deschner <gd@samba.org>2010-07-01 21:17:17 +0200
commit2f9076ac29904c98e1a794d04c79db637283f888 (patch)
treeefdcc66ab735489e9728b2a626f989dd64614652 /source3
parentb9e6962dd7616eaeaf8a0bc42c1180541ca06dd3 (diff)
downloadsamba-2f9076ac29904c98e1a794d04c79db637283f888.tar.gz
samba-2f9076ac29904c98e1a794d04c79db637283f888.tar.bz2
samba-2f9076ac29904c98e1a794d04c79db637283f888.zip
s3-libads: use shared well known guids.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/include/ads.h3
-rw-r--r--source3/libads/ldap.c2
-rw-r--r--source3/utils/net_ads.c4
3 files changed, 3 insertions, 6 deletions
diff --git a/source3/include/ads.h b/source3/include/ads.h
index ee7295d0cc..132586fe31 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -241,9 +241,6 @@ typedef void **ADS_MODLIST;
#define ADS_AUTH_SASL_FORCE 0x0080
#define ADS_AUTH_USER_CREDS 0x0100
-#define WELL_KNOWN_GUID_COMPUTERS "AA312825768811D1ADED00C04FD8D5CD"
-#define WELL_KNOWN_GUID_USERS "A9D1CA15768811D1ADED00C04FD8D5CD"
-
enum ads_extended_dn_flags {
ADS_EXTENDED_DN_HEX_STRING = 0,
ADS_EXTENDED_DN_STRING = 1 /* not supported on win2k */
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 98da8ff484..af48fdae5a 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1602,7 +1602,7 @@ char *ads_ou_string(ADS_STRUCT *ads, const char *org_unit)
if (!org_unit || !*org_unit) {
- ret = ads_default_ou_string(ads, WELL_KNOWN_GUID_COMPUTERS);
+ ret = ads_default_ou_string(ads, DS_GUID_COMPUTERS_CONTAINER);
/* samba4 might not yet respond to a wellknownobject-query */
return ret ? ret : SMB_STRDUP("cn=Computers");
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 4aea9a7ab4..700d98bd26 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -476,7 +476,7 @@ static int ads_user_add(struct net_context *c, int argc, const char **argv)
if (c->opt_container) {
ou_str = SMB_STRDUP(c->opt_container);
} else {
- ou_str = ads_default_ou_string(ads, WELL_KNOWN_GUID_USERS);
+ ou_str = ads_default_ou_string(ads, DS_GUID_USERS_CONTAINER);
}
status = ads_add_user_acct(ads, argv[0], ou_str, c->opt_comment);
@@ -770,7 +770,7 @@ static int ads_group_add(struct net_context *c, int argc, const char **argv)
if (c->opt_container) {
ou_str = SMB_STRDUP(c->opt_container);
} else {
- ou_str = ads_default_ou_string(ads, WELL_KNOWN_GUID_USERS);
+ ou_str = ads_default_ou_string(ads, DS_GUID_USERS_CONTAINER);
}
status = ads_add_group_acct(ads, argv[0], ou_str, c->opt_comment);