X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=bc7d234bfa2ec01619d8bc698dfb2841053b0eca;hp=cb504f3cce860f26eb8dd53d6c3c0a1d33424f24;hb=de25f9d0d999b2a911ecc93d19511ff437211d18;hpb=007d547044e1d93ca56fd8a61506578e26ccdcb0

diff --git a/net.c b/net.c
index cb504f3c..bc7d234b 100644
--- a/net.c
+++ b/net.c
@@ -12,21 +12,23 @@
 #include "error.h"
 
 
-/** holds information about one encrypted connection */
+/** Information about one encrypted connection. */
 struct crypt_data {
-	/** function used to decrypt received data */
+	/** Function used to decrypt received data. */
 	crypt_function *recv;
-	/** function used to encrypt data to be sent */
+	/** Function used to encrypt data to be sent. */
 	crypt_function *send;
-	/** context-dependent data, passed to \a recv() and \a send() */
+	/**
+	 * Context-dependent data (crypt keys), passed verbatim to the above
+	 * crypt functions.
+	 */
 	void *private_data;
 };
-/** array holding per fd crypt data per */
+/** Array holding per fd crypt data. */
 static struct crypt_data *crypt_data_array;
-/** current size of the crypt data array */
+/** Current size of the crypt data array. */
 static unsigned cda_size = 0;
 
-
 /**
  * activate encryption for one file descriptor
  *
@@ -394,18 +396,22 @@ int create_local_socket(const char *name, struct sockaddr_un *unix_addr,
 {
 	int fd, ret;
 
-	fd = socket(PF_UNIX, SOCK_STREAM, 0);
-	if (fd < 0)
-		return -E_SOCKET;
-//	unlink(name);
 	ret = init_unix_addr(unix_addr, name);
 	if (ret < 0)
 		return ret;
+	fd = socket(PF_UNIX, SOCK_STREAM, 0);
+	if (fd < 0)
+		return -E_SOCKET;
+	ret = -E_BIND;
 	if (bind(fd, (struct sockaddr *) unix_addr, UNIX_PATH_MAX) < 0)
-		return -E_BIND;
+		goto err;
+	ret = -E_CHMOD;
 	if (chmod(name, mode) < 0)
-		return -E_CHMOD;
+		goto err;
 	return fd;
+err:
+	close(fd);
+	return ret;
 }
 
 #ifndef HAVE_UCRED