From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Mon, 14 Jul 2025 19:28:09 +0000 (+0200)
Subject: Fix a number of misc. errors and warnings.
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=e5a8fb8486766dc4fbc8f176a92e6c19d7731d12;p=doldaconnect.git

Fix a number of misc. errors and warnings.
---

diff --git a/daemon/auth-krb5.c b/daemon/auth-krb5.c
index 7b88af3..15c7a2f 100644
--- a/daemon/auth-krb5.c
+++ b/daemon/auth-krb5.c
@@ -427,37 +427,37 @@ static int opensess(struct authhandle *auth)
 	    buf = sprintf2("/tmp/krb5cc_dc_%i_XXXXXX", pwent->pw_uid);
 	    if((fd = mkstemp(buf)) < 0)
 	    {
-		free(buf);
 		flog(LOG_ERR, "could not create temporary file for ccache: %s", strerror(errno));
+		free(buf);
 		return(AUTH_ERR);
 	    }
 	    close(fd);
 	    buf2 = sprintf2("FILE:%s", buf);
 	    if((ret = krb5_cc_resolve(k5context, buf2, &data->ccache)) != 0)
 	    {
+		flog(LOG_ERR, "could not resolve ccache name \"%s\": %s", buf2, error_message(ret));
 		free(buf);
 		free(buf2);
-		flog(LOG_ERR, "could not resolve ccache name \"%s\": %s", buf2, error_message(ret));
 		return(AUTH_ERR);
 	    }
 	    setenv("KRB5CCNAME", buf2, 1);
 	    free(buf2);
 	    if((ret = krb5_cc_initialize(k5context, data->ccache, data->ticket->enc_part2->client)) != 0)
 	    {
-		free(buf);
 		flog(LOG_ERR, "could not initialize ccache: %s", error_message(ret));
+		free(buf);
 		return(AUTH_ERR);
 	    }
 	    if((ret = krb5_cc_store_cred(k5context, data->ccache, data->creds)) != 0)
 	    {
-		free(buf);
 		flog(LOG_ERR, "could not store forwarded TGT into ccache: %s", error_message(ret));
+		free(buf);
 		return(AUTH_ERR);
 	    }
 	    if(chown(buf, pwent->pw_uid, pwent->pw_gid))
 	    {
-		free(buf);
 		flog(LOG_ERR, "could not chown new ccache to %i:%i: %s", pwent->pw_uid, pwent->pw_gid, strerror(errno));
+		free(buf);
 		return(AUTH_ERR);
 	    }
 	    free(buf);
diff --git a/daemon/client.c b/daemon/client.c
index e493a88..4993871 100644
--- a/daemon/client.c
+++ b/daemon/client.c
@@ -146,7 +146,7 @@ static int conf_share(int argc, wchar_t **argv)
     return(0);
 }
 
-static void dumpsharecache(struct sharecache *node, int l)
+static void __attribute__((unused)) dumpsharecache(struct sharecache *node, int l)
 {
     int i;
     
diff --git a/daemon/fnet-dc.c b/daemon/fnet-dc.c
index 85ba9a0..0fb697e 100644
--- a/daemon/fnet-dc.c
+++ b/daemon/fnet-dc.c
@@ -1044,11 +1044,9 @@ static void cmd_myinfo(struct socket *sk, struct fnetnode *fn, char *cmd, char *
  * us. */
 static void cmd_forcemove(struct socket *sk, struct fnetnode *fn, char *cmd, char *args)
 {
-    struct dchub *hub;
     struct fnetnode *newfn;
     int freeargs;
     
-    hub = fn->data;
     if(strchr(args, ':') == NULL)
     {
 	args = strcpy(smalloc(strlen(args) + 5), args);
@@ -1388,11 +1386,9 @@ static void cmd_revconnecttome(struct socket *sk, struct fnetnode *fn, char *cmd
 
 static void cmd_getnetinfo(struct socket *sk, struct fnetnode *fn, char *cmd, char *args)
 {
-    struct dchub *hub;
     struct fnetnode *node;
     int numhubs;
     
-    hub = fn->data;
     numhubs = 0;
     for(node = fnetnodes; node != NULL; node = node->next)
     {
@@ -1524,9 +1520,7 @@ static void cmd_getpass(struct socket *sk, struct fnetnode *fn, char *cmd, char
 
 static void cmd_logedin(struct socket *sk, struct fnetnode *fn, char *cmd, char *args)
 {
-    struct dchub *hub;
     
-    hub = fn->data;
     fn->regstatus = FNNS_OP;
     hubhandleaction(sk, fn, cmd, args);
 }
diff --git a/daemon/net.c b/daemon/net.c
index e1eb5dc..ef7431d 100644
--- a/daemon/net.c
+++ b/daemon/net.c
@@ -348,10 +348,9 @@ static struct socket *mksock(int domain, int type)
 struct socket *wrapsock(int fd)
 {
     struct socket *sk;
-    struct ufd *ufd;
     
     sk = sockpair(0);
-    ufd = mkufd(fd, UFD_PIPE, sk->back);
+    mkufd(fd, UFD_PIPE, sk->back);
     sksetstate(sk, SOCK_EST);
     fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
     return(sk);
diff --git a/daemon/search.c b/daemon/search.c
index 633e07e..98c4613 100644
--- a/daemon/search.c
+++ b/daemon/search.c
@@ -407,7 +407,7 @@ static struct reinfo analyzere(wchar_t *re, wchar_t **endret, wchar_t endc)
 	{
 	    if(ret.begstr != NULL)
 	    {
-		for(i = 0; (sinf.begstr[i] != L'\0') && (ret.begstr != L'\0') && (ret.begstr[i] == sinf.begstr[i]); i++);
+		for(i = 0; (sinf.begstr[i] != L'\0') && (ret.begstr[i] != L'\0') && (ret.begstr[i] == sinf.begstr[i]); i++);
 		if(i == 0) {
 		    free(ret.begstr);
 		    ret.begstr = NULL;
diff --git a/include/doldaconnect/uilib.h b/include/doldaconnect/uilib.h
index 397c49e..5b999df 100644
--- a/include/doldaconnect/uilib.h
+++ b/include/doldaconnect/uilib.h
@@ -41,7 +41,7 @@ struct dc_intresp
     } *argv;
 };
 
-char *dc_srv_local;
+extern char *dc_srv_local;
 
 int dc_init(void);
 void dc_cleanup(void);