Address generator is moved into internet_addressing.c because that's where it belongs...

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 7c9bac07aa3389405dccf4a3c505bbe212a15bed..90dd55a57e61f90081160e2349098f0110a7c423 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -1708,3 +1708,16 @@ void CtdlSetEmailAddressesForUser(char *requested_user, char *new_emailaddrs)
 
        CtdlPutUserLock(&usbuf);
 }
+
+
+/*
+ * Auto-generate an Internet email address for a user account
+ */
+void AutoGenerateEmailAddressForUser(struct ctdluser *user)
+{
+       char synthetic_email_addr[1024];
+       snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "ctdl%08lx@%s", user->usernum, CtdlGetConfigStr("c_fqdn"));
+       CtdlSetEmailAddressesForUser(user->fullname, synthetic_email_addr);
+       strncpy(CC->user.emailaddrs, synthetic_email_addr, sizeof(user->emailaddrs));
+       syslog(LOG_DEBUG, "user_ops: auto-generated email address <%s> for <%s>", synthetic_email_addr, user->fullname);
+}

diff --git a/citadel/internet_addressing.h b/citadel/internet_addressing.h
index cb19085c5bf0aeec36e57aa5aa4131191eefa997..2c9cf9e41a262940fc217cc9261792c6098b41f8 100644 (file)
--- a/citadel/internet_addressing.h
+++ b/citadel/internet_addressing.h
@@ -15,6 +15,7 @@ int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr);
 int CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr);
 int CtdlDirectoryLookup(char *target, char *internet_addr, size_t targbuflen);
 void CtdlSetEmailAddressesForUser(char *requested_user, char *new_emailaddrs);
+void AutoGenerateEmailAddressForUser(struct ctdluser *user);
 struct CtdlMessage *convert_internet_message(char *rfc822);
 struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822);
 int CtdlIsMe(char *addr, int addr_buf_len);

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 05f2fa0fbffeb00886a99a436f627f7e9525a8cf..607f16b3aed96cf3388b5731a306bd6048af23b1 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -654,11 +654,7 @@ void do_login(void)
 
        /* If the user does not have any email addresses assigned, generate one. */
        if (IsEmptyStr(CC->user.emailaddrs)) {
-               char synthetic_email_addr[1024];
-               snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "ctdl%08lx@%s", CC->user.usernum, CtdlGetConfigStr("c_fqdn"));
-               CtdlSetEmailAddressesForUser(CC->user.fullname, synthetic_email_addr);
-               strncpy(CC->user.emailaddrs, synthetic_email_addr, sizeof(CC->user.emailaddrs));
-               syslog(LOG_DEBUG, "user_ops: auto-generated email address <%s> for <%s>", synthetic_email_addr, CC->user.fullname);
+               AutoGenerateEmailAddressForUser(&CC->user);
        }
 
        /*