X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ftools%2Fsysdb%2Fmain.c;h=b3a73c698e1e2507f9741b60a6692cb11ed5dd6c;hb=a9ae0d1a4c9e2992d932489c96cd63b2ce2a0c56;hp=1174fa9fa0462ddb13603456b7de2bba19a4d33e;hpb=8c58d65dec8e046ec1d8b26eb1a6d913b971e5be;p=sysdb.git

diff --git a/src/tools/sysdb/main.c b/src/tools/sysdb/main.c
index 1174fa9..b3a73c6 100644
--- a/src/tools/sysdb/main.c
+++ b/src/tools/sysdb/main.c
@@ -37,6 +37,7 @@
 #include "utils/error.h"
 #include "utils/llist.h"
 #include "utils/strbuf.h"
+#include "utils/os.h"
 
 #include <errno.h>
 
@@ -80,34 +81,6 @@
 #	define DEFAULT_SOCKET "unix:"LOCALSTATEDIR"/run/sysdbd.sock"
 #endif
 
-static const char *
-get_current_user(void)
-{
-	struct passwd pw_entry;
-	struct passwd *result = NULL;
-
-	uid_t uid;
-
-	/* needs to be static because we return a pointer into this buffer
-	 * to the caller */
-	static char buf[1024];
-
-	int status;
-
-	uid = geteuid();
-
-	memset(&pw_entry, 0, sizeof(pw_entry));
-	status = getpwuid_r(uid, &pw_entry, buf, sizeof(buf), &result);
-
-	if (status || (! result)) {
-		char errbuf[1024];
-		sdb_log(SDB_LOG_ERR, "Failed to determine current username: %s",
-				sdb_strerror(errno, errbuf, sizeof(errbuf)));
-		return NULL;
-	}
-	return result->pw_name;
-} /* get_current_user */
-
 static const char *
 get_homedir(const char *username)
 {
@@ -136,6 +109,7 @@ get_homedir(const char *username)
 static void
 exit_usage(char *name, int status)
 {
+	char *user = sdb_get_current_user();
 	printf(
 "Usage: %s <options>\n"
 
@@ -150,7 +124,8 @@ exit_usage(char *name, int status)
 "  -V        display the version number and copyright\n"
 
 "\nSysDB client "SDB_CLIENT_VERSION_STRING SDB_CLIENT_VERSION_EXTRA", "
-PACKAGE_URL"\n", basename(name), get_current_user());
+PACKAGE_URL"\n", basename(name), user);
+	free(user);
 	exit(status);
 } /* exit_usage */
 
@@ -185,7 +160,7 @@ execute_commands(sdb_client_t *client, sdb_llist_t *commands)
 	while (sdb_llist_iter_has_next(iter)) {
 		sdb_object_t *obj = sdb_llist_iter_get_next(iter);
 
-		if (sdb_client_send(client, CONNECTION_QUERY,
+		if (sdb_client_send(client, SDB_CONNECTION_QUERY,
 					(uint32_t)strlen(obj->name), obj->name) <= 0) {
 			sdb_log(SDB_LOG_ERR, "Failed to send command '%s' to server",
 					obj->name);
@@ -194,7 +169,7 @@ execute_commands(sdb_client_t *client, sdb_llist_t *commands)
 		}
 
 		/* Wait for server replies. We might get any number of log messages
-		 * but eventually see the reply to the query, which is either OK or
+		 * but eventually see the reply to the query, which is either DATA or
 		 * ERROR. */
 		while (42) {
 			status = sdb_command_print_reply(client);
@@ -203,12 +178,20 @@ execute_commands(sdb_client_t *client, sdb_llist_t *commands)
 				break;
 			}
 
-			if ((status == CONNECTION_OK) || (status == CONNECTION_ERROR))
+			if ((status == SDB_CONNECTION_DATA)
+					|| (status == SDB_CONNECTION_ERROR))
 				break;
+			if (status == SDB_CONNECTION_OK) {
+				/* pre 0.4 versions used OK instead of DATA */
+				sdb_log(SDB_LOG_WARNING, "Received unexpected OK status from "
+						"server in response to a QUERY (expected DATA); "
+						"assuming we're talking to an old server");
+				break;
+			}
 		}
 
-		if (status)
-			break;
+		if ((status != SDB_CONNECTION_OK) && (status != SDB_CONNECTION_DATA))
+			break; /* error */
 	}
 
 	sdb_llist_iter_destroy(iter);
@@ -219,7 +202,7 @@ int
 main(int argc, char **argv)
 {
 	const char *host = NULL;
-	const char *user = NULL;
+	char *user = NULL;
 
 	const char *homedir;
 	char hist_file[1024] = "";
@@ -281,20 +264,23 @@ main(int argc, char **argv)
 
 	if (! host)
 		host = DEFAULT_SOCKET;
-	if (! user) {
-		user = get_current_user();
-		if (! user)
-			exit(1);
-	}
+	if (! user)
+		user = sdb_get_current_user();
+	else
+		user = strdup(user);
+	if (! user)
+		exit(1);
 
 	input.client = sdb_client_create(host);
 	if (! input.client) {
 		sdb_log(SDB_LOG_ERR, "Failed to create client object");
+		free(user);
 		exit(1);
 	}
 	if (sdb_client_connect(input.client, user)) {
 		sdb_log(SDB_LOG_ERR, "Failed to connect to SysDBd");
 		sdb_client_destroy(input.client);
+		free(user);
 		exit(1);
 	}
 
@@ -302,11 +288,15 @@ main(int argc, char **argv)
 		int status = execute_commands(input.client, commands);
 		sdb_llist_destroy(commands);
 		sdb_client_destroy(input.client);
-		exit(status);
+		free(user);
+		if ((status != SDB_CONNECTION_OK) && (status != SDB_CONNECTION_DATA))
+			exit(1);
+		exit(0);
 	}
 
 	sdb_log(SDB_LOG_INFO, "SysDB client "SDB_CLIENT_VERSION_STRING
-			SDB_CLIENT_VERSION_EXTRA"\n");
+			SDB_CLIENT_VERSION_EXTRA" (libsysdbclient %s%s)\n",
+			sdb_client_version_string(), sdb_client_version_extra());
 
 	using_history();
 
@@ -322,11 +312,18 @@ main(int argc, char **argv)
 					hist_file, sdb_strerror(errno, errbuf, sizeof(errbuf)));
 		}
 	}
+	free(user);
 
 	input.input = sdb_strbuf_create(2048);
 	sdb_input_init(&input);
 	sdb_input_mainloop();
 
+	sdb_client_shutdown(input.client, SHUT_WR);
+	while (! sdb_client_eof(input.client)) {
+		/* wait for remaining data to arrive */
+		sdb_command_print_reply(input.client);
+	}
+
 	if (hist_file[0] != '\0') {
 		errno = 0;
 		if (write_history(hist_file)) {