sockaddr_un.sun_path appears to never hold anything after accept()

diff --git a/src/anet.c b/src/anet.c
index 99cda01193edef52648ed5049231000d050affe1..e7763e4c63b64ac54e6290ffbad3e9b4a710b233 100644 (file)
--- a/src/anet.c
+++ b/src/anet.c
@@ -336,16 +336,12 @@ int anetTcpAccept(char *err, int s, char *ip, int *port) {
     return fd;
 }
 
     return fd;
 }
 

-int anetUnixAccept(char *err, int s, char *path, int len) {
+int anetUnixAccept(char *err, int s) {

     int fd;
     struct sockaddr_un sa;
     socklen_t salen = sizeof(sa);
     if ((fd = anetGenericAccept(err,s,(struct sockaddr*)&sa,&salen)) == ANET_ERR)
         return ANET_ERR;
 
     int fd;
     struct sockaddr_un sa;
     socklen_t salen = sizeof(sa);
     if ((fd = anetGenericAccept(err,s,(struct sockaddr*)&sa,&salen)) == ANET_ERR)
         return ANET_ERR;
 

-    if (path) {
-        strncpy(path,sa.sun_path,len-1);
-        path[len-1] = 0;
-    }

     return fd;
 }
     return fd;
 }

diff --git a/src/anet.h b/src/anet.h
index 45a894641055750a5c3ec5d31a621affe09c5c64..bef0adcfac42ef68bdc7259e1c7785aaa47df6e0 100644 (file)
--- a/src/anet.h
+++ b/src/anet.h
@@ -44,7 +44,7 @@ int anetResolve(char *err, char *host, char *ipbuf);
 int anetTcpServer(char *err, int port, char *bindaddr);
 int anetUnixServer(char *err, char *path);
 int anetTcpAccept(char *err, int serversock, char *ip, int *port);
 int anetTcpServer(char *err, int port, char *bindaddr);
 int anetUnixServer(char *err, char *path);
 int anetTcpAccept(char *err, int serversock, char *ip, int *port);

-int anetUnixAccept(char *err, int serversock, char *path, int len);
+int anetUnixAccept(char *err, int serversock);

 int anetWrite(int fd, char *buf, int count);
 int anetNonBlock(char *err, int fd);
 int anetTcpNoDelay(char *err, int fd);
 int anetWrite(int fd, char *buf, int count);
 int anetNonBlock(char *err, int fd);
 int anetTcpNoDelay(char *err, int fd);

diff --git a/src/networking.c b/src/networking.c
index ae772c926028e9967b867d0f0e3370f8b376279a..4e93186e02549163236eef3ed0ae53a45b27c49b 100644 (file)
--- a/src/networking.c
+++ b/src/networking.c
@@ -199,12 +199,11 @@ void acceptTcpHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
 
 void acceptUnixHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
     int cfd;
 
 void acceptUnixHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
     int cfd;

-    char cpath[128];

     REDIS_NOTUSED(el);
     REDIS_NOTUSED(mask);
     REDIS_NOTUSED(privdata);
 
     REDIS_NOTUSED(el);
     REDIS_NOTUSED(mask);
     REDIS_NOTUSED(privdata);
 

-    cfd = anetUnixAccept(server.neterr, fd, cpath, sizeof(cpath));
+    cfd = anetUnixAccept(server.neterr, fd);

     if (cfd == AE_ERR) {
         redisLog(REDIS_VERBOSE,"Accepting client connection: %s", server.neterr);
         return;
     if (cfd == AE_ERR) {
         redisLog(REDIS_VERBOSE,"Accepting client connection: %s", server.neterr);
         return;