diff -Naur --exclude CVS --exclude VERSION --exclude ChangeLog old/libsemanage/src/database_direct.c new/libsemanage/src/database_direct.c
--- old/libsemanage/src/database_direct.c	2005-10-13 10:05:46.000000000 -0400
+++ new/libsemanage/src/database_direct.c	2005-10-13 10:08:32.000000000 -0400
@@ -263,6 +263,7 @@
 	dbase_direct_t* dbase) {
 
 	dbase->attached = 0;
+	handle = NULL;
 }
 
 static int dbase_direct_add (
diff -Naur --exclude CVS --exclude VERSION --exclude ChangeLog old/libsemanage/src/debug.h new/libsemanage/src/debug.h
--- old/libsemanage/src/debug.h	2005-10-13 10:05:46.000000000 -0400
+++ new/libsemanage/src/debug.h	2005-10-13 10:08:07.000000000 -0400
@@ -32,18 +32,18 @@
 #define STATUS_NODATA 1
 
 #define msg_write(handle_arg, level_arg,                   \
-	          channel_arg, func_arg, ...) {            \
+	          channel_arg, func_arg, ...) do {         \
+	                                                   \
+        if ((handle_arg)->msg_callback) {                  \
+                (handle_arg)->msg_fname = func_arg;        \
+                (handle_arg)->msg_channel = channel_arg;   \
+                (handle_arg)->msg_level = level_arg;       \
                                                            \
-        if (handle_arg->msg_callback) {                    \
-                handle_arg->msg_fname = func_arg;          \
-                handle_arg->msg_channel = channel_arg;     \
-                handle_arg->msg_level = level_arg;         \
-                                                           \
-                handle_arg->msg_callback(                  \
-                        handle_arg->msg_callback_arg,      \
+                (handle_arg)->msg_callback(                \
+                        (handle_arg)->msg_callback_arg,    \
                         handle_arg, __VA_ARGS__);          \
         }                                                  \
-}
+} while(0)
 
 #define ERR(handle, ...) \
 	msg_write(handle, SEMANAGE_MSG_ERR, "libsemanage", \
diff -Naur --exclude CVS --exclude VERSION --exclude ChangeLog old/libsepol/src/debug.h new/libsepol/src/debug.h
--- old/libsepol/src/debug.h	2005-10-13 10:05:46.000000000 -0400
+++ new/libsepol/src/debug.h	2005-10-13 10:09:55.000000000 -0400
@@ -10,18 +10,18 @@
 #define STATUS_NODATA 1
 
 #define msg_write(handle_arg, level_arg,                   \
-		  channel_arg, func_arg, ...) {            \
+		  channel_arg, func_arg, ...) do {         \
                                                            \
-        if (handle_arg->msg_callback) {                    \
-                handle_arg->msg_fname = func_arg;          \
-                handle_arg->msg_channel = channel_arg;     \
-                handle_arg->msg_level = level_arg;         \
+        if ((handle_arg)->msg_callback) {                  \
+                (handle_arg)->msg_fname = func_arg;        \
+                (handle_arg)->msg_channel = channel_arg;   \
+                (handle_arg)->msg_level = level_arg;       \
                                                            \
-                handle_arg->msg_callback(                  \
-                        handle_arg->msg_callback_arg,      \
+                (handle_arg)->msg_callback(                \
+                        (handle_arg)->msg_callback_arg,    \
                         handle_arg, __VA_ARGS__);          \
         }                                                  \
-}
+} while(0)
 
 #define ERR(handle, ...) \
 	msg_write(handle, SEPOL_MSG_ERR, "libsepol", \
@@ -48,7 +48,7 @@
 extern struct sepol_handle sepol_compat_handle;
 
 #define DEBUG(fname, ...) \
-	msg_write((&sepol_compat_handle), SEPOL_MSG_ERR, "libsepol", \
+	msg_write(&sepol_compat_handle, SEPOL_MSG_ERR, "libsepol", \
 	fname, __VA_ARGS__)
 /* End deprecated */