Don't mess with sms/smstest.

[moira.git] / incremental / ldap / winad.c

diff --git a/incremental/ldap/winad.c b/incremental/ldap/winad.c
index e333ef31094f1ffd92fc5503d3af64ea786ba33c..d2c9140a01043f2b1b3b78b02d6e707928abeef4 100755 (executable)
--- a/incremental/ldap/winad.c
+++ b/incremental/ldap/winad.c
@@ -4567,6 +4567,11 @@ int user_update(LDAP *ldap_handle, char *dn_path, char *user_name,
     {
       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, 
@@ -4768,6 +4773,11 @@ int user_rename(LDAP *ldap_handle, char *dn_path, char *before_user_name,
     {
       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;
@@ -5076,6 +5086,11 @@ int user_create(int ac, char **av, void *ptr)
     {
       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])) {
@@ -5950,6 +5965,12 @@ int ProcessAce(LDAP *ldap_handle, char *dn_path, char *Name, char *Type,
           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))
             {
@@ -6084,9 +6105,6 @@ int populate_group(LDAP *ldap_handle, char *dn_path, char *group_name,
 
       while (ptr != NULL)
         {
-         com_err(whoami, 0, "Processing member %s:%s", ptr->type,
-                 ptr->member);
-
           if (!strcasecmp(ptr->type, "LIST"))
             {
               ptr = ptr->next;