The fix to Bug 311 didn't work. Applied a cleaner fix.

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 79bbb9a0773bf83eda25bc774380e14a79f34666..7f84fa21eadb893c5bbd51cfe5bc6b8533616702 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -50,7 +50,6 @@
 #include "citadel_dirs.h"
 #include "genstamp.h"
 #include "threads.h"
-#include "serv_vcard.h"        /* FIXME: Get this dependancy out. Needed for vcard_add_alias */
 
 /* These pipes are used to talk to the chkpwd daemon, which is forked during startup */
 int chkpwd_write_pipe[2];
@@ -874,8 +873,6 @@ int purge_user(char pname[])
 }
 
 
-
-
 /*
  * create_user()  -  back end processing to create a new user
  *
@@ -980,23 +977,6 @@ int create_user(char *newusername, int become_user)
        /* Perform any create functions registered by server extensions */
        PerformUserHooks(&usbuf, EVT_NEWUSER);
 
-       /* In host auth mode the user was created with an email address of the users
-        * full name from the passwd gecos field.
-        * Not sure what would have happened if that wasn't set to something
-        * but thats another story
-        * We need to add an email alias to the users vCard for the proper username
-        */
-       if (config.c_auth_mode == AUTHMODE_HOST)
-       {
-               char user_alias[SIZ];
-               
-               if (strcmp(username, newusername))
-               {
-                       sprintf(user_alias, "%s@%s", newusername, config.c_fqdn);
-                       vcard_add_alias(&usbuf, user_alias);
-               }
-       }
-
        /* Everything below this line can be bypassed if administratively
         * creating a user, instead of doing self-service account creation
         */