                  if (r < 0) {
 Index: git/src/socket-util.c
 ===================================================================
---- git.orig/src/socket-util.c	2011-09-18 19:16:53.000000000 -0700
-+++ git/src/socket-util.c	2011-09-18 19:38:47.205597702 -0700
+--- git.orig/src/socket-util.c	2012-01-25 21:27:23.000000000 -0800
++++ git/src/socket-util.c	2012-01-25 21:59:43.897031326 -0800
 @@ -192,7 +192,7 @@
  int socket_address_parse_netlink(SocketAddress *a, const char *s) {
          int family;

 
Index: git/src/mount.c
===================================================================
--- git.orig/src/mount.c	2011-09-18 19:16:53.000000000 -0700
+++ git/src/mount.c	2011-09-18 19:38:47.215597732 -0700
@@ -24,6 +24,7 @@
 #include <mntent.h>
 #include <sys/epoll.h>

                         return -ENOMEM;
Index: git/src/tmpfiles.c
===================================================================
--- git.orig/src/tmpfiles.c	2012-01-25 21:27:23.000000000 -0800
+++ git/src/tmpfiles.c	2012-01-25 22:06:58.649052774 -0800
@@ -73,8 +73,8 @@
 typedef struct Item {
         ItemType type;
 
-        char *path;
-        char *argument;
+        char path[50];
+        char argument[50];
         uid_t uid;
         gid_t gid;
         mode_t mode;
@@ -822,7 +822,6 @@
         case CREATE_CHAR_DEVICE:
         case CREATE_BLOCK_DEVICE:
         case IGNORE_PATH:
-        case RELABEL_PATH:
         case RECURSIVE_RELABEL_PATH:
         case WRITE_FILE:
                 break;
@@ -858,8 +857,6 @@
 static void item_free(Item *i) {
         assert(i);
 
-        free(i->path);
-        free(i->argument);
         free(i);
 }
 
@@ -906,7 +903,7 @@
 
 static int parse_line(const char *fname, unsigned line, const char *buffer) {
         Item *i, *existing;
-        char *mode = NULL, *user = NULL, *group = NULL, *age = NULL;
+        char mode[50], user[50], group[50], age[50];
         char type;
         Hashmap *h;
         int r, n = -1;
@@ -923,18 +920,18 @@
 
         if (sscanf(buffer,
                    "%c "
