X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fclient%2Fsock.c;h=533e9e31b62c16457f36ae1e844a450251c26c51;hb=13fe0f9ec3d161fab7a015054649910541d75f5e;hp=6337ee6bf8cd8bf71611a42469b55527b7b84ff8;hpb=39a45905e0b237e458b1826ff9b4fad1c4a59550;p=sysdb.git

diff --git a/src/client/sock.c b/src/client/sock.c
index 6337ee6..533e9e3 100644
--- a/src/client/sock.c
+++ b/src/client/sock.c
@@ -56,7 +56,7 @@
 struct sdb_client {
 	char *address;
 	int   fd;
-	_Bool eof;
+	bool  eof;
 };
 
 /*
@@ -166,7 +166,7 @@ sdb_client_connect(sdb_client_t *client, const char *username)
 	if (! username)
 		username = "";
 
-	status = sdb_client_send(client, CONNECTION_STARTUP,
+	status = sdb_client_send(client, SDB_CONNECTION_STARTUP,
 			(uint32_t)strlen(username), username);
 	if (status < 0) {
 		char errbuf[1024];
@@ -179,8 +179,10 @@ sdb_client_connect(sdb_client_t *client, const char *username)
 	buf = sdb_strbuf_create(64);
 	rstatus = 0;
 	status = sdb_client_recv(client, &rstatus, buf);
-	if ((status > 0) && (rstatus == CONNECTION_OK))
+	if ((status > 0) && (rstatus == SDB_CONNECTION_OK)) {
+		sdb_strbuf_destroy(buf);
 		return 0;
+	}
 
 	if (status < 0) {
 		char errbuf[1024];
@@ -191,8 +193,14 @@ sdb_client_connect(sdb_client_t *client, const char *username)
 		sdb_log(SDB_LOG_ERR, "Encountered end-of-file while waiting "
 				"for server response");
 
-	if (rstatus != CONNECTION_OK) {
-		sdb_log(SDB_LOG_ERR, "Access denied for user '%s'", username);
+	if (rstatus == SDB_CONNECTION_ERROR) {
+		sdb_log(SDB_LOG_ERR, "Access denied for user '%s': %s",
+				username, sdb_strbuf_string(buf));
+		status = -((int)rstatus);
+	}
+	else if (rstatus != SDB_CONNECTION_OK) {
+		sdb_log(SDB_LOG_ERR, "Received unsupported authentication request "
+				"(status %d) during startup", (int)rstatus);
 		status = -((int)rstatus);
 	}
 
@@ -209,6 +217,22 @@ sdb_client_sockfd(sdb_client_t *client)
 	return client->fd;
 } /* sdb_client_sockfd */
 
+int
+sdb_client_shutdown(sdb_client_t *client, int how)
+{
+	if (! client) {
+		errno = ENOTSOCK;
+		return -1;
+	}
+
+	if (client->fd < 0) {
+		errno = EBADF;
+		return -1;
+	}
+
+	return shutdown(client->fd, how);
+} /* sdb_client_shutdown */
+
 void
 sdb_client_close(sdb_client_t *client)
 {
@@ -304,7 +328,7 @@ sdb_client_recv(sdb_client_t *client,
 	return (ssize_t)total;
 } /* sdb_client_recv */
 
-_Bool
+bool
 sdb_client_eof(sdb_client_t *client)
 {
 	if ((! client) || (client->fd < 0))