LK_ENTRY *group_base;
int group_count;
int MailDisabled = 0;
+ char search_filter[1024];
if(UseGroupUniversal)
groupTypeControl = ADS_GROUP_TYPE_UNIVERSAL_GROUP;
group_count = 0;
group_base = NULL;
- sprintf(filter, "(&(objectClass=user)(cn=%s))", after_group_name);
+ sprintf(search_filter, "(&(objectClass=user)(cn=%s))",
+ after_group_name);
attr_array[0] = "cn";
attr_array[1] = NULL;
- if ((rc = linklist_build(ldap_handle, dn_path, filter, attr_array,
- &group_base, &group_count,
+ if ((rc = linklist_build(ldap_handle, dn_path, search_filter,
+ attr_array, &group_base, &group_count,
LDAP_SCOPE_SUBTREE)) != 0)
{
com_err(whoami, 0, "Unable to process group %s : %s",
ADD_ATTR("mitMoiraId", mitMoiraId_v, LDAP_MOD_REPLACE);
ADD_ATTR("groupType", groupTypeControl_v, LDAP_MOD_REPLACE);
+ if(!ActiveDirectory)
+ {
+ ADD_ATTR("name", name_v, LDAP_MOD_REPLACE);
+ }
+
if (Exchange)
{
if(atoi(maillist) && !MailDisabled && email_isvalid(mail))
{
mail_v[0] = contact_mail;
ADD_ATTR("mail", mail_v, LDAP_MOD_REPLACE);
+
+ if(!ActiveDirectory)
+ {
+ ADD_ATTR("mitMoiraMail", mail_v, LDAP_MOD_REPLACE);
+ }
}
n = SetHomeDirectory(ldap_handle, user_name, distinguished_name, WinHomeDir,
ADD_ATTR("eduPersonPrincipalName", mail_v, LDAP_MOD_REPLACE);
ADD_ATTR("displayName", name_v, LDAP_MOD_REPLACE);
ADD_ATTR("eduPersonNickname", name_v, LDAP_MOD_REPLACE);
+ ADD_ATTR("name", name_v, LDAP_MOD_REPLACE);
}
if (Exchange)
{
mail_v[0] = contact_mail;
ADD_ATTR("mail", mail_v, LDAP_MOD_REPLACE);
+
+ if(!ActiveDirectory)
+ {
+ ADD_ATTR("mitMoiraMail", mail_v, LDAP_MOD_REPLACE);
+ }
}
mods[n] = NULL;
{
mail_v[0] = contact_mail;
ADD_ATTR("mail", mail_v, LDAP_MOD_ADD);
+
+ if(!ActiveDirectory)
+ {
+ ADD_ATTR("mitMoiraMail", mail_v, LDAP_MOD_ADD);
+ }
}
if(strlen(av[U_FIRST])) {
if (group_count != 1)
{
- com_err(whoami, 0, "Unable to find user %s in directory",
- user_name);
goto cleanup;
}
int check_string(char *s)
{
char character;
+ char *string;
+
+ string = s;
for (; *s; s++)
{
if (illegalchars[(unsigned) character])
{
com_err(whoami, 0, "Found illegal char '%c' (%d) in string %s",
- character, (unsigned) character, s);
+ character, (unsigned) character, string);
return 0;
}
}
if (illegalchars_ldap[(unsigned) character])
{
com_err(whoami, 0, "Found illegal char '%c' (%d) in string %s",
- character, (unsigned) character, s);
+ character, (unsigned) character, string);
return 0;
}
}
call_args[3] = NULL;
callback_rc = 0;
+ if(!strcasecmp(AceName, PRODUCTION_PRINCIPAL) ||
+ !strcasecmp(AceName, TEST_PRINCIPAL))
+ {
+ return(1);
+ }
+
if (rc = mr_query("get_user_account_by_login", 1, av,
save_query_info, save_argv))
{
while (ptr != NULL)
{
- com_err(whoami, 0, "Processing member %s:%s", ptr->type,
- ptr->member);
-
if (!strcasecmp(ptr->type, "LIST"))
{
ptr = ptr->next;