Renamed CONNECTION_* constants to SDB_CONNECTION_*.

[sysdb.git] / src / client / sock.c

diff --git a/src/client/sock.c b/src/client/sock.c
index 042dd63bd99a353764b8176289de65f5276730f8..8602532da9eea9d4575d85d52fdc82cc34976c91 100644 (file)
--- a/src/client/sock.c
+++ b/src/client/sock.c
@@ -25,6 +25,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "client/sock.h"
 #include "utils/error.h"
 #include "utils/strbuf.h"
@@ -162,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];
@@ -175,22 +179,33 @@ 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 == SDB_CONNECTION_OK)) {
+               sdb_strbuf_destroy(buf);
+               return 0;
+       }
+
        if (status < 0) {
                char errbuf[1024];
-               sdb_client_close(client);
-               sdb_strbuf_destroy(buf);
                sdb_log(SDB_LOG_ERR, "Failed to receive server response: %s",
                                sdb_strerror(errno, errbuf, sizeof(errbuf)));
-               return (int)status;
        }
+       else if (client->eof)
+               sdb_log(SDB_LOG_ERR, "Encountered end-of-file while waiting "
+                               "for server response");
 
-       if (rstatus != CONNECTION_OK) {
-               sdb_client_close(client);
-               sdb_strbuf_destroy(buf);
+       if (rstatus == SDB_CONNECTION_ERROR) {
                sdb_log(SDB_LOG_ERR, "Access denied for user '%s'", username);
-               return -((int)rstatus);
+               status = -((int)rstatus);
        }
-       return 0;
+       else if (rstatus != SDB_CONNECTION_OK) {
+               sdb_log(SDB_LOG_ERR, "Received unsupported authentication request "
+                               "(status %d) during startup", (int)rstatus);
+               status = -((int)rstatus);
+       }
+
+       sdb_client_close(client);
+       sdb_strbuf_destroy(buf);
+       return (int)status;
 } /* sdb_client_connect */
 
 int
@@ -201,6 +216,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)
 {