fix typo introduced during merge.

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

Fix typo introduced during merge.

diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h
index 777f02e8325fb065c876c3c93b2f59226725bdf3..ff8cb1b45974bbc70f5b72e19e3069141e14e984 100644 (file)
--- a/src/rx/rx_kernel.h
+++ b/src/rx/rx_kernel.h
@@ -30,7 +30,7 @@ typedef struct socket *osi_socket;
 
 extern osi_socket rxi_GetUDPSocket();
 
-#if (!defined(AFS_GLOBAL_SUNLOCK) && !defined(RX_ENABLE_LOCKS)
+#if (!defined(AFS_GLOBAL_SUNLOCK) && !defined(RX_ENABLE_LOCKS))
 #define        osi_rxSleep(a)  afs_osi_Sleep(a)
 #define        osi_rxWakeup(a) afs_osi_Wakeup(a)
 #endif

diff --git a/src/viced/callback.c b/src/viced/callback.c
index 219a3141b4b5731c8ef2ab82fc9a480320113f8d..d25c7adfc1099c43887bf17fafcf4e98d121ea8d 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -1946,7 +1946,7 @@ struct host*              host;
                        rx_DestroyConnection(conns[i] );
 
        free(addr);
-       free(cons);
+       free(conns);
 
        if ( connSuccess ) return 0;    /* success */
                else return 1;          /* failure */