Initialize a few more things to NULL.

krb5_free_data_contents checks internally if its argument needs to be
freed, so we don't have to.

diff --git a/lib/mr_auth.c b/lib/mr_auth.c
index e0f805b68755855d8cfee4ce303edd99fa3756c8..6398163c5799617c4632c200bfaf3fc391d485df 100644 (file)
--- a/lib/mr_auth.c
+++ b/lib/mr_auth.c
@@ -152,8 +152,7 @@ int mr_krb5_auth(char *prog)
  out:
   if (ccache)
     krb5_cc_close(context, ccache);
-  if (auth.data)
-    krb5_free_data_contents(context, &auth);
+  krb5_free_data_contents(context, &auth);
   if (auth_con)
     krb5_auth_con_free(context, auth_con);
 

diff --git a/server/mr_sauth.c b/server/mr_sauth.c
index 58968a3409e32b9a39da1727808e55830df8266f..fffcf41daf6836e819316ea279f9600bb69289c9 100644 (file)
--- a/server/mr_sauth.c
+++ b/server/mr_sauth.c
@@ -263,8 +263,6 @@ void do_krb5_auth(client *cl)
     krb5_free_principal(context, server);
   if (ticket)
     krb5_free_ticket(context, ticket);
-  if (auth.data)
-    krb5_free_data_contents(context, &auth);
   if (auth_con)
     krb5_auth_con_free(context, auth_con);
   return;

diff --git a/update/auth_003.c b/update/auth_003.c
index d2273896a28b1a3d4d284615564c61aa76875b91..c64ade447c876f094decf31afe948de3675548c9 100644 (file)
--- a/update/auth_003.c
+++ b/update/auth_003.c
@@ -36,10 +36,10 @@ static char qmark[] = "???";
 
 void auth_003(int conn, char *str)
 {
-  krb5_context context;
-  krb5_auth_context auth_con;
+  krb5_context context = NULL;
+  krb5_auth_context auth_con = NULL;
   krb5_data auth;
-  krb5_principal server, client;
+  krb5_principal server = NULL, client = NULL;
   krb5_ticket *ticket;
   char *p, *first, *data;
   char name[ANAME_SZ], inst[INST_SZ], realm[REALM_SZ];
@@ -48,6 +48,8 @@ void auth_003(int conn, char *str)
   long code;
   struct utsname uts;
 
+  ticket = NULL;
+
   send_ok(conn);
 
   recv_string(conn, &data, &size);
@@ -165,8 +167,7 @@ void auth_003(int conn, char *str)
     krb5_free_principal(context, server);
   if (ticket)
     krb5_free_ticket(context, ticket);
-  if (auth.data)
-    krb5_free_data_contents(context, &auth);
+  krb5_free_data_contents(context, &auth);
   if (auth_con)
     krb5_auth_con_free(context, auth_con);
   return;

diff --git a/update/client.c b/update/client.c
index e58858a22a95319885720fb3c9f82d9ebb5f2682..4733e984a3c259a9bc1b9b70255262766e5259aa 100644 (file)
--- a/update/client.c
+++ b/update/client.c
@@ -45,8 +45,7 @@ int mr_send_krb5_auth(int conn, char *host_name)
   if (response)
     {
       /* Talking to a server that doesn't do AUTH_003 */
-      if (auth.data)
-       krb5_free_data_contents(context, &auth);
+      krb5_free_data_contents(context, &auth);
       return response;
     }
   code = send_string(conn, (char *)auth.data, auth.length);
@@ -57,16 +56,14 @@ int mr_send_krb5_auth(int conn, char *host_name)
     goto out;
   if (response)
     {
-      if (auth.data)
-       krb5_free_data_contents(context, &auth);
+      krb5_free_data_contents(context, &auth);
       return response;
     }
 
   return MR_SUCCESS;
 
  out:
-  if (auth.data)
-    krb5_free_data_contents(context, &auth);
+  krb5_free_data_contents(context, &auth);
   return code;
 }
 

diff --git a/update/ticket.c b/update/ticket.c
index b2f74bf3190beedfad1a01043d846c0ac1aec54a..235197335a177f50fcadc71147cce9c3fb643641 100644 (file)
--- a/update/ticket.c
+++ b/update/ticket.c
@@ -23,13 +23,13 @@ static char realm[REALM_SZ];
 static char master[INST_SZ] = "sms";
 static char service[ANAME_SZ] = "rcmd";
 des_cblock session;
-krb5_context context;
+krb5_context context = NULL;
 
 static int get_mr_tgt(void);
 
 int get_mr_krb5_update_ticket(char *host, krb5_data auth)
 {
-  krb5_auth_context auth_con;
+  krb5_auth_context auth_con = NULL;
   krb5_ccache ccache = NULL;
   int code;