make sure the we are done with all the forwarded messages when freeing a message

src/common/forward.c

@@ -16,7 +16,7 @@
  *  any later version.
  *
  *  In addition, as a special exception, the copyright holders give permission 
- *  to link the code of portions of this program with the OpenSSL library under 
+ *  to link the code of portions of this program with the OpenSSL library under
  *  certain conditions as described in each individual source file, and 
  *  distribute linked combinations including the two. You must obey the GNU 
  *  General Public License in all respects for all of the code used other than 

src/common/slurm_protocol_api.c

@@ -1214,7 +1214,6 @@ total_return:
 		msg->data = NULL;
 		error("slurm_receive_and_forward_msgs: %s",
 		      slurm_strerror(rc));
-		rc = -1;
 	} else {
 		rc = 0;
 	}
@@ -2192,6 +2191,9 @@ extern void slurm_free_msg(slurm_msg_t * msg)
 {
 	if(msg->auth_cred)
 		(void) g_slurm_auth_destroy(msg->auth_cred);
+	/* make sure we have all the ones we sent to so we don't worry 
+	   about freing something that may be written to later */
+	forward_wait(msg);
 	if(msg->ret_list) {
 		list_destroy(msg->ret_list);
 		msg->ret_list = NULL;