Merge memory hygeine branch

diff --cc disobedience/login.c
Simple merge

diff --cc lib/Makefile.am
Simple merge

diff --cc lib/client.c
index 00727ef010e78f62e3e6adbc0f771b2da9ba1f17,50f718466922f83707fd90568b5d3855fd43ec4a..2cbcfa76201324f07dc0668975b5dd5c51a98291
--- 1/lib/client.c
--- 2/lib/client.c
+++ b/lib/client.c
@@@ -505,9 -515,11 +515,11 @@@ int disorder_close(disorder_client *c) 
      }
      c->fpout = 0;
    }
+   xfree(c->ident);
    c->ident = 0;
+   xfree(c->user);
    c->user = 0;
 -  return 0;
 +  return ret;
  }
  
  /** @brief Play a track

diff --cc lib/configuration.c
Simple merge

diff --cc lib/configuration.h
index 22e107d62be9b746b379b9b551317bed28095a3a,f1794aa1c5b92dd03d316932ea544dc5c7982cc5..8255db2e6e7268c4c411bf71ab40847abd199118
--- 1/lib/configuration.h
--- 2/lib/configuration.h
+++ b/lib/configuration.h
@@@ -326,8 -320,8 +326,10 @@@ char *config_usersysconf(const struct p
  char *config_private(void);
  /* get the private config file */
  
 +int config_verify(void);
 +
+ void config_free(struct config *c);
+ 
  extern char *configfile;
  extern int config_per_user;
  

diff --cc lib/queue.h
Simple merge