X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffrontend%2Fconnection.c;h=700c84ae42af2e0793b289e82c770807df609e51;hb=2bdb80165c2e095b169c59ef18607b30f8758ec7;hp=c35d2d213bd5cee21e9d0e5d3a069f17bce45736;hpb=31a4f8af85cc4e9279677c40cbb11496409ff8f6;p=sysdb.git diff --git a/src/frontend/connection.c b/src/frontend/connection.c index c35d2d2..700c84a 100644 --- a/src/frontend/connection.c +++ b/src/frontend/connection.c @@ -47,19 +47,6 @@ #include #include -#include -#include -#include - -#ifdef HAVE_UCRED_H -# include -#endif -#ifdef HAVE_SYS_UCRED_H -# include -#endif - -#include - #include /* @@ -77,36 +64,6 @@ static bool conn_ctx_key_initialized = 0; #define CONN_FD_PREFIX "conn#" #define CONN_FD_PLACEHOLDER "XXXXXXX" -/* XXX: only supports UNIX sockets so far */ -static char * -peer(int sockfd) -{ - uid_t uid; - - struct passwd pw_entry; - struct passwd *result = NULL; - char buf[1024]; - -#ifdef SO_PEERCRED - struct ucred cred; - socklen_t len = sizeof(cred); - - if (getsockopt(sockfd, SOL_SOCKET, SO_PEERCRED, &cred, &len) - || (len != sizeof(cred))) - return NULL; - uid = cred.uid; -#else /* SO_PEERCRED */ - errno = ENOSYS; - return NULL; -#endif - - memset(&pw_entry, 0, sizeof(pw_entry)); - if (getpwuid_r(uid, &pw_entry, buf, sizeof(buf), &result) - || (! result)) - return NULL; - return strdup(result->pw_name); -} /* peer */ - static ssize_t conn_read(sdb_conn_t *conn, size_t len) { @@ -181,14 +138,7 @@ connection_init(sdb_object_t *obj, va_list ap) return -1; } - conn->username = peer(conn->fd); - if (! conn->username) { - char buf[1024]; - sdb_log(SDB_LOG_ERR, "frontend: Failed to retrieve peer for " - "connection conn#%i: %s", conn->fd, - sdb_strerror(errno, buf, sizeof(buf))); - return -1; - } + conn->username = NULL; conn->ready = 0; sdb_log(SDB_LOG_DEBUG, "frontend: Accepted connection on fd=%i",