X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fuser_ops.c;h=1e8792d71d6a0cb9681c9bad800650a4da28e427;hb=1a3138f7132003e097baa70dd1d9380fa65eadfe;hp=270ca87dbe48590d1093f81e34cee0c5b226dec9;hpb=9cd8f2f569341c6724519ce99113f1caa38f31fb;p=citadel.git

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 270ca87db..1e8792d71 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -19,6 +19,7 @@
 #include "control.h"
 #include "support.h"
 #include "citserver.h"
+#include "config.h"
 #include "citadel_ldap.h"
 #include "ctdl_module.h"
 #include "user_ops.h"
@@ -29,17 +30,6 @@ int chkpwd_write_pipe[2];
 int chkpwd_read_pipe[2];
 
 
-
-/*
- * getuser()  -  retrieve named user into supplied buffer.
- *	       returns 0 on success
- */
-int getuser(struct ctdluser *usbuf, char name[])
-{
-	return CtdlGetUser(usbuf, name);
-}
-
-
 /*
  * CtdlGetUser()  -  retrieve named user into supplied buffer.
  *	       returns 0 on success
@@ -76,6 +66,12 @@ 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));
+}
 
 /*
  * CtdlGetUserLock()  -  same as getuser() but locks the record
@@ -92,15 +88,6 @@ int CtdlGetUserLock(struct ctdluser *usbuf, char *name)
 }
 
 
-/*
- * lgetuser()  -  same as getuser() but locks the record
- */
-int lgetuser(struct ctdluser *usbuf, char *name)
-{
-	return CtdlGetUserLock(usbuf, name);
-}
-
-
 /*
  * CtdlPutUser()  -  write user buffer into the correct place on disk
  */
@@ -119,13 +106,9 @@ void CtdlPutUser(struct ctdluser *usbuf)
 
 }
 
-
-/*
- * putuser()  -  write user buffer into the correct place on disk
- */
-void putuser(struct ctdluser *usbuf)
+void CtdlPutCurrentUserLock()
 {
-	CtdlPutUser(usbuf);
+	CtdlPutUser(&CC->user);
 }
 
 
@@ -139,14 +122,6 @@ void CtdlPutUserLock(struct ctdluser *usbuf)
 }
 
 
-/*
- * lputuser()  -  same as putuser() but locks the record
- */
-void lputuser(struct ctdluser *usbuf)
-{
-	CtdlPutUserLock(usbuf);
-}
-
 
 /*
  * rename_user()  -  this is tricky because the user's display name is the database key
@@ -340,7 +315,7 @@ int CtdlCheckInternetMailPermission(struct ctdluser *who) {
 	if (who->axlevel <= AxProbU) return(0);
 
 	/* Globally enabled? */
-	if (config.c_restrict == 0) return(1);
+	if (CtdlGetConfigInt("c_restrict") == 0) return(1);
 
 	/* User flagged ok? */
 	if (who->flags & US_INTERNET) return(2);
@@ -364,7 +339,7 @@ int CtdlAccessCheck(int required_level)
 		return(-1);
 	}
 
-	if ((required_level >= ac_logged_in_or_guest) && (CC->logged_in == 0) && (!config.c_guest_logins)) {
+	if ((required_level >= ac_logged_in_or_guest) && (CC->logged_in == 0) && (CtdlGetConfigInt("c_guest_logins") == 0)) {
 		cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
 		return(-1);
 	}
@@ -447,19 +422,6 @@ int CtdlGetUserByNumber(struct ctdluser *usbuf, long number)
 	return(r);
 }
 
-/*
- * getuserbynumber() -	get user by number
- * 			returns 0 if user was found
- *
- * Note: fetching a user this way requires one additional database operation.
- */
-int getuserbynumber(struct ctdluser *usbuf, long number)
-{
-	return CtdlGetUserByNumber(usbuf, number);
-}
-
-
-
 /*
  * Helper function for rebuild_usersbynumber()
  */
@@ -567,10 +529,10 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
 
 	/* If a "master user" is defined, handle its authentication if specified */
 	CC->is_master = 0;
-	if ((configlen.c_master_user > 0) && 
-	    (configlen.c_master_pass > 0) &&
-	    (authname != NULL) &&
-	    (!strcasecmp(authname, config.c_master_user)))
+	if (	(!IsEmptyStr(CtdlGetConfigStr("c_master_user"))) && 
+	    	(!IsEmptyStr(CtdlGetConfigStr("c_master_pass"))) &&
+		(authname != NULL) &&
+		(!strcasecmp(authname, CtdlGetConfigStr("c_master_user"))) )
 	{
 		CC->is_master = 1;
 	}
@@ -584,7 +546,7 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
 		return login_not_found;
 	}
 
