/*
* Server functions which perform operations on user objects.
*
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2017 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License, version 3.
* GNU General Public License for more details.
*/
+#include <stdlib.h>
+#include <unistd.h>
#include "sysdep.h"
#include <stdio.h>
+#include <sys/stat.h>
#include <libcitadel.h>
-
#include "control.h"
#include "support.h"
#include "citserver.h"
/*
- * CtdlGetUser() - retrieve named user into supplied buffer.
- * returns 0 on success
+ * CtdlGetUser() retrieve named user into supplied buffer.
+ * returns 0 on success
*/
-int CtdlGetUserLen(struct ctdluser *usbuf, const char *name, long len)
+int CtdlGetUser(struct ctdluser *usbuf, char *name)
{
-
char usernamekey[USERNAME_SIZE];
struct cdbdata *cdbus;
+ long len = cutuserkey(name);
if (usbuf != NULL) {
memset(usbuf, 0, sizeof(struct ctdluser));
return(1);
}
if (usbuf != NULL) {
- memcpy(usbuf, cdbus->ptr,
- ((cdbus->len > sizeof(struct ctdluser)) ?
- sizeof(struct ctdluser) : cdbus->len));
+ memcpy(usbuf, cdbus->ptr, ((cdbus->len > sizeof(struct ctdluser)) ? sizeof(struct ctdluser) : cdbus->len));
}
cdb_free(cdbus);
-
return (0);
}
-int CtdlGetUser(struct ctdluser *usbuf, char *name)
-{
- return CtdlGetUserLen(usbuf, name, cutuserkey(name));
-}
-
int CtdlLockGetCurrentUser(void)
{
CitContext *CCC = CC;
-
- return CtdlGetUserLen(&CCC->user, CCC->curr_user, cutuserkey(CCC->curr_user));
+ return CtdlGetUser(&CCC->user, CCC->curr_user);
}
+
/*
* CtdlGetUserLock() - same as getuser() but locks the record
*/
{
char usernamekey[USERNAME_SIZE];
- makeuserkey(usernamekey,
- usbuf->fullname,
- cutuserkey(usbuf->fullname));
-
+ makeuserkey(usernamekey, usbuf->fullname, cutuserkey(usbuf->fullname));
usbuf->version = REV_LEVEL;
- cdb_store(CDB_USERS,
- usernamekey, strlen(usernamekey),
- usbuf, sizeof(struct ctdluser));
-
+ cdb_store(CDB_USERS, usernamekey, strlen(usernamekey), usbuf, sizeof(struct ctdluser));
}
+
void CtdlPutCurrentUserLock()
{
CtdlPutUser(&CC->user);
}
-
/*
* rename_user() - this is tricky because the user's display name is the database key
*
else { /* Sanity checks succeeded. Now rename the user. */
if (usbuf.usernum == 0)
{
- CONM_syslog(LOG_DEBUG, "Can not rename user \"Citadel\".\n");
+ syslog(LOG_DEBUG, "user_ops: can not rename user \"Citadel\".");
retcode = RENAMEUSER_NOT_FOUND;
} else {
- CON_syslog(LOG_DEBUG, "Renaming <%s> to <%s>\n", oldname, newname);
+ syslog(LOG_DEBUG, "user_ops: renaming <%s> to <%s>", oldname, newname);
cdb_delete(CDB_USERS, oldnamekey, strlen(oldnamekey));
safestrncpy(usbuf.fullname, newname, sizeof usbuf.fullname);
CtdlPutUser(&usbuf);
- cdb_store(CDB_USERSBYNUMBER, &usbuf.usernum, sizeof(long),
- usbuf.fullname, strlen(usbuf.fullname)+1 );
-
+ cdb_store(CDB_USERSBYNUMBER, &usbuf.usernum, sizeof(long), usbuf.fullname, strlen(usbuf.fullname)+1 );
retcode = RENAMEUSER_OK;
}
}
}
-
/*
* Index-generating function used by Ctdl[Get|Set]Relationship
*/
}
-
/*
* Back end for CtdlSetRelationship()
*/
memset (IndexBuf, 0, sizeof (IndexBuf));
/* Generate an index */
- IndexLen = GenerateRelationshipIndex(IndexBuf,
- newvisit->v_roomnum,
- newvisit->v_roomgen,
- newvisit->v_usernum);
+ IndexLen = GenerateRelationshipIndex(IndexBuf, newvisit->v_roomnum, newvisit->v_roomgen, newvisit->v_usernum);
/* Store the record */
cdb_store(CDB_VISIT, IndexBuf, IndexLen,
}
-
-
/*
* Define a relationship between a user and a room
*/
struct ctdluser *rel_user,
struct ctdlroom *rel_room)
{
-
-
/* We don't use these in Citadel because they're implicit by the
* index, but they must be present if the database is exported.
*/
put_visit(newvisit);
}
+
/*
* Locate a relationship between a user and a room
*/
struct ctdluser *rel_user,
struct ctdlroom *rel_room)
{
-
char IndexBuf[32];
int IndexLen;
struct cdbdata *cdbvisit;
return(0);
}
+
/*
* Convenience function.
*/
{
if (CC->internal_pgm) return(0);
if (required_level >= ac_internal) {
- cprintf("%d This is not a user-level command.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
+ cprintf("%d This is not a user-level command.\n", ERROR + HIGHER_ACCESS_REQUIRED);
return(-1);
}
}
-
/*
* Is the user currently logged in an Admin?
*/
return (0);
}
- if ((CC->user.axlevel >= AxAideU)
- || (CC->room.QRroomaide == CC->user.usernum)) {
+ if ((CC->user.axlevel >= AxAideU) || (CC->room.QRroomaide == CC->user.usernum)) {
return (1);
} else {
return (0);
}
}
+
/*
* CtdlGetUserByNumber() - get user by number
* returns 0 if user was found
cdbun = cdb_fetch(CDB_USERSBYNUMBER, &number, sizeof(long));
if (cdbun == NULL) {
- CON_syslog(LOG_INFO, "User %ld not found\n", number);
+ syslog(LOG_INFO, "user_ops: %ld not found", number);
return(-1);
}
- CON_syslog(LOG_INFO, "User %ld maps to %s\n", number, cdbun->ptr);
+ syslog(LOG_INFO, "user_ops: %ld maps to %s", number, cdbun->ptr);
r = CtdlGetUser(usbuf, cdbun->ptr);
cdb_free(cdbun);
return(r);
}
+
/*
* Helper function for rebuild_usersbynumber()
*/
}
while (u != NULL) {
- CON_syslog(LOG_DEBUG, "Rebuilding usersbynumber index %10ld : %s\n",
- u->usernum, u->username);
+ syslog(LOG_DEBUG, "user_ops: rebuilding usersbynumber index %10ld : %s", u->usernum, u->username);
cdb_store(CDB_USERSBYNUMBER, &u->usernum, sizeof(long), u->username, strlen(u->username)+1);
-
ptr = u;
u = u->next;
free(ptr);
}
-
/*
* Rebuild the users-by-number index
*/
}
-
/*
* getuserbyuid() - get user by system uid (for PAM mode authentication)
* returns 0 if user was found
*
- * WARNING: don't use this function unless you absolutely have to. It does
- * a sequential search and therefore is computationally expensive.
+ * WARNING: don't use this function unless you absolutely have to. It does
+ * a sequential search and therefore is computationally expensive.
+ *
+ * FIXME: build an index, dummy.
*/
int getuserbyuid(struct ctdluser *usbuf, uid_t number)
{
return (-1);
}
+
/*
* Back end for cmd_user() and its ilk
*
{
char username[SIZ];
int found_user;
- long len;
- CON_syslog(LOG_DEBUG, "CtdlLoginExistingUser(%s, %s)\n", authname, trythisname);
+ syslog(LOG_DEBUG, "user_ops: CtdlLoginExistingUser(%s, %s)", authname, trythisname);
if ((CC->logged_in)) {
return login_already_logged_in;
if (!strncasecmp(trythisname, "SYS_", 4))
{
- CON_syslog(LOG_DEBUG, "System user \"%s\" is not allowed to log in.\n", trythisname);
+ syslog(LOG_DEBUG, "user_ops: system user \"%s\" is not allowed to log in.", trythisname);
return login_not_found;
}
/* Continue attempting user validation... */
safestrncpy(username, trythisname, sizeof (username));
striplt(username);
- len = cutuserkey(username);
if (IsEmptyStr(username)) {
return login_not_found;
struct passwd *tempPwdPtr;
char pwdbuffer[256];
- CON_syslog(LOG_DEBUG, "asking host about <%s>\n", username);
+ syslog(LOG_DEBUG, "user_ops: asking host about <%s>", username);
#ifdef HAVE_GETPWNAM_R
#ifdef SOLARIS_GETPWUID
- CON_syslog(LOG_DEBUG, "Calling getpwnam_r()\n");
+ syslog(LOG_DEBUG, "user_ops: calling getpwnam_r()");
tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer);
#else // SOLARIS_GETPWUID
- CONM_syslog(LOG_DEBUG, "Calling getpwnam_r()\n");
+ syslog(LOG_DEBUG, "user_ops: calling getpwnam_r()");
getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
#endif // SOLARIS_GETPWUID
#else // HAVE_GETPWNAM_R
- CON_syslog(LOG_DEBUG, "SHOULD NEVER GET HERE!!!\n");
+ syslog(LOG_DEBUG, "user_ops: SHOULD NEVER GET HERE!!!");
tempPwdPtr = NULL;
#endif // HAVE_GETPWNAM_R
if (tempPwdPtr == NULL) {
- CON_syslog(LOG_DEBUG, "no such user <%s>\n", username);
+ syslog(LOG_DEBUG, "user_ops: no such user <%s>", username);
return login_not_found;
}
* If not found, make one attempt to create it.
*/
found_user = getuserbyuid(&CC->user, pd.pw_uid);
- CON_syslog(LOG_DEBUG, "found it: uid=%ld, gecos=%s here: %d\n",
- (long)pd.pw_uid, pd.pw_gecos, found_user);
if (found_user != 0) {
- len = cutuserkey(username);
- create_user(username, len, 0);
+ create_user(username, CREATE_USER_DO_NOT_BECOME_USER, pd.pw_uid);
found_user = getuserbyuid(&CC->user, pd.pw_uid);
}
+ syslog(LOG_DEBUG, "user_ops: found it: uid=%ld, gecos=%s here: %d", (long)pd.pw_uid, pd.pw_gecos, found_user);
}
char ldap_cn[256];
char ldap_dn[256];
- found_user = CtdlTryUserLDAP(username, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &ldap_uid, 0);
+ found_user = CtdlTryUserLDAP(username, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &ldap_uid);
if (found_user != 0) {
return login_not_found;
}
found_user = getuserbyuid(&CC->user, ldap_uid);
if (found_user != 0) {
- create_user(username, len, 0);
+ create_user(ldap_cn, CREATE_USER_DO_NOT_BECOME_USER, ldap_uid);
found_user = getuserbyuid(&CC->user, ldap_uid);
}
if (((CC->nologin)) && (CC->user.axlevel < AxAideU)) {
return login_too_many_users;
} else {
- safestrncpy(CC->curr_user, CC->user.fullname,
- sizeof CC->curr_user);
+ safestrncpy(CC->curr_user, CC->user.fullname, sizeof CC->curr_user);
return login_ok;
}
}
}
-
-
-
/*
* session startup code which is common to both cmd_pass() and cmd_newu()
*/
struct CitContext *CCC = CC;
CCC->logged_in = 1;
- CON_syslog(LOG_NOTICE, "<%s> logged in\n", CCC->curr_user);
+ syslog(LOG_NOTICE, "user_ops: <%s> logged in", CCC->curr_user);
CtdlGetUserLock(&CCC->user, CCC->curr_user);
++(CCC->user.timescalled);
}
}
+ /*
+ * If we are using LDAP authentication, extract the user's email addresses from the directory.
+ * FIXME make this a site configurable setting
+ */
+ #ifdef HAVE_LDAP
+ if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
+ char new_emailaddrs[512];
+ if (extract_email_addresses_from_ldap(CCC->ldap_dn, new_emailaddrs) == 0) {
+ strcpy(CCC->user.emailaddrs, new_emailaddrs);
+ }
+ }
+ #endif
+
+ /*
+ * No email address for user? Make one up.
+ */
+ if (IsEmptyStr(CCC->user.emailaddrs)) {
+ sprintf(CCC->user.emailaddrs, "cit%ld@%s", CCC->user.usernum, CtdlGetConfigStr("c_fqdn"));
+ }
+
CtdlPutUserLock(&CCC->user);
/*
- * Populate CCC->cs_inet_email with a default address. This will be
- * overwritten with the user's directory address, if one exists, when
- * the vCard module's login hook runs.
+ * Populate cs_inet_email and cs_inet_other_emails with valid email addresses from the user record
*/
- snprintf(CCC->cs_inet_email, sizeof CCC->cs_inet_email, "%s@%s",
- CCC->user.fullname, CtdlGetConfigStr("c_fqdn"));
- convert_spaces_to_underscores(CCC->cs_inet_email);
+ strcpy(CCC->cs_inet_email, CCC->user.emailaddrs);
+ char *firstsep = strstr(CCC->cs_inet_email, "|");
+ if (firstsep) {
+ strcpy(CCC->cs_inet_other_emails, firstsep+1);
+ *firstsep = 0;
+ }
+ else {
+ CCC->cs_inet_other_emails[0] = 0;
+ }
/* Create any personal rooms required by the system.
* (Technically, MAILROOM should be there already, but just in case...)
CIT_OK, CC->user.fullname, CC->user.axlevel,
CC->user.timescalled, CC->user.posted,
CC->user.flags, CC->user.usernum,
- CC->previous_login);
+ CC->previous_login
+ );
}
-
void CtdlUserLogout(void)
{
CitContext *CCC = MyContext();
- CON_syslog(LOG_DEBUG, "CtdlUserLogout() logging out <%s> from session %d",
- CCC->curr_user, CCC->cs_pid
- );
+ syslog(LOG_DEBUG, "user_ops: CtdlUserLogout() logging out <%s> from session %d", CCC->curr_user, CCC->cs_pid);
/* Run any hooks registered by modules... */
PerformSessionHooks(EVT_LOGOUT);
CCC->logged_in = 0;
/* Check to see if the user was deleted whilst logged in and purge them if necessary */
- if ((CCC->user.axlevel == AxDeleted) && (CCC->user.usernum))
+ if ((CCC->user.axlevel == AxDeleted) && (CCC->user.usernum)) {
purge_user(CCC->user.fullname);
+ }
/* Clear out the user record in memory so we don't behave like a ghost */
memset(&CCC->user, 0, sizeof(struct ctdluser));
CCC->fake_username[0] = 0;
CCC->fake_hostname[0] = 0;
CCC->fake_roomname[0] = 0;
-
/* Free any output buffers */
unbuffer_output();
int rv = 0;
if (IsEmptyStr(pass)) {
- CON_syslog(LOG_DEBUG, "Refusing to chkpwd for uid=%d with empty password.\n", uid);
+ syslog(LOG_DEBUG, "user_ops: refusing to chkpwd for uid=%d with empty password", uid);
return 0;
}
- CON_syslog(LOG_DEBUG, "Validating password for uid=%d using chkpwd...\n", uid);
+ syslog(LOG_DEBUG, "user_ops: validating password for uid=%d using chkpwd...", uid);
begin_critical_section(S_CHKPWD);
rv = write(chkpwd_write_pipe[1], &uid, sizeof(uid_t));
if (rv == -1) {
- CON_syslog(LOG_EMERG, "Communicatino with chkpwd broken: %s\n", strerror(errno));
+ syslog(LOG_ERR, "user_ops: communication with chkpwd broken: %m");
end_critical_section(S_CHKPWD);
return 0;
}
rv = write(chkpwd_write_pipe[1], pass, 256);
if (rv == -1) {
- CON_syslog(LOG_EMERG, "Communicatino with chkpwd broken: %s\n", strerror(errno));
+ syslog(LOG_ERR, "user_ops: communication with chkpwd broken: %m");
end_critical_section(S_CHKPWD);
return 0;
}
rv = read(chkpwd_read_pipe[0], buf, 4);
if (rv == -1) {
- CON_syslog(LOG_EMERG, "Communicatino with chkpwd broken: %s\n", strerror(errno));
+ syslog(LOG_ERR, "user_ops: ommunication with chkpwd broken: %m");
end_critical_section(S_CHKPWD);
return 0;
}
end_critical_section(S_CHKPWD);
if (!strncmp(buf, "PASS", 4)) {
- CONM_syslog(LOG_DEBUG, "...pass\n");
+ syslog(LOG_DEBUG, "user_ops: chkpwd pass");
return(1);
}
- CONM_syslog(LOG_DEBUG, "...fail\n");
+ syslog(LOG_DEBUG, "user_ops: chkpwd fail");
return 0;
}
+
/*
* Start up the chkpwd daemon so validpw() has something to talk to
*/
struct stat filestats;
int i;
- CONM_syslog(LOG_DEBUG, "Starting chkpwd daemon for host authentication mode\n");
+ syslog(LOG_DEBUG, "user_ops: starting chkpwd daemon for host authentication mode");
- if ((stat(file_chkpwd, &filestats)==-1) ||
- (filestats.st_size==0)){
- printf("didn't find chkpwd daemon in %s: %s\n", file_chkpwd, strerror(errno));
+ if ((stat(file_chkpwd, &filestats)==-1) || (filestats.st_size==0)) {
+ syslog(LOG_ERR, "user_ops: %s: %m", file_chkpwd);
abort();
}
if (pipe(chkpwd_write_pipe) != 0) {
- CON_syslog(LOG_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno));
+ syslog(LOG_ERR, "user_ops: unable to create pipe for chkpwd daemon: %m");
abort();
}
if (pipe(chkpwd_read_pipe) != 0) {
- CON_syslog(LOG_EMERG, "Unable to create pipe for chkpwd daemon: %s\n", strerror(errno));
+ syslog(LOG_ERR, "user_ops: unable to create pipe for chkpwd daemon: %m");
abort();
}
chkpwd_pid = fork();
if (chkpwd_pid < 0) {
- CON_syslog(LOG_EMERG, "Unable to fork chkpwd daemon: %s\n", strerror(errno));
+ syslog(LOG_ERR, "user_ops: unable to fork chkpwd daemon: %m");
abort();
}
if (chkpwd_pid == 0) {
- CONM_syslog(LOG_DEBUG, "Now calling dup2() write\n");
dup2(chkpwd_write_pipe[0], 0);
- CONM_syslog(LOG_DEBUG, "Now calling dup2() write\n");
dup2(chkpwd_read_pipe[1], 1);
- CONM_syslog(LOG_DEBUG, "Now closing stuff\n");
for (i=2; i<256; ++i) close(i);
- CON_syslog(LOG_DEBUG, "Now calling execl(%s)\n", file_chkpwd);
execl(file_chkpwd, file_chkpwd, NULL);
- CON_syslog(LOG_EMERG, "Unable to exec chkpwd daemon: %s\n", strerror(errno));
+ syslog(LOG_ERR, "user_ops: unable to exec chkpwd daemon: %m");
abort();
exit(errno);
}
CitContext *CCC = CC;
if ((CCC->logged_in)) {
- CONM_syslog(LOG_WARNING, "CtdlTryPassword: already logged in\n");
+ syslog(LOG_WARNING, "user_ops: CtdlTryPassword: already logged in");
return pass_already_logged_in;
}
if (!strcmp(CCC->curr_user, NLI)) {
- CONM_syslog(LOG_WARNING, "CtdlTryPassword: no user selected\n");
+ syslog(LOG_WARNING, "user_ops: CtdlTryPassword: no user selected");
return pass_no_user;
}
if (CtdlGetUser(&CCC->user, CCC->curr_user)) {
- CONM_syslog(LOG_ERR, "CtdlTryPassword: internal error\n");
+ syslog(LOG_ERR, "user_ops: CtdlTryPassword: internal error");
return pass_internal_error;
}
if (password == NULL) {
- CONM_syslog(LOG_INFO, "CtdlTryPassword: NULL password string supplied\n");
+ syslog(LOG_INFO, "user_ops: CtdlTryPassword: NULL password string supplied");
return pass_wrong_password;
}
/*
* (sooper-seekrit hack ends here)
*/
-
}
else {
code = (-1);
if (!code) {
do_login();
return pass_ok;
- } else {
- CON_syslog(LOG_WARNING, "Bad password specified for <%s> Service <%s> Port <%ld> Remote <%s / %s>\n",
- CCC->curr_user,
- CCC->ServiceName,
- CCC->tcp_port,
- CCC->cs_host,
- CCC->cs_addr);
-
-
-//citserver[5610]: Bad password specified for <willi> Service <citadel-TCP> Remote <PotzBlitz / >
-
+ }
+ else {
+ syslog(LOG_WARNING, "user_ops: bad password specified for <%s> Service <%s> Port <%ld> Remote <%s / %s>",
+ CCC->curr_user,
+ CCC->ServiceName,
+ CCC->tcp_port,
+ CCC->cs_host,
+ CCC->cs_addr
+ );
return pass_wrong_password;
}
}
-
-
/*
* Delete a user record *and* all of its related resources.
*/
int purge_user(char pname[])
{
- char filename[64];
struct ctdluser usbuf;
char usernamekey[USERNAME_SIZE];
return (ERROR + NO_SUCH_USER);
if (CtdlGetUser(&usbuf, pname) != 0) {
- CON_syslog(LOG_ERR, "Cannot purge user <%s> - not found\n", pname);
+ syslog(LOG_ERR, "user_ops: cannot purge user <%s> - not found", pname);
return (ERROR + NO_SUCH_USER);
}
/* Don't delete a user who is currently logged in. Instead, just
* during the next purge.
*/
if (CtdlIsUserLoggedInByNum(usbuf.usernum)) {
- CON_syslog(LOG_WARNING, "User <%s> is logged in; not deleting.\n", pname);
+ syslog(LOG_WARNING, "user_ops: <%s> is logged in; not deleting", pname);
usbuf.axlevel = AxDeleted;
CtdlPutUser(&usbuf);
return (1);
}
- CON_syslog(LOG_NOTICE, "Deleting user <%s>\n", pname);
+ syslog(LOG_NOTICE, "user_ops: deleting <%s>", pname);
/*
* FIXME:
* That would truly mess things up :-(
* I would like to see the S_USERS start before the CtdlIsUserLoggedInByNum() above
* and end after the user has been deleted from the database, below.
- * Question is should we enter the EVT_PURGEUSER whilst S_USERS is active?
+ * Question is should we enter the EVT_PURGEUSER while S_USERS is active?
*/
/* Perform any purge functions registered by server extensions */
/* delete the userlog entry */
cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
- /* remove the user's bio file */
- snprintf(filename,
- sizeof filename,
- "%s/%ld",
- ctdl_bio_dir,
- usbuf.usernum);
- unlink(filename);
-
- /* remove the user's picture */
- snprintf(filename,
- sizeof filename,
- "%s/%ld.gif",
- ctdl_image_dir,
- usbuf.usernum);
- unlink(filename);
-
return (0);
}
-int internal_create_user (const char *username, long len, struct ctdluser *usbuf, uid_t uid)
+int internal_create_user(char *username, struct ctdluser *usbuf, uid_t uid)
{
- if (!CtdlGetUserLen(usbuf, username, len)) {
+ if (!CtdlGetUser(usbuf, username)) {
return (ERROR + ALREADY_EXISTS);
}
}
-
/*
* create_user() - back end processing to create a new user
*
* Set 'newusername' to the desired account name.
- * Set 'become_user' to nonzero if this is self-service account creation and we want
- * to actually log in as the user we just created, otherwise set it to 0.
+ * Set 'become_user' to CREATE_USER_BECOME_USER if this is self-service account creation and we want to
+ * actually log in as the user we just created, otherwise set it to CREATE_USER_DO_NOT_BECOME_USER
+ * Set 'uid' to some uid_t value to associate the account with an external auth user, or (-1) for native auth
*/
-int create_user(const char *newusername, long len, int become_user)
+int create_user(char *username, int become_user, uid_t uid)
{
struct ctdluser usbuf;
struct ctdlroom qrbuf;
- char username[256];
char mailboxname[ROOMNAMELEN];
char buf[SIZ];
int retval;
- uid_t uid = (-1);
-
- safestrncpy(username, newusername, sizeof username);
strproc(username);
-
-
- if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
-
- /* host auth mode */
-
- struct passwd pd;
- struct passwd *tempPwdPtr;
- char pwdbuffer[SIZ];
-
-#ifdef HAVE_GETPWNAM_R
-#ifdef SOLARIS_GETPWUID
- tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof(pwdbuffer));
-#else // SOLARIS_GETPWUID
- getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
-#endif // SOLARIS_GETPWUID
-#else // HAVE_GETPWNAM_R
- tempPwdPtr = NULL;
-#endif // HAVE_GETPWNAM_R
- if (tempPwdPtr != NULL) {
- extract_token(username, pd.pw_gecos, 0, ',', sizeof username);
- uid = pd.pw_uid;
- if (IsEmptyStr (username))
- {
- safestrncpy(username, pd.pw_name, sizeof username);
- len = cutuserkey(username);
- }
- }
- else {
- return (ERROR + NO_SUCH_USER);
- }
+ if ((retval = internal_create_user(username, &usbuf, uid)) != 0) {
+ return retval;
}
-#ifdef HAVE_LDAP
- if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
- if (CtdlTryUserLDAP(username, NULL, 0, username, sizeof username, &uid, 0) != 0) {
- return(ERROR + NO_SUCH_USER);
- }
- }
-#endif /* HAVE_LDAP */
-
- if ((retval = internal_create_user(username, len, &usbuf, uid)) != 0)
- return retval;
-
/*
* Give the user a private mailbox and a configuration room.
* Make the latter an invisible system room.
* creating a user, instead of doing self-service account creation
*/
- if (become_user) {
+ if (become_user == CREATE_USER_BECOME_USER) {
/* Now become the user we just created */
memcpy(&CC->user, &usbuf, sizeof(struct ctdluser));
safestrncpy(CC->curr_user, username, sizeof CC->curr_user);
CC->cs_addr
);
CtdlAideMessage(buf, "User Creation Notice");
- CON_syslog(LOG_NOTICE, "New user <%s> created\n", username);
+ syslog(LOG_NOTICE, "user_ops: <%s> created", username);
return (0);
}
-
/*
* set password - back end api code
*/
CtdlGetUserLock(&CC->user, CC->curr_user);
safestrncpy(CC->user.password, new_pw, sizeof(CC->user.password));
CtdlPutUserLock(&CC->user);
- CON_syslog(LOG_INFO, "Password changed for user <%s>\n", CC->curr_user);
+ syslog(LOG_INFO, "user_ops: password changed for <%s>", CC->curr_user);
PerformSessionHooks(EVT_SETPASS);
}
-
-
/*
* API function for cmd_invt_kick() and anything else that needs to
* invite or kick out a user to/from a room.
}
-
-
/*
* Traverse the user file...
*/
}
-
-
/*
* Count the number of new mail messages the user has
*/
return (num_newmsgs);
}
-
-
-
-
projects / citadel.git / blobdiff