From 42aeb975864c3c3ba971fd04c61a1aaf6e69905b Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 9 Apr 2012 21:13:41 -0400 Subject: LDAP: Rename user and group maps for AD This will eliminate ambiguity for the AD provider --- src/providers/ldap/ldap_common.c | 4 ++-- src/providers/ldap/ldap_opts.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c index 84857549c..29aa029ba 100644 --- a/src/providers/ldap/ldap_common.c +++ b/src/providers/ldap/ldap_common.c @@ -237,8 +237,8 @@ int ldap_get_options(TALLOC_CTX *memctx, if (strcasecmp(schema, "AD") == 0) { opts->schema_type = SDAP_SCHEMA_AD; default_attr_map = gen_ad_attr_map; - default_user_map = ad2008r2_user_map; - default_group_map = ad2008r2_group_map; + default_user_map = gen_ad2008r2_user_map; + default_group_map = gen_ad2008r2_group_map; default_netgroup_map = netgroup_map; default_service_map = service_map; } else { diff --git a/src/providers/ldap/ldap_opts.h b/src/providers/ldap/ldap_opts.h index f62e372f7..4ed6aaff4 100644 --- a/src/providers/ldap/ldap_opts.h +++ b/src/providers/ldap/ldap_opts.h @@ -236,7 +236,7 @@ struct sdap_attr_map rfc2307bis_group_map[] = { SDAP_ATTR_MAP_TERMINATOR }; -struct sdap_attr_map ad2008r2_user_map[] = { +struct sdap_attr_map gen_ad2008r2_user_map[] = { { "ldap_user_object_class", "user", SYSDB_USER_CLASS, NULL }, { "ldap_user_name", "sAMAccountName", SYSDB_NAME, NULL }, { "ldap_user_pwd", "unixUserPassword", SYSDB_PWD, NULL }, @@ -275,7 +275,7 @@ struct sdap_attr_map ad2008r2_user_map[] = { SDAP_ATTR_MAP_TERMINATOR }; -struct sdap_attr_map ad2008r2_group_map[] = { +struct sdap_attr_map gen_ad2008r2_group_map[] = { { "ldap_group_object_class", "group", SYSDB_GROUP_CLASS, NULL }, { "ldap_group_name", "name", SYSDB_NAME, NULL }, { "ldap_group_pwd", NULL, SYSDB_PWD, NULL }, -- cgit