-	if (config.c_auth_mode == AUTHMODE_HOST) {
+	if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
 
 		/* host auth mode */
 
@@ -625,7 +587,7 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
 	}
 
 #ifdef HAVE_LDAP
-	else if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) {
+	else if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
 	
 		/* LDAP auth mode */
 
@@ -633,7 +595,7 @@ int CtdlLoginExistingUser(char *authname, const char *trythisname)
 		char ldap_cn[256];
 		char ldap_dn[256];
 
-		found_user = CtdlTryUserLDAP(username, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &ldap_uid);
+		found_user = CtdlTryUserLDAP(username, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &ldap_uid, 0);
 		if (found_user != 0) {
 			return login_not_found;
 		}
@@ -709,14 +671,14 @@ void do_login(void)
 	/* If this user's name is the name of the system administrator
 	 * (as specified in setup), automatically assign access level 6.
 	 */
-	if (!strcasecmp(CCC->user.fullname, config.c_sysadm)) {
+	if (!strcasecmp(CCC->user.fullname, CtdlGetConfigStr("c_sysadm"))) {
 		CCC->user.axlevel = AxAideU;
 	}
 
 	/* If we're authenticating off the host system, automatically give
 	 * root the highest level of access.
 	 */
-	if (config.c_auth_mode == AUTHMODE_HOST) {
+	if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
 		if (CCC->user.uid == 0) {
 			CCC->user.axlevel = AxAideU;
 		}
@@ -730,7 +692,7 @@ void do_login(void)
 	 * the vCard module's login hook runs.
 	 */
 	snprintf(CCC->cs_inet_email, sizeof CCC->cs_inet_email, "%s@%s",
-		CCC->user.fullname, config.c_fqdn);
+		CCC->user.fullname, CtdlGetConfigStr("c_fqdn"));
 	convert_spaces_to_underscores(CCC->cs_inet_email);
 
 	/* Create any personal rooms required by the system.
@@ -745,7 +707,7 @@ void do_login(void)
 	PerformSessionHooks(EVT_LOGIN);
 
 	/* Enter the lobby */
-	CtdlUserGoto(config.c_baseroom, 0, 0, NULL, NULL, NULL, NULL);
+	CtdlUserGoto(CtdlGetConfigStr("c_baseroom"), 0, 0, NULL, NULL, NULL, NULL);
 }
 
 
@@ -916,10 +878,10 @@ int CtdlTryPassword(const char *password, long len)
 	}
 
 	if (CCC->is_master) {
-		code = strcmp(password, config.c_master_pass);
+		code = strcmp(password, CtdlGetConfigStr("c_master_pass"));
 	}
 
-	else if (config.c_auth_mode == AUTHMODE_HOST) {
+	else if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
 
 		/* host auth mode */
 
@@ -949,7 +911,7 @@ int CtdlTryPassword(const char *password, long len)
 	}
 
 #ifdef HAVE_LDAP
-	else if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) {
+	else if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
 
 		/* LDAP auth mode */
 
@@ -1091,7 +1053,7 @@ int internal_create_user (const char *username, long len, struct ctdluser *usbuf
 
 	usbuf->timescalled = 0;
 	usbuf->posted = 0;
-	usbuf->axlevel = config.c_initax;
+	usbuf->axlevel = CtdlGetConfigInt("c_initax");
 	usbuf->lastcall = time(NULL);
 
 	/* fetch a new user number */
@@ -1128,7 +1090,7 @@ int create_user(const char *newusername, long len, int become_user)
 	strproc(username);
 
 	
-	if (config.c_auth_mode == AUTHMODE_HOST) {
+	if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
 
 		/* host auth mode */
 
@@ -1160,8 +1122,8 @@ int create_user(const char *newusername, long len, int become_user)
 	}
 
 #ifdef HAVE_LDAP
-	if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) {
-		if (CtdlTryUserLDAP(username, NULL, 0, username, sizeof username, &uid) != 0) {
+	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);
 		}
 	}
@@ -1278,7 +1240,7 @@ int CtdlForgetThisRoom(void) {
 	visit vbuf;
 
 	/* On some systems, Admins are not allowed to forget rooms */
-	if (is_aide() && (config.c_aide_zap == 0)
+	if (is_aide() && (CtdlGetConfigInt("c_aide_zap") == 0)
 	   && ((CC->room.QRflags & QR_MAILBOX) == 0)  ) {
 		return(1);
 	}
@@ -1293,7 +1255,7 @@ int CtdlForgetThisRoom(void) {
 	CtdlPutUserLock(&CC->user);
 
 	/* Return to the Lobby, so we don't end up in an undefined room */
-	CtdlUserGoto(config.c_baseroom, 0, 0, NULL, NULL, NULL, NULL);
+	CtdlUserGoto(CtdlGetConfigStr("c_baseroom"), 0, 0, NULL, NULL, NULL, NULL);
 	return(0);
 
 }