* First cut at Solaris fixes. There may still be some *printf("%s", NULL)

[citadel.git] / citadel / citmail.c

diff --git a/citadel/citmail.c b/citadel/citmail.c
index 6eab7a773a482937c9af6601754a8d7bb0085d44..a484e6bd2c17467a58b1d9bf5aeb15aa2771ab1b 100644 (file)
--- a/citadel/citmail.c
+++ b/citadel/citmail.c
@@ -53,11 +53,11 @@ void timeout(int signum)
 int uds_connectsock(char *sockpath)
 {
        int s;
-       struct sockaddr_un sun;
+       struct sockaddr_un addr;
 
-       memset(&sun, 0, sizeof(sun));
-       sun.sun_family = AF_UNIX;
-       strncpy(sun.sun_path, sockpath, sizeof sun.sun_path);
+       memset(&addr, 0, sizeof(addr));
+       addr.sun_family = AF_UNIX;
+       strncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
 
        s = socket(AF_UNIX, SOCK_STREAM, 0);
        if (s < 0) {
@@ -66,7 +66,7 @@ int uds_connectsock(char *sockpath)
                exit(3);
        }
 
-       if (connect(s, (struct sockaddr *) &sun, sizeof(sun)) < 0) {
+       if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
                fprintf(stderr, "can't connect: %s\n",
                        strerror(errno));
                exit(3);