X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fctdlproto%2Fserv_user.c;h=73465ab2647708275fcd3f45c3ab7ba039f2e67c;hb=9ffea7c3315046ddcea2589656c13da5f5e0c076;hp=5f8e9791bfdbcf5dca73f6db6556a22a1e2c49fb;hpb=fcec795dc7d0d125028ca1bd3a5f35b3f97b265f;p=citadel.git

diff --git a/citadel/modules/ctdlproto/serv_user.c b/citadel/modules/ctdlproto/serv_user.c
index 5f8e9791b..73465ab26 100644
--- a/citadel/modules/ctdlproto/serv_user.c
+++ b/citadel/modules/ctdlproto/serv_user.c
@@ -1,7 +1,7 @@
 /* 
  * Server functions which perform operations on user objects.
  *
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2019 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.
@@ -34,7 +34,7 @@ void cmd_user(char *cmdbuf)
 	striplt(username);
 	syslog(LOG_DEBUG, "user_ops: cmd_user(%s)", username);
 
-	a = CtdlLoginExistingUser(NULL, username);
+	a = CtdlLoginExistingUser(username);
 	switch (a) {
 	case login_already_logged_in:
 		cprintf("%d Already logged in.\n", ERROR + ALREADY_LOGGED_IN);
@@ -162,11 +162,6 @@ void cmd_setp(char *new_pw)
 		cprintf("%d Not allowed.  Use the 'passwd' command.\n", ERROR + NOT_HERE);
 		return;
 	}
-	if (CC->is_master) {
-		cprintf("%d The master prefix password cannot be changed with this command.\n",
-			ERROR + NOT_HERE);
-		return;
-	}
 
 	if (!strcasecmp(new_pw, "GENERATE_RANDOM_PASSWORD")) {
 		char random_password[17];
@@ -489,6 +484,40 @@ void cmd_vali(char *v_args)
 	cprintf("%d User '%s' validated.\n", CIT_OK, userbuf.fullname);
 }
 
+
+/*
+ * List one user (this works with cmd_list)
+ */
+void ListThisUser(char *username, void *data)
+{
+	char *searchstring;
+	struct ctdluser usbuf;
+
+	if (CtdlGetUser(&usbuf, username) != 0) {
+		return;
+	}
+
+	searchstring = (char *)data;
+	if (bmstrcasestr(usbuf.fullname, searchstring) == NULL) {
+		return;
+	}
+
+	if (usbuf.axlevel > AxDeleted) {
+		if ((CC->user.axlevel >= AxAideU)
+		    || ((usbuf.flags & US_UNLISTED) == 0)
+		    || ((CC->internal_pgm))) {
+			cprintf("%s|%d|%ld|%ld|%ld|%ld||\n",
+				usbuf.fullname,
+				usbuf.axlevel,
+				usbuf.usernum,
+				(long)usbuf.lastcall,
+				usbuf.timescalled,
+				usbuf.posted);
+		}
+	}
+}
+
+
 /* 
  *  List users (searchstring may be empty to list all users)
  */