Merge lp:~roger.light/ubuntu/saucy/mosquitto/merge-debian-1.2 into lp:ubuntu/saucy/mosquitto

[Roger Light]

Merge version 1.2 from Debian unstable.

[Daniel Holbach (dholbach)]

When I attempt the merge I get the following merge conflicts:
Text conflict in Makefile
Text conflict in client/Makefile
Text conflict in config.h
Text conflict in config.mk
Text conflict in mosquitto.conf
Text conflict in src/conf.c
Text conflict in src/read_handle_server.c
Text conflict in src/security.c

review: Needs Fixing

Unmerged revisions

8. By Roger Light on 2013-08-24

* Merge from Debian unstable. Remaining changes:
  - Install apparmor profile.
* New upstream release: http://mosquitto.org/2013/08/version-1-2-released/
  (closes: #685119).
* Bumped standards release to 3.9.4. No changes needed.
* Added mosquitto-dbg package for binary debug information.
* Added python3-mosquitto binary package.
* Use dh_python2 (and dh_python3) instead of python-support.
* mosquitto now logs to /var/log/mosquitto/ using logrotate.
* mosquitto local config should now be placed in /etc/mosquitto/conf.d/

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2013-08-23 15:09:02 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-fix-prefix.patch
-mosquitto.conf.patch
-enable-libwrap.patch
-bug-proto-number.patch
-bug-persistence-reloading.patch
-bug-acl-patterns.patch
-install-apparmor.patch

=== removed directory '.pc/bug-acl-patterns.patch'
=== removed directory '.pc/bug-acl-patterns.patch/src'
=== removed file '.pc/bug-acl-patterns.patch/src/security.c'
--- .pc/bug-acl-patterns.patch/src/security.c	2012-12-28 22:55:03 +0000
+++ .pc/bug-acl-patterns.patch/src/security.c	1970-01-01 00:00:00 +0000
@@ -1,764 +0,0 @@
-/*
-Copyright (c) 2011,2012 Roger Light <[e-mail]>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of mosquitto nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include <memory_mosq.h>
-#include <mqtt3.h>
-
-int mosquitto_security_init(mosquitto_db *db)
-{
-	int rc;
-
-#ifdef WITH_EXTERNAL_SECURITY_CHECKS
-	rc = mosquitto_unpwd_init(db);
-	if(rc){
-		_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error initialising passwords.");
-		return rc;
-	}
-
-	rc = mosquitto_acl_init(db);
-	if(rc){
-		_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error initialising ACLs.");
-		return rc;
-	}
-#else
-	/* Load username/password data if required. */
-	if(db->config->password_file){
-		rc = mqtt3_pwfile_parse(db);
-		if(rc){
-			_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error opening password file.");
-			return rc;
-		}
-	}
-
-	/* Load acl data if required. */
-	if(db->config->acl_file){
-		rc = mqtt3_aclfile_parse(db);
-		if(rc){
-			_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error opening acl file.");
-			return rc;
-		}
-	}
-#endif
-	return MOSQ_ERR_SUCCESS;
-}
-
-void mosquitto_security_cleanup(mosquitto_db *db)
-{
-	mosquitto_acl_cleanup(db);
-	mosquitto_unpwd_cleanup(db);
-}
-
-#ifndef WITH_EXTERNAL_SECURITY_CHECKS
-
-int _add_acl(struct _mosquitto_db *db, const char *user, const char *topic, int access)
-{
-	struct _mosquitto_acl_user *acl_user=NULL, *user_tail;
-	struct _mosquitto_acl *acl, *acl_root=NULL, *acl_tail=NULL;
-	char *local_topic;
-	char *token = NULL;
-	bool new_user = false;
-
-	if(!db || !topic) return MOSQ_ERR_INVAL;
-
-	local_topic = _mosquitto_strdup(topic);
-	if(!local_topic){
-		return MOSQ_ERR_NOMEM;
-	}
-
-	if(db->acl_list){
-		user_tail = db->acl_list;
-		while(user_tail){
-			if(user == NULL){
-				if(user_tail->username == NULL){
-					acl_user = user_tail;
-					break;
-				}
-			}else if(user_tail->username && !strcmp(user_tail->username, user)){
-				acl_user = user_tail;
-				break;
-			}
-			user_tail = user_tail->next;
-		}
-	}
-	if(!acl_user){
-		acl_user = _mosquitto_malloc(sizeof(struct _mosquitto_acl_user));
-		if(!acl_user){
-			_mosquitto_free(local_topic);
-			return MOSQ_ERR_NOMEM;
-		}
-		new_user = true;
-		if(user){
-			acl_user->username = _mosquitto_strdup(user);
-			if(!acl_user->username){
-				_mosquitto_free(local_topic);
-				_mosquitto_free(acl_user);
-				return MOSQ_ERR_NOMEM;
-			}
-		}else{
-			acl_user->username = NULL;
-		}
-		acl_user->next = NULL;
-		acl_user->acl = NULL;
-	}
-
-	/* Tokenise topic */
-	if(local_topic[0] == '/'){
-		acl_root = _mosquitto_malloc(sizeof(struct _mosquitto_acl));
-		if(!acl_root) return MOSQ_ERR_NOMEM;
-		acl_tail = acl_root;
-		acl_root->child = NULL;
-		acl_root->next = NULL;
-		acl_root->access = MOSQ_ACL_NONE;
-		acl_root->topic = _mosquitto_strdup("/");
-		if(!acl_root->topic) return MOSQ_ERR_NOMEM;
-
-		token = strtok(local_topic+1, "/");
-	}else{
-		token = strtok(local_topic, "/");
-	}
-
-	while(token){
-		acl = _mosquitto_malloc(sizeof(struct _mosquitto_acl));
-		if(!acl) return MOSQ_ERR_NOMEM;
-		acl->child = NULL;
-		acl->next = NULL;
-		acl->access = MOSQ_ACL_NONE;
-		acl->topic = _mosquitto_strdup(token);
-		if(!acl->topic) return MOSQ_ERR_NOMEM;
-		if(acl_root){
-			acl_tail->child = acl;
-			acl_tail = acl;
-		}else{
-			acl_root = acl;
-			acl_tail = acl;
-		}
-
-		token = strtok(NULL, "/");
-	}
-	if(acl_root){
-		acl_tail = acl_root;
-		while(acl_tail->child){
-			acl_tail = acl_tail->child;
-		}
-		acl_tail->access = access;
-	}else{
-		return MOSQ_ERR_INVAL;
-	}
-
-	/* Add acl to user acl list */
-	if(acl_user->acl){
-		acl_tail = acl_user->acl;
-		while(acl_tail->next){
-			acl_tail = acl_tail->next;
-		}
-		acl_tail->next = acl_root;
-	}else{
-		acl_user->acl = acl_root;
-	}
-
-	if(new_user){
-		/* Add to end of list */
-		if(db->acl_list){
-			user_tail = db->acl_list;
-			while(user_tail->next){
-				user_tail = user_tail->next;
-			}
-			user_tail->next = acl_user;
-		}else{
-			db->acl_list = acl_user;
-		}
-	}
-
-	_mosquitto_free(local_topic);
-	return MOSQ_ERR_SUCCESS;
-}
-
-int _add_acl_pattern(struct _mosquitto_db *db, const char *topic, int access)
-{
-	struct _mosquitto_acl *acl, *acl_root=NULL, *acl_tail=NULL;
-	char *local_topic;
-	char *token = NULL;
-
-	if(!db || !topic) return MOSQ_ERR_INVAL;
-
-	local_topic = _mosquitto_strdup(topic);
-	if(!local_topic){
-		return MOSQ_ERR_NOMEM;
-	}
-
-	/* Tokenise topic */
-	if(local_topic[0] == '/'){
-		acl_root = _mosquitto_malloc(sizeof(struct _mosquitto_acl));
-		if(!acl_root) return MOSQ_ERR_NOMEM;
-		acl_tail = acl_root;
-		acl_root->child = NULL;
-		acl_root->next = NULL;
-		acl_root->access = MOSQ_ACL_NONE;
-		acl_root->topic = _mosquitto_strdup("/");
-		if(!acl_root->topic) return MOSQ_ERR_NOMEM;
-
-		token = strtok(local_topic+1, "/");
-	}else{
-		token = strtok(local_topic, "/");
-	}
-
-	while(token){
-		acl = _mosquitto_malloc(sizeof(struct _mosquitto_acl));
-		if(!acl) return MOSQ_ERR_NOMEM;
-		acl->child = NULL;
-		acl->next = NULL;
-		acl->access = MOSQ_ACL_NONE;
-		acl->topic = _mosquitto_strdup(token);
-		if(!acl->topic) return MOSQ_ERR_NOMEM;
-		if(acl_root){
-			acl_tail->child = acl;
-			acl_tail = acl;
-		}else{
-			acl_root = acl;
-			acl_tail = acl;
-		}
-
-		token = strtok(NULL, "/");
-	}
-
-	if(acl_root){
-		acl_tail = acl_root;
-		while(acl_tail->child){
-			acl_tail = acl_tail->child;
-		}
-		acl_tail->access = access;
-
-		if(db->acl_patterns){
-			acl_tail = db->acl_patterns;
-			while(acl_tail->next){
-				acl_tail = acl_tail->next;
-			}
-			acl_tail->next = acl_root;
-		}else{
-			db->acl_patterns = acl_root;
-		}
-	}else{
-		return MOSQ_ERR_INVAL;
-	}
-
-	_mosquitto_free(local_topic);
-	return MOSQ_ERR_SUCCESS;
-}
-
-int mosquitto_acl_check(struct _mosquitto_db *db, struct mosquitto *context, const char *topic, int access)
-{
-	char *local_topic;
-	char *token;
-	struct _mosquitto_acl *acl_root, *acl_tail;
-
-	if(!db || !context || !topic) return MOSQ_ERR_INVAL;
-	if(!db->acl_list) return MOSQ_ERR_SUCCESS;
-	if(!context->acl_list && !db->acl_patterns) return MOSQ_ERR_ACL_DENIED;
-
-	if(context->acl_list){
-		acl_root = context->acl_list->acl;
-	}else{
-		acl_root = NULL;
-	}
-
-	/* Loop through all ACLs for this client. */
-	while(acl_root){
-		local_topic = _mosquitto_strdup(topic);
-		if(!local_topic) return MOSQ_ERR_NOMEM;
-
-		acl_tail = acl_root;
-
-		if(local_topic[0] == '/'){
-			if(strcmp(acl_tail->topic, "/")){
-				acl_root = acl_root->next;
-				continue;
-			}
-			acl_tail = acl_tail->child;
-		}
-
-		token = strtok(local_topic, "/");
-		/* Loop through the topic looking for matches to this ACL. */
-		while(token){
-			if(acl_tail){
-				if(!strcmp(acl_tail->topic, "#") && acl_tail->child == NULL){
-					/* We have a match */
-					if(access & acl_tail->access){
-						/* And access is allowed. */
-						_mosquitto_free(local_topic);
-						return MOSQ_ERR_SUCCESS;
-					}else{
-						break;
-					}
-				}else if(!strcmp(acl_tail->topic, token) || !strcmp(acl_tail->topic, "+")){
-					token = strtok(NULL, "/");
-					if(!token && acl_tail->child == NULL){
-						/* We have a match */
-						if(access & acl_tail->access){
-							/* And access is allowed. */
-							_mosquitto_free(local_topic);
-							return MOSQ_ERR_SUCCESS;
-						}else{
-							break;
-						}
-					}
-				}else{
-					break;
-				}
-				acl_tail = acl_tail->child;
-			}else{
-				break;
-			}
-		}
-		_mosquitto_free(local_topic);
-
-		acl_root = acl_root->next;
-	}
-
-	acl_root = db->acl_patterns;
-	/* Loop through all pattern ACLs. */
-	while(acl_root){
-		local_topic = _mosquitto_strdup(topic);
-		if(!local_topic) return MOSQ_ERR_NOMEM;
-
-		acl_tail = acl_root;
-
-		if(local_topic[0] == '/'){
-			if(strcmp(acl_tail->topic, "/")){
-				acl_root = acl_root->next;
-				continue;
-			}
-			acl_tail = acl_tail->child;
-		}
-
-		token = strtok(local_topic, "/");
-		/* Loop through the topic looking for matches to this ACL. */
-		while(token){
-			if(acl_tail){
-				if(!strcmp(acl_tail->topic, "#") && acl_tail->child == NULL){
-					/* We have a match */
-					if(access & acl_tail->access){
-						/* And access is allowed. */
-						_mosquitto_free(local_topic);
-						return MOSQ_ERR_SUCCESS;
-					}else{
-						break;
-					}
-				}else if(!strcmp(acl_tail->topic, "%c")){
-					if(!context->id || strcmp(token, context->id)){
-						/* No access */
-						break;
-					}
-					token = strtok(NULL, "/");
-					if(!token && acl_tail->child == NULL){
-						/* We have a match */
-						if(access & acl_tail->access){
-							/* And access is allowed. */
-							_mosquitto_free(local_topic);
-							return MOSQ_ERR_SUCCESS;
-						}else{
-							break;
-						}
-					}
-				}else if(!strcmp(acl_tail->topic, "%u")){
-					if(!context->username || strcmp(token, context->username)){
-						/* No access */
-						break;
-					}
-					token = strtok(NULL, "/");
-					if(!token && acl_tail->child == NULL){
-						/* We have a match */
-						if(access & acl_tail->access){
-							/* And access is allowed. */
-							_mosquitto_free(local_topic);
-							return MOSQ_ERR_SUCCESS;
-						}else{
-							break;
-						}
-					}
-				}else if(!strcmp(acl_tail->topic, token) || !strcmp(acl_tail->topic, "+")){
-					token = strtok(NULL, "/");
-					if(!token && acl_tail->child == NULL){
-						/* We have a match */
-						if(access & acl_tail->access){
-							/* And access is allowed. */
-							_mosquitto_free(local_topic);
-							return MOSQ_ERR_SUCCESS;
-						}else{
-							break;
-						}
-					}
-				}else{
-					break;
-				}
-				acl_tail = acl_tail->child;
-			}else{
-				break;
-			}
-		}
-		_mosquitto_free(local_topic);
-
-		acl_root = acl_root->next;
-	}
-
-	return MOSQ_ERR_ACL_DENIED;
-}
-
-int mqtt3_aclfile_parse(struct _mosquitto_db *db)
-{
-	FILE *aclfile;
-	char buf[1024];
-	char *token;
-	char *user = NULL;
-	char *topic;
-	char *access_s;
-	int access;
-	int rc;
-	int slen;
-	int topic_pattern;
-
-	if(!db || !db->config) return MOSQ_ERR_INVAL;
-	if(!db->config->acl_file) return MOSQ_ERR_SUCCESS;
-
-	aclfile = fopen(db->config->acl_file, "rt");
-	if(!aclfile) return 1;
-
-	// topic [read|write] <topic> 
-	// user <user>
-
-	while(fgets(buf, 1024, aclfile)){
-		slen = strlen(buf);
-		while(slen > 0 && (buf[slen-1] == 10 || buf[slen-1] == 13)){
-			buf[slen-1] = '\0';
-			slen = strlen(buf);
-		}
-		token = strtok(buf, " ");
-		if(token){
-			if(!strcmp(token, "topic") || !strcmp(token, "pattern")){
-				if(!strcmp(token, "topic")){
-					topic_pattern = 0;
-				}else{
-					topic_pattern = 1;
-				}
-
-				access_s = strtok(NULL, " ");
-				if(!access_s){
-					_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty topic in acl_file.");
-					if(user) _mosquitto_free(user);
-					fclose(aclfile);
-					return MOSQ_ERR_INVAL;
-				}
-				token = strtok(NULL, " ");
-				if(token){
-					topic = token;
-				}else{
-					topic = access_s;
-					access_s = NULL;
-				}
-				if(access_s){
-					if(!strcmp(access_s, "read")){
-						access = MOSQ_ACL_READ;
-					}else if(!strcmp(access_s, "write")){
-						access = MOSQ_ACL_WRITE;
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty invalid topic access type in acl_file.");
-						if(user) _mosquitto_free(user);
-						fclose(aclfile);
-						return MOSQ_ERR_INVAL;
-					}
-				}else{
-					access = MOSQ_ACL_READ | MOSQ_ACL_WRITE;
-				}
-				if(topic_pattern == 0){
-					rc = _add_acl(db, user, topic, access);
-				}else{
-					rc = _add_acl_pattern(db, topic, access);
-				}
-				if(rc) return rc;
-			}else if(!strcmp(token, "user")){
-				token = strtok(NULL, " ");
-				if(token){
-					if(user) _mosquitto_free(user);
-					user = _mosquitto_strdup(token);
-					if(!user){
-						fclose(aclfile);
-						return MOSQ_ERR_NOMEM;
-					}
-				}else{
-					_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Missing username in acl_file.");
-					if(user) _mosquitto_free(user);
-					fclose(aclfile);
-					return 1;
-				}
-			}
-		}
-	}
-
-	if(user) _mosquitto_free(user);
-	fclose(aclfile);
-
-	return MOSQ_ERR_SUCCESS;
-}
-
-static void _free_acl(struct _mosquitto_acl *acl)
-{
-	if(!acl) return;
-
-	if(acl->child){
-		_free_acl(acl->child);
-	}
-	if(acl->next){
-		_free_acl(acl->next);
-	}
-	if(acl->topic){
-		_mosquitto_free(acl->topic);
-	}
-	_mosquitto_free(acl);
-}
-
-void mosquitto_acl_cleanup(struct _mosquitto_db *db)
-{
-	int i;
-	struct _mosquitto_acl_user *user_tail;
-
-	if(!db || !db->acl_list) return;
-
-	/* As we're freeing ACLs, we must clear context->acl_list to ensure no
-	 * invalid memory accesses take place later.
-	 * This *requires* the ACLs to be reapplied after mosquitto_acl_cleanup()
-	 * is called if we are reloading the config. If this is not done, all 
-	 * access will be denied to currently connected clients.
-	 */
-	if(db->contexts){
-		for(i=0; i<db->context_count; i++){
-			if(db->contexts[i] && db->contexts[i]->acl_list){
-				db->contexts[i]->acl_list = NULL;
-			}
-		}
-	}
-
-	while(db->acl_list){
-		user_tail = db->acl_list->next;
-
-		_free_acl(db->acl_list->acl);
-		if(db->acl_list->username){
-			_mosquitto_free(db->acl_list->username);
-		}
-		_mosquitto_free(db->acl_list);
-		
-		db->acl_list = user_tail;
-	}
-
-	if(db->acl_patterns){
-		_free_acl(db->acl_patterns);
-	}
-}
-
-int mqtt3_pwfile_parse(struct _mosquitto_db *db)
-{
-	FILE *pwfile;
-	struct _mosquitto_unpwd *unpwd;
-	char buf[256];
-	char *username, *password;
-	int len;
-
-	if(!db || !db->config) return MOSQ_ERR_INVAL;
-
-	if(!db->config->password_file) return MOSQ_ERR_SUCCESS;
-
-	pwfile = fopen(db->config->password_file, "rt");
-	if(!pwfile) return 1;
-
-	while(!feof(pwfile)){
-		if(fgets(buf, 256, pwfile)){
-			username = strtok(buf, ":");
-			if(username){
-				unpwd = _mosquitto_calloc(1, sizeof(struct _mosquitto_unpwd));
-				if(!unpwd) return MOSQ_ERR_NOMEM;
-				unpwd->username = _mosquitto_strdup(username);
-				if(!unpwd->username) return MOSQ_ERR_NOMEM;
-				len = strlen(unpwd->username);
-				while(unpwd->username[len-1] == 10 || unpwd->username[len-1] == 13){
-					unpwd->username[len-1] = '\0';
-					len = strlen(unpwd->username);
-				}
-				password = strtok(NULL, ":");
-				if(password){
-					unpwd->password = _mosquitto_strdup(password);
-					if(!unpwd->password) return MOSQ_ERR_NOMEM;
-					len = strlen(unpwd->password);
-					while(unpwd->password[len-1] == 10 || unpwd->password[len-1] == 13){
-						unpwd->password[len-1] = '\0';
-						len = strlen(unpwd->password);
-					}
-				}
-				unpwd->next = db->unpwd;
-				db->unpwd = unpwd;
-			}
-		}
-	}
-	fclose(pwfile);
-
-	return MOSQ_ERR_SUCCESS;
-}
-
-int mosquitto_unpwd_check(struct _mosquitto_db *db, const char *username, const char *password)
-{
-	struct _mosquitto_unpwd *tail;
-
-	if(!db || !username) return MOSQ_ERR_INVAL;
-	if(!db->unpwd) return MOSQ_ERR_SUCCESS;
-
-	tail = db->unpwd;
-	while(tail){
-		if(!strcmp(tail->username, username)){
-			if(tail->password){
-				if(password){
-					if(!strcmp(tail->password, password)){
-						return MOSQ_ERR_SUCCESS;
-					}
-				}else{
-					return MOSQ_ERR_AUTH;
-				}
-			}else{
-				return MOSQ_ERR_SUCCESS;
-			}
-		}
-		tail = tail->next;
-	}
-
-	return MOSQ_ERR_AUTH;
-}
-
-int mosquitto_unpwd_cleanup(struct _mosquitto_db *db)
-{
-	struct _mosquitto_unpwd *tail;
-
-	if(!db) return MOSQ_ERR_INVAL;
-
-	while(db->unpwd){
-		tail = db->unpwd->next;
-		if(db->unpwd->password) _mosquitto_free(db->unpwd->password);
-		if(db->unpwd->username) _mosquitto_free(db->unpwd->username);
-		_mosquitto_free(db->unpwd);
-		db->unpwd = tail;
-	}
-
-	return MOSQ_ERR_SUCCESS;
-}
-
-/* Apply security settings after a reload.
- * Includes:
- * - Disconnecting anonymous users if appropriate
- * - Disconnecting users with invalid passwords
- * - Reapplying ACLs
- */
-int mosquitto_security_apply(struct _mosquitto_db *db)
-{
-	struct _mosquitto_acl_user *acl_user_tail;
-	struct _mosquitto_unpwd *unpwd_tail;
-	bool allow_anonymous;
-	int i;
-	bool unpwd_ok;
-
-	if(!db) return MOSQ_ERR_INVAL;
-
-	allow_anonymous = db->config->allow_anonymous;
-	
-	if(db->contexts){
-		for(i=0; i<db->context_count; i++){
-			if(db->contexts[i]){
-				/* Check for anonymous clients when allow_anonymous is false */
-				if(!allow_anonymous && !db->contexts[i]->username){
-					db->contexts[i]->state = mosq_cs_disconnecting;
-					_mosquitto_socket_close(db->contexts[i]);
-					continue;
-				}
-				/* Check for connected clients that are no longer authorised */
-				if(db->unpwd && db->contexts[i]->username){
-					unpwd_ok = false;
-					unpwd_tail = db->unpwd;
-					while(unpwd_tail){
-						if(!strcmp(db->contexts[i]->username, unpwd_tail->username)){
-							if(unpwd_tail->password){
-								if(!db->contexts[i]->password 
-										|| strcmp(db->contexts[i]->password, unpwd_tail->password)){
-
-									/* Non matching password to username. */
-									db->contexts[i]->state = mosq_cs_disconnecting;
-									_mosquitto_socket_close(db->contexts[i]);
-									continue;
-								}else{
-									/* Username matches, password matches. */
-									unpwd_ok = true;
-								}
-							}else{
-								/* Username matches, password not in password file. */
-								unpwd_ok = true;
-							}
-						}
-						unpwd_tail = unpwd_tail->next;
-					}
-					if(!unpwd_ok){
-						db->contexts[i]->state = mosq_cs_disconnecting;
-						_mosquitto_socket_close(db->contexts[i]);
-						continue;
-					}
-				}
-				/* Check for ACLs and apply to user. */
-				if(db->acl_list){
-  					acl_user_tail = db->acl_list;
-					while(acl_user_tail){
-						if(acl_user_tail->username){
-							if(db->contexts[i]->username){
-								if(!strcmp(acl_user_tail->username, db->contexts[i]->username)){
-									db->contexts[i]->acl_list = acl_user_tail;
-									break;
-								}
-							}
-						}else{
-							if(!db->contexts[i]->username){
-								db->contexts[i]->acl_list = acl_user_tail;
-								break;
-							}
-						}
-						acl_user_tail = acl_user_tail->next;
-					}
-				}
-			}
-		}
-	}
-	return MOSQ_ERR_SUCCESS;
-}
-
-#endif

=== removed directory '.pc/bug-persistence-reloading.patch'
=== removed directory '.pc/bug-persistence-reloading.patch/src'
=== removed file '.pc/bug-persistence-reloading.patch/src/conf.c'
--- .pc/bug-persistence-reloading.patch/src/conf.c	2012-12-28 22:55:03 +0000
+++ .pc/bug-persistence-reloading.patch/src/conf.c	1970-01-01 00:00:00 +0000
@@ -1,917 +0,0 @@
-/*
-Copyright (c) 2009-2012 Roger Light <[e-mail]>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of mosquitto nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <config.h>
-
-#include <mqtt3.h>
-#include <memory_mosq.h>
-
-static int _conf_parse_bool(char **token, const char *name, bool *value);
-static int _conf_parse_int(char **token, const char *name, int *value);
-static int _conf_parse_string(char **token, const char *name, char **value);
-
-static void _config_init_reload(mqtt3_config *config)
-{
-	/* Set defaults */
-	if(config->acl_file) _mosquitto_free(config->acl_file);
-	config->acl_file = NULL;
-	config->allow_anonymous = true;
-	config->autosave_interval = 1800;
-	if(config->clientid_prefixes) _mosquitto_free(config->clientid_prefixes);
-	config->connection_messages = true;
-	config->clientid_prefixes = NULL;
-#ifndef WIN32
-	config->log_dest = MQTT3_LOG_STDERR;
-	config->log_type = MOSQ_LOG_ERR | MOSQ_LOG_WARNING | MOSQ_LOG_NOTICE | MOSQ_LOG_INFO;
-#else
-	config->log_dest = MQTT3_LOG_SYSLOG;
-	config->log_type = MOSQ_LOG_ERR | MOSQ_LOG_WARNING;
-#endif
-	config->log_timestamp = true;
-	if(config->password_file) _mosquitto_free(config->password_file);
-	config->password_file = NULL;
-	config->persistence = false;
-	if(config->persistence_location) _mosquitto_free(config->persistence_location);
-	config->persistence_location = NULL;
-	if(config->persistence_file) _mosquitto_free(config->persistence_file);
-	config->persistence_file = NULL;
-	config->retry_interval = 20;
-	config->store_clean_interval = 10;
-	config->sys_interval = 10;
-#ifdef WITH_EXTERNAL_SECURITY_CHECKS
-	if(config->db_host) _mosquitto_free(config->db_host);
-	config->db_host = NULL;
-	config->db_port = 0;
-	if(config->db_name) _mosquitto_free(config->db_name);
-	config->db_name = NULL;
-	if(config->db_username) _mosquitto_free(config->db_username);
-	config->db_username = NULL;
-	if(config->db_password) _mosquitto_free(config->db_password);
-	config->db_password = NULL;
-#endif
-}
-
-void mqtt3_config_init(mqtt3_config *config)
-{
-	memset(config, 0, sizeof(mqtt3_config));
-	_config_init_reload(config);
-	config->config_file = NULL;
-	config->daemon = false;
-	config->default_listener.host = NULL;
-	config->default_listener.port = 0;
-	config->default_listener.max_connections = -1;
-	config->default_listener.mount_point = NULL;
-	config->default_listener.socks = NULL;
-	config->default_listener.sock_count = 0;
-	config->default_listener.client_count = 0;
-	config->listeners = NULL;
-	config->listener_count = 0;
-	config->pid_file = NULL;
-	config->user = NULL;
-#ifdef WITH_BRIDGE
-	config->bridges = NULL;
-	config->bridge_count = 0;
-#endif
-}
-
-void mqtt3_config_cleanup(mqtt3_config *config)
-{
-	int i, j;
-
-	if(config->acl_file) _mosquitto_free(config->acl_file);
-	if(config->clientid_prefixes) _mosquitto_free(config->clientid_prefixes);
-	if(config->config_file) _mosquitto_free(config->config_file);
-	if(config->password_file) _mosquitto_free(config->password_file);
-	if(config->persistence_location) _mosquitto_free(config->persistence_location);
-	if(config->persistence_file) _mosquitto_free(config->persistence_file);
-	if(config->persistence_filepath) _mosquitto_free(config->persistence_filepath);
-	if(config->listeners){
-		for(i=0; i<config->listener_count; i++){
-			if(config->listeners[i].host) _mosquitto_free(config->listeners[i].host);
-			if(config->listeners[i].mount_point) _mosquitto_free(config->listeners[i].mount_point);
-			if(config->listeners[i].socks) _mosquitto_free(config->listeners[i].socks);
-		}
-		_mosquitto_free(config->listeners);
-	}
-#ifdef WITH_BRIDGE
-	if(config->bridges){
-		for(i=0; i<config->bridge_count; i++){
-			if(config->bridges[i].name) _mosquitto_free(config->bridges[i].name);
-			if(config->bridges[i].address) _mosquitto_free(config->bridges[i].address);
-			if(config->bridges[i].clientid) _mosquitto_free(config->bridges[i].clientid);
-			if(config->bridges[i].username) _mosquitto_free(config->bridges[i].username);
-			if(config->bridges[i].password) _mosquitto_free(config->bridges[i].password);
-			if(config->bridges[i].topics){
-				for(j=0; j<config->bridges[i].topic_count; j++){
-					if(config->bridges[i].topics[j].topic) _mosquitto_free(config->bridges[i].topics[j].topic);
-				}
-				_mosquitto_free(config->bridges[i].topics);
-			}
-		}
-		_mosquitto_free(config->bridges);
-	}
-#endif
-#ifdef WITH_EXTERNAL_SECURITY_CHECKS
-	if(config->db_host) _mosquitto_free(config->db_host);
-	if(config->db_name) _mosquitto_free(config->db_name);
-	if(config->db_username) _mosquitto_free(config->db_username);
-	if(config->db_password) _mosquitto_free(config->db_password);
-#endif
-}
-
-static void print_usage(void)
-{
-	printf("mosquitto is an MQTT v3.1 broker.\n\n");
-	printf("Usage: mosquitto [-c config_file] [-d] [-h] [-p port]\n\n");
-	printf(" -c : specify the broker config file.\n");
-	printf(" -d : put the broker into the background after starting.\n");
-	printf(" -h : display this help.\n");
-	printf(" -p : start the broker listening on the specified port.\n");
-	printf("      Not recommended in conjunction with the -c option.\n");
-	printf("\nSee http://mosquitto.org/ for more information.\n\n");
-}
-
-int mqtt3_config_parse_args(mqtt3_config *config, int argc, char *argv[])
-{
-	int i;
-	int port_tmp;
-
-	for(i=1; i<argc; i++){
-		if(!strcmp(argv[i], "-c") || !strcmp(argv[i], "--config-file")){
-			if(i<argc-1){
-				config->config_file = _mosquitto_strdup(argv[i+1]);
-				if(!config->config_file){
-					_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
-					return MOSQ_ERR_NOMEM;
-				}
-
-				if(mqtt3_config_read(config, false)){
-					_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Unable to open configuration file.");
-					return MOSQ_ERR_INVAL;
-				}
-			}else{
-				_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: -c argument given, but no config file specified.");
-				return MOSQ_ERR_INVAL;
-			}
-			i++;
-		}else if(!strcmp(argv[i], "-d") || !strcmp(argv[i], "--daemon")){
-			config->daemon = true;
-		}else if(!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")){
-			print_usage();
-			return MOSQ_ERR_INVAL;
-		}else if(!strcmp(argv[i], "-p") || !strcmp(argv[i], "--port")){
-			if(i<argc-1){
-				port_tmp = atoi(argv[i+1]);
-				if(port_tmp<1 || port_tmp>65535){
-					_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid port specified (%d).", port_tmp);
-					return MOSQ_ERR_INVAL;
-				}else{
-					if(config->default_listener.port){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Default listener port specified multiple times. Only the latest will be used.");
-					}
-					config->default_listener.port = port_tmp;
-				}
-			}else{
-				_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: -p argument given, but no port specified.");
-				return MOSQ_ERR_INVAL;
-			}
-			i++;
-		}else{
-			fprintf(stderr, "Error: Unknown option '%s'.\n",argv[i]);
-			print_usage();
-			return MOSQ_ERR_INVAL;
-		}
-	}
-
-	if(config->listener_count == 0 || config->default_listener.host || config->default_listener.port){
-		config->listener_count++;
-		config->listeners = _mosquitto_realloc(config->listeners, sizeof(struct _mqtt3_listener)*config->listener_count);
-		if(!config->listeners){
-			_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
-			return MOSQ_ERR_NOMEM;
-		}
-		if(config->default_listener.port){
-			config->listeners[config->listener_count-1].port = config->default_listener.port;
-		}else{
-			config->listeners[config->listener_count-1].port = 1883;
-		}
-		if(config->default_listener.host){
-			config->listeners[config->listener_count-1].host = config->default_listener.host;
-		}else{
-			config->listeners[config->listener_count-1].host = NULL;
-		}
-		if(config->default_listener.mount_point){
-			config->listeners[config->listener_count-1].mount_point = config->default_listener.host;
-		}else{
-			config->listeners[config->listener_count-1].mount_point = NULL;
-		}
-		config->listeners[config->listener_count-1].max_connections = config->default_listener.max_connections;
-		config->listeners[config->listener_count-1].client_count = 0;
-		config->listeners[config->listener_count-1].socks = NULL;
-		config->listeners[config->listener_count-1].sock_count = 0;
-		config->listeners[config->listener_count-1].client_count = 0;
-	}
-
-	return MOSQ_ERR_SUCCESS;
-}
-
-int mqtt3_config_read(mqtt3_config *config, bool reload)
-{
-	int rc = MOSQ_ERR_SUCCESS;
-	FILE *fptr = NULL;
-	char buf[1024];
-	char *token;
-	int port_tmp;
-	int log_dest = MQTT3_LOG_NONE;
-	int log_dest_set = 0;
-	int log_type = MOSQ_LOG_NONE;
-	int log_type_set = 0;
-	int i;
-#ifdef WITH_BRIDGE
-	struct _mqtt3_bridge *cur_bridge = NULL;
-#endif
-	int max_inflight_messages = 20;
-	int max_queued_messages = 100;
-	
-	if(!config->config_file) return 0;
-
-	if(reload){
-		/* Re-initialise appropriate config vars to default for reload. */
-		_config_init_reload(config);
-	}
-
-	fptr = fopen(config->config_file, "rt");
-	if(!fptr) return 1;
-
-	while(fgets(buf, 1024, fptr)){
-		if(buf[0] != '#' && buf[0] != 10 && buf[0] != 13){
-			while(buf[strlen(buf)-1] == 10 || buf[strlen(buf)-1] == 13){
-				buf[strlen(buf)-1] = 0;
-			}
-			token = strtok(buf, " ");
-			if(token){
-				if(!strcmp(token, "acl_file")){
-					if(reload){
-						if(config->acl_file){
-							_mosquitto_free(config->acl_file);
-							config->acl_file = NULL;
-						}
-					}
-					if(_conf_parse_string(&token, "acl_file", &config->acl_file)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "address") || !strcmp(token, "addresses")){
-#ifdef WITH_BRIDGE
-					if(reload) continue; // FIXME
-					if(!cur_bridge || cur_bridge->address){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-					token = strtok(NULL, " ");
-					if(token){
-						token = strtok(token, ":");
-						if(token){
-							cur_bridge->address = _mosquitto_strdup(token);
-							if(!cur_bridge->address){
-								_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
-								return MOSQ_ERR_NOMEM;
-							}
-							token = strtok(NULL, ":");
-							if(token){
-								port_tmp = atoi(token);
-								if(port_tmp < 1 || port_tmp > 65535){
-									_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid port value (%d).", port_tmp);
-									return MOSQ_ERR_INVAL;
-								}
-								cur_bridge->port = port_tmp;
-							}else{
-								cur_bridge->port = 1883;
-							}
-						}
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty address value in configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-#else
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge support not available.");
-#endif
-				}else if(!strcmp(token, "allow_anonymous")){
-					if(_conf_parse_bool(&token, "allow_anonymous", &config->allow_anonymous)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "autosave_interval")){
-					if(_conf_parse_int(&token, "autosave_interval", &config->autosave_interval)) return MOSQ_ERR_INVAL;
-					if(config->autosave_interval < 0) config->autosave_interval = 0;
-				}else if(!strcmp(token, "bind_address")){
-					if(reload) continue; // Listener not valid for reloading.
-					if(_conf_parse_string(&token, "default listener bind_address", &config->default_listener.host)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "clientid")){
-#ifdef WITH_BRIDGE
-					if(reload) continue; // FIXME
-					if(!cur_bridge){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-					token = strtok(NULL, " ");
-					if(token){
-						if(cur_bridge->clientid){
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Duplicate clientid value in bridge configuration.");
-							return MOSQ_ERR_INVAL;
-						}
-						cur_bridge->clientid = _mosquitto_strdup(token);
-						if(!cur_bridge->clientid){
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory");
-							return MOSQ_ERR_NOMEM;
-						}
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty clientid value in configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-#else
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge support not available.");
-#endif
-				}else if(!strcmp(token, "cleansession")){
-#ifdef WITH_BRIDGE
-					if(reload) continue; // FIXME
-					if(!cur_bridge){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-					if(_conf_parse_bool(&token, "cleansession", &cur_bridge->clean_session)) return MOSQ_ERR_INVAL;
-#else
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge support not available.");
-#endif
-				}else if(!strcmp(token, "clientid_prefixes")){
-					if(reload){
-						if(config->clientid_prefixes){
-							_mosquitto_free(config->clientid_prefixes);
-							config->clientid_prefixes = NULL;
-						}
-					}
-					if(_conf_parse_string(&token, "clientid_prefixes", &config->clientid_prefixes)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "connection")){
-#ifdef WITH_BRIDGE
-					if(reload) continue; // FIXME
-					token = strtok(NULL, " ");
-					if(token){
-						config->bridge_count++;
-						config->bridges = _mosquitto_realloc(config->bridges, config->bridge_count*sizeof(struct _mqtt3_bridge));
-						if(!config->bridges){
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
-							return MOSQ_ERR_NOMEM;
-						}
-						cur_bridge = &(config->bridges[config->bridge_count-1]);
-						cur_bridge->name = _mosquitto_strdup(token);
-						cur_bridge->address = NULL;
-						cur_bridge->keepalive = 60;
-						cur_bridge->clean_session = false;
-						cur_bridge->clientid = NULL;
-						cur_bridge->port = 0;
-						cur_bridge->topics = NULL;
-						cur_bridge->topic_count = 0;
-						cur_bridge->restart_t = 0;
-						cur_bridge->username = NULL;
-						cur_bridge->password = NULL;
-						cur_bridge->notifications = true;
-						cur_bridge->start_type = bst_automatic;
-						cur_bridge->idle_timeout = 60;
-						cur_bridge->threshold = 10;
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty connection value in configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-#else
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge support not available.");
-#endif
-				}else if(!strcmp(token, "connection_messages")){
-					if(_conf_parse_bool(&token, token, &config->connection_messages)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "idle_timeout")){
-#ifdef WITH_BRIDGE
-					if(reload) continue; // FIXME
-					if(!cur_bridge){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-					if(_conf_parse_int(&token, "idle_timeout", &cur_bridge->idle_timeout)) return MOSQ_ERR_INVAL;
-					if(cur_bridge->idle_timeout < 1){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "idle_timeout interval too low, using 1 second.");
-						cur_bridge->idle_timeout = 1;
-					}
-#else
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge support not available.");
-#endif
-				}else if(!strcmp(token, "keepalive_interval")){
-#ifdef WITH_BRIDGE
-					if(reload) continue; // FIXME
-					if(!cur_bridge){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-					if(_conf_parse_int(&token, "keepalive_interval", &cur_bridge->keepalive)) return MOSQ_ERR_INVAL;
-					if(cur_bridge->keepalive < 5){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "keepalive interval too low, using 5 seconds.");
-						cur_bridge->keepalive = 5;
-					}
-#else
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge support not available.");
-#endif
-				}else if(!strcmp(token, "listener")){
-					if(reload) continue; // Listeners not valid for reloading.
-					token = strtok(NULL, " ");
-					if(token){
-						config->listener_count++;
-						config->listeners = _mosquitto_realloc(config->listeners, sizeof(struct _mqtt3_listener)*config->listener_count);
-						if(!config->listeners){
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
-							return MOSQ_ERR_NOMEM;
-						}
-						port_tmp = atoi(token);
-						if(port_tmp < 1 || port_tmp > 65535){
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid port value (%d).", port_tmp);
-							return MOSQ_ERR_INVAL;
-						}
-						config->listeners[config->listener_count-1].mount_point = NULL;
-						config->listeners[config->listener_count-1].port = port_tmp;
-						config->listeners[config->listener_count-1].socks = NULL;
-						config->listeners[config->listener_count-1].sock_count = 0;
-						config->listeners[config->listener_count-1].client_count = 0;
-						token = strtok(NULL, " ");
-						if(token){
-							config->listeners[config->listener_count-1].host = _mosquitto_strdup(token);
-						}else{
-							config->listeners[config->listener_count-1].host = NULL;
-						}
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty listener value in configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-				}else if(!strcmp(token, "log_dest")){
-					token = strtok(NULL, " ");
-					if(token){
-						log_dest_set = 1;
-						if(!strcmp(token, "none")){
-							log_dest = MQTT3_LOG_NONE;
-						}else if(!strcmp(token, "syslog")){
-							log_dest |= MQTT3_LOG_SYSLOG;
-						}else if(!strcmp(token, "stdout")){
-							log_dest |= MQTT3_LOG_STDOUT;
-						}else if(!strcmp(token, "stderr")){
-							log_dest |= MQTT3_LOG_STDERR;
-						}else if(!strcmp(token, "topic")){
-							log_dest |= MQTT3_LOG_TOPIC;
-						}else{
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid log_dest value (%s).", token);
-							return MOSQ_ERR_INVAL;
-						}
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty log_dest value in configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-				}else if(!strcmp(token, "log_timestamp")){
-					if(_conf_parse_bool(&token, token, &config->log_timestamp)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "log_type")){
-					token = strtok(NULL, " ");
-					if(token){
-						log_type_set = 1;
-						if(!strcmp(token, "none")){
-							log_type = MOSQ_LOG_NONE;
-						}else if(!strcmp(token, "information")){
-							log_type |= MOSQ_LOG_INFO;
-						}else if(!strcmp(token, "notice")){
-							log_type |= MOSQ_LOG_NOTICE;
-						}else if(!strcmp(token, "warning")){
-							log_type |= MOSQ_LOG_WARNING;
-						}else if(!strcmp(token, "error")){
-							log_type |= MOSQ_LOG_ERR;
-						}else if(!strcmp(token, "debug")){
-							log_type |= MOSQ_LOG_DEBUG;
-						}else{
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid log_type value (%s).", token);
-							return MOSQ_ERR_INVAL;
-						}
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty log_type value in configuration.");
-					}
-				}else if(!strcmp(token, "max_connections")){
-					if(reload) continue; // Listeners not valid for reloading.
-					token = strtok(NULL, " ");
-					if(token){
-						if(config->listener_count > 0){
-							config->listeners[config->listener_count-1].max_connections = atoi(token);
-							if(config->listeners[config->listener_count-1].max_connections < 0) config->listeners[config->listener_count-1].max_connections = -1;
-						}else{
-							config->default_listener.max_connections = atoi(token);
-							if(config->default_listener.max_connections < 0) config->default_listener.max_connections = -1;
-						}
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty max_connections value in configuration.");
-					}
-				}else if(!strcmp(token, "max_inflight_messages")){
-					token = strtok(NULL, " ");
-					if(token){
-						max_inflight_messages = atoi(token);
-						if(max_inflight_messages < 0) max_inflight_messages = 0;
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty max_inflight_messages value in configuration.");
-					}
-				}else if(!strcmp(token, "max_queued_messages")){
-					token = strtok(NULL, " ");
-					if(token){
-						max_queued_messages = atoi(token);
-						if(max_queued_messages < 0) max_queued_messages = 0;
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty max_queued_messages value in configuration.");
-					}
-				}else if(!strcmp(token, "mount_point")){
-					if(reload) continue; // Listeners not valid for reloading.
-					if(config->listener_count == 0){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: You must use create a listener before using the mount_point option in the configuration file.");
-						return MOSQ_ERR_INVAL;
-					}
-					if(_conf_parse_string(&token, "mount_point", &config->listeners[config->listener_count-1].mount_point)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "notifications")){
-#ifdef WITH_BRIDGE
-					if(reload) continue; // FIXME
-					if(!cur_bridge){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-					if(_conf_parse_bool(&token, "notifications", &cur_bridge->notifications)) return MOSQ_ERR_INVAL;
-#else
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge support not available.");
-#endif
-				}else if(!strcmp(token, "password")){
-#ifdef WITH_BRIDGE
-					if(reload) continue; // FIXME
-					if(!cur_bridge){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-					token = strtok(NULL, " ");
-					if(token){
-						if(cur_bridge->password){
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Duplicate password value in bridge configuration.");
-							return MOSQ_ERR_INVAL;
-						}
-						cur_bridge->password = _mosquitto_strdup(token);
-						if(!cur_bridge->password){
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory");
-							return MOSQ_ERR_NOMEM;
-						}
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty password value in configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-#else
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge support not available.");
-#endif
-				}else if(!strcmp(token, "password_file")){
-					if(reload){
-						if(config->password_file){
-							_mosquitto_free(config->password_file);
-							config->password_file = NULL;
-						}
-					}
-					if(_conf_parse_string(&token, "password_file", &config->password_file)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "persistence") || !strcmp(token, "retained_persistence")){
-					if(_conf_parse_bool(&token, token, &config->persistence)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "persistence_file")){
-					if(reload) continue; // FIXME
-					if(_conf_parse_string(&token, "persistence_file", &config->persistence_file)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "persistence_location")){
-					if(reload) continue; // FIXME
-					if(_conf_parse_string(&token, "persistence_location", &config->persistence_location)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "pid_file")){
-					if(reload) continue; // pid file not valid for reloading.
-					if(_conf_parse_string(&token, "pid_file", &config->pid_file)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "port")){
-					if(reload) continue; // Listener not valid for reloading.
-					if(config->default_listener.port){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Default listener port specified multiple times. Only the latest will be used.");
-					}
-					if(_conf_parse_int(&token, "port", &port_tmp)) return MOSQ_ERR_INVAL;
-					if(port_tmp < 1 || port_tmp > 65535){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid port value (%d).", port_tmp);
-						return MOSQ_ERR_INVAL;
-					}
-					config->default_listener.port = port_tmp;
-				}else if(!strcmp(token, "retry_interval")){
-					if(_conf_parse_int(&token, "retry_interval", &config->retry_interval)) return MOSQ_ERR_INVAL;
-					if(config->retry_interval < 1 || config->retry_interval > 3600){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid retry_interval value (%d).", config->retry_interval);
-						return MOSQ_ERR_INVAL;
-					}
-				}else if(!strcmp(token, "start_type")){
-#ifdef WITH_BRIDGE
-					if(reload) continue; // FIXME
-					if(!cur_bridge){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-					token = strtok(NULL, " ");
-					if(token){
-						if(!strcmp(token, "automatic")){
-							cur_bridge->start_type = bst_automatic;
-						}else if(!strcmp(token, "lazy")){
-							cur_bridge->start_type = bst_lazy;
-						}else if(!strcmp(token, "manual")){
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Manual start_type not supported.");
-							return MOSQ_ERR_INVAL;
-						}else if(!strcmp(token, "once")){
-							cur_bridge->start_type = bst_once;
-						}else{
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid start_type value in configuration (%s).", token);
-							return MOSQ_ERR_INVAL;
-						}
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty start_type value in configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-#else
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge support not available.");
-#endif
-				}else if(!strcmp(token, "store_clean_interval")){
-					if(_conf_parse_int(&token, "store_clean_interval", &config->store_clean_interval)) return MOSQ_ERR_INVAL;
-					if(config->store_clean_interval < 0 || config->store_clean_interval > 65535){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid store_clean_interval value (%d).", config->store_clean_interval);
-						return MOSQ_ERR_INVAL;
-					}
-				}else if(!strcmp(token, "sys_interval")){
-					if(_conf_parse_int(&token, "sys_interval", &config->sys_interval)) return MOSQ_ERR_INVAL;
-					if(config->sys_interval < 1 || config->sys_interval > 65535){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid sys_interval value (%d).", config->sys_interval);
-						return MOSQ_ERR_INVAL;
-					}
-				}else if(!strcmp(token, "threshold")){
-#ifdef WITH_BRIDGE
-					if(reload) continue; // FIXME
-					if(!cur_bridge){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-					if(_conf_parse_int(&token, "threshold", &cur_bridge->threshold)) return MOSQ_ERR_INVAL;
-					if(cur_bridge->threshold < 1){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "threshold too low, using 1 message.");
-						cur_bridge->threshold = 1;
-					}
-#else
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge support not available.");
-#endif
-				}else if(!strcmp(token, "topic")){
-#ifdef WITH_BRIDGE
-					if(reload) continue; // FIXME
-					if(!cur_bridge){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-					token = strtok(NULL, " ");
-					if(token){
-						cur_bridge->topic_count++;
-						cur_bridge->topics = _mosquitto_realloc(cur_bridge->topics, 
-								sizeof(struct _mqtt3_bridge_topic)*cur_bridge->topic_count);
-						if(!cur_bridge->topics){
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory");
-							return MOSQ_ERR_NOMEM;
-						}
-						cur_bridge->topics[cur_bridge->topic_count-1].topic = _mosquitto_strdup(token);
-						if(!cur_bridge->topics[cur_bridge->topic_count-1].topic){
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory");
-							return MOSQ_ERR_NOMEM;
-						}
-						cur_bridge->topics[cur_bridge->topic_count-1].direction = bd_out;
-						cur_bridge->topics[cur_bridge->topic_count-1].qos = 2;
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty topic value in configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-					token = strtok(NULL, " ");
-					if(token){
-						if(!strcasecmp(token, "out")){
-							cur_bridge->topics[cur_bridge->topic_count-1].direction = bd_out;
-						}else if(!strcasecmp(token, "in")){
-							cur_bridge->topics[cur_bridge->topic_count-1].direction = bd_in;
-						}else if(!strcasecmp(token, "both")){
-							cur_bridge->topics[cur_bridge->topic_count-1].direction = bd_both;
-						}else{
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge topic direction '%s'.", token);
-							return MOSQ_ERR_INVAL;
-						}
-						token = strtok(NULL, " ");
-						if(token){
-							cur_bridge->topics[cur_bridge->topic_count-1].qos = atoi(token);
-							if(cur_bridge->topics[cur_bridge->topic_count-1].qos < 0 || cur_bridge->topics[cur_bridge->topic_count-1].qos > 2){
-								_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge QoS level '%s'.", token);
-								return MOSQ_ERR_INVAL;
-							}
-						}
-					}
-#else
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge support not available.");
-#endif
-				}else if(!strcmp(token, "user")){
-					if(reload) continue; // Drop privileges user not valid for reloading.
-					if(_conf_parse_string(&token, "user", &config->user)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "username")){
-#ifdef WITH_BRIDGE
-					if(reload) continue; // FIXME
-					if(!cur_bridge){
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-					token = strtok(NULL, " ");
-					if(token){
-						if(cur_bridge->username){
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Duplicate username value in bridge configuration.");
-							return MOSQ_ERR_INVAL;
-						}
-						cur_bridge->username = _mosquitto_strdup(token);
-						if(!cur_bridge->username){
-							_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory");
-							return MOSQ_ERR_NOMEM;
-						}
-					}else{
-						_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty username value in configuration.");
-						return MOSQ_ERR_INVAL;
-					}
-#else
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Bridge support not available.");
-#endif
-#ifdef WITH_EXTERNAL_SECURITY_CHECKS
-				}else if(!strcmp(token, "db_host")){
-					if(reload){
-						if(config->db_host){
-							_mosquitto_free(config->db_host);
-							config->db_host = NULL;
-						}
-					}
-					if(_conf_parse_string(&token, "db_host", &config->db_host)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "db_name")){
-					if(reload){
-						if(config->db_name){
-							_mosquitto_free(config->db_name);
-							config->db_name = NULL;
-						}
-					}
-					if(_conf_parse_string(&token, "db_name", &config->db_name)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "db_username")){
-					if(reload){
-						if(config->db_username){
-							_mosquitto_free(config->db_username);
-							config->db_username = NULL;
-						}
-					}
-					if(_conf_parse_string(&token, "db_username", &config->db_username)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "db_password")){
-					if(reload){
-						if(config->db_password){
-							_mosquitto_free(config->db_password);
-							config->db_password = NULL;
-						}
-					}
-					if(_conf_parse_string(&token, "db_password", &config->db_password)) return MOSQ_ERR_INVAL;
-				}else if(!strcmp(token, "db_port")){
-					if(_conf_parse_int(&token, "db_port", &config->db_port)) return MOSQ_ERR_INVAL;
-#endif
-				}else if(!strcmp(token, "autosave_on_changes")
-						|| !strcmp(token, "connection_messages")
-						|| !strcmp(token, "trace_level")
-						|| !strcmp(token, "addresses")
-						|| !strcmp(token, "idle_timeout")
-						|| !strcmp(token, "notification_topic")
-						|| !strcmp(token, "round_robin")
-						|| !strcmp(token, "threshold")
-						|| !strcmp(token, "try_private")
-						|| !strcmp(token, "ffdc_output")
-						|| !strcmp(token, "max_log_entries")
-						|| !strcmp(token, "trace_output")){
-					_mosquitto_log_printf(NULL, MOSQ_LOG_WARNING, "Warning: Unsupported rsmb configuration option \"%s\".", token);
-				}else{
-					_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Unknown configuration variable \"%s\".", token);
-					return MOSQ_ERR_INVAL;
-				}
-			}
-		}
-	}
-	fclose(fptr);
-
-#ifdef WITH_PERSISTENCE
-	if(config->persistence){
-		if(!config->persistence_file){
-			config->persistence_file = _mosquitto_strdup("mosquitto.db");
-			if(!config->persistence_file) return MOSQ_ERR_NOMEM;
-		}
-		if(config->persistence_filepath){
-			_mosquitto_free(config->persistence_filepath);
-		}
-		if(config->persistence_location && strlen(config->persistence_location)){
-			config->persistence_filepath = _mosquitto_malloc(strlen(config->persistence_location) + strlen(config->persistence_file) + 1);
-			if(!config->persistence_filepath) return MOSQ_ERR_NOMEM;
-			sprintf(config->persistence_filepath, "%s%s", config->persistence_location, config->persistence_file);
-		}else{
-			config->persistence_filepath = _mosquitto_strdup(config->persistence_file);
-			if(!config->persistence_filepath) return MOSQ_ERR_NOMEM;
-		}
-	}
-#endif
-	if(!config->user){
-		config->user = "mosquitto";
-	}
-
-	mqtt3_db_limits_set(max_inflight_messages, max_queued_messages);
-
-#ifdef WITH_BRIDGE
-	for(i=0; i<config->bridge_count; i++){
-		if(!config->bridges[i].name || !config->bridges[i].address || !config->bridges[i].port || !config->bridges[i].topic_count){
-			_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid bridge configuration.");
-			return MOSQ_ERR_INVAL;
-		}
-	}
-#endif
-
-	if(log_dest_set){
-		config->log_dest = log_dest;
-	}
-	if(log_type_set){
-		config->log_type = log_type;
-	}
-
-	return rc;
-}
-
-static int _conf_parse_bool(char **token, const char *name, bool *value)
-{
-	*token = strtok(NULL, " ");
-	if(*token){
-		if(!strcmp(*token, "false") || !strcmp(*token, "0")){
-			*value = false;
-		}else if(!strcmp(*token, "true") || !strcmp(*token, "1")){
-			*value = true;
-		}else{
-			_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Invalid %s value (%s).", name, *token);
-		}
-	}else{
-		_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty %s value in configuration.", name);
-		return MOSQ_ERR_INVAL;
-	}
-	
-	return MOSQ_ERR_SUCCESS;
-}
-
-static int _conf_parse_int(char **token, const char *name, int *value)
-{
-	*token = strtok(NULL, " ");
-	if(*token){
-		*value = atoi(*token);
-	}else{
-		_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty %s value in configuration.", name);
-		return MOSQ_ERR_INVAL;
-	}
-
-	return MOSQ_ERR_SUCCESS;
-}
-
-static int _conf_parse_string(char **token, const char *name, char **value)
-{
-	*token = strtok(NULL, " ");
-	if(*token){
-		if(*value){
-			_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Duplicate %s value in configuration.", name);
-			return MOSQ_ERR_INVAL;
-		}
-		*value = _mosquitto_strdup(*token);
-		if(!*value){
-			_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory");
-			return MOSQ_ERR_NOMEM;
-		}
-	}else{
-		_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error: Empty %s value in configuration.", name);
-		return MOSQ_ERR_INVAL;
-	}
-	return MOSQ_ERR_SUCCESS;
-}

=== removed directory '.pc/bug-proto-number.patch'
=== removed directory '.pc/bug-proto-number.patch/src'
=== removed file '.pc/bug-proto-number.patch/src/read_handle_server.c'
--- .pc/bug-proto-number.patch/src/read_handle_server.c	2012-12-28 22:55:03 +0000
+++ .pc/bug-proto-number.patch/src/read_handle_server.c	1970-01-01 00:00:00 +0000
@@ -1,437 +0,0 @@
-/*
-Copyright (c) 2009-2012 Roger Light <[e-mail]>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of mosquitto nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <stdio.h>
-#include <string.h>
-
-#include <config.h>
-
-#include <mqtt3.h>
-#include <mqtt3_protocol.h>
-#include <memory_mosq.h>
-#include <send_mosq.h>
-#include <util_mosq.h>
-
-int mqtt3_handle_connect(mosquitto_db *db, int context_index)
-{
-	char *protocol_name;
-	uint8_t protocol_version;
-	uint8_t connect_flags;
-	char *client_id;
-	char *will_message = NULL, *will_topic = NULL;
-	struct mosquitto_message *will_struct = NULL;
-	uint8_t will, will_retain, will_qos, clean_session;
-	uint8_t username_flag, password_flag;
-	char *username, *password = NULL;
-	int i;
-	int rc;
-	struct _mosquitto_acl_user *acl_tail;
-	struct mosquitto *context;
-
-	context = db->contexts[context_index];
-	
-	/* Don't accept multiple CONNECT commands. */
-	if(context->state != mosq_cs_new){
-		mqtt3_context_disconnect(db, context_index);
-		return MOSQ_ERR_PROTOCOL;
-	}
-
-	if(_mosquitto_read_string(&context->in_packet, &protocol_name)){
-		mqtt3_context_disconnect(db, context_index);
-		return 1;
-	}
-	if(!protocol_name){
-		mqtt3_context_disconnect(db, context_index);
-		return 3;
-	}
-	if(strcmp(protocol_name, PROTOCOL_NAME)){
-		if(db->config->connection_messages == true){
-			_mosquitto_log_printf(NULL, MOSQ_LOG_INFO, "Invalid protocol \"%s\" in CONNECT from %s.",
-					protocol_name, context->address);
-		}
-		_mosquitto_free(protocol_name);
-		mqtt3_context_disconnect(db, context_index);
-		return MOSQ_ERR_PROTOCOL;
-	}
-	_mosquitto_free(protocol_name);
-
-	if(_mosquitto_read_byte(&context->in_packet, &protocol_version)){
-		mqtt3_context_disconnect(db, context_index);
-		return 1;
-	}
-	if(protocol_version != PROTOCOL_VERSION){
-		if(db->config->connection_messages == true){
-			_mosquitto_log_printf(NULL, MOSQ_LOG_INFO, "Invalid protocol version %d in CONNECT from %s.",
-					protocol_version, context->address);
-		}
-		_mosquitto_free(protocol_name);
-		_mosquitto_send_connack(context, 1);
-		mqtt3_context_disconnect(db, context_index);
-		return MOSQ_ERR_PROTOCOL;
-	}
-
-	if(_mosquitto_read_byte(&context->in_packet, &connect_flags)){
-		mqtt3_context_disconnect(db, context_index);
-		return 1;
-	}
-	clean_session = connect_flags & 0x02;
-	will = connect_flags & 0x04;
-	will_qos = (connect_flags & 0x18) >> 3;
-	will_retain = connect_flags & 0x20;
-	password_flag = connect_flags & 0x40;
-	username_flag = connect_flags & 0x80;
-
-	if(_mosquitto_read_uint16(&context->in_packet, &(context->keepalive))){
-		mqtt3_context_disconnect(db, context_index);
-		return 1;
-	}
-
-	if(_mosquitto_read_string(&context->in_packet, &client_id)){
-		mqtt3_context_disconnect(db, context_index);
-		return 1;
-	}
-
-	/* clientid_prefixes check */
-	if(db->config->clientid_prefixes){
-		if(strncmp(db->config->clientid_prefixes, client_id, strlen(db->config->clientid_prefixes))){
-			_mosquitto_free(client_id);
-			_mosquitto_send_connack(context, 2);
-			mqtt3_context_disconnect(db, context_index);
-			return MOSQ_ERR_SUCCESS;
-		}
-	}
-
-	if(will){
-		will_struct = _mosquitto_calloc(1, sizeof(struct mosquitto_message));
-		if(!will_struct){
-			_mosquitto_free(client_id);
-			mqtt3_context_disconnect(db, context_index);
-			return MOSQ_ERR_NOMEM;
-		}
-		if(_mosquitto_read_string(&context->in_packet, &will_topic)){
-			_mosquitto_free(client_id);
-			mqtt3_context_disconnect(db, context_index);
-			return 1;
-		}
-		if(_mosquitto_read_string(&context->in_packet, &will_message)){
-			_mosquitto_free(client_id);
-			mqtt3_context_disconnect(db, context_index);
-			return 1;
-		}
-	}
-
-	if(username_flag){
-		rc = _mosquitto_read_string(&context->in_packet, &username);
-		if(rc == MOSQ_ERR_SUCCESS){
-			if(password_flag){
-				rc = _mosquitto_read_string(&context->in_packet, &password);
-				if(rc == MOSQ_ERR_NOMEM){
-					_mosquitto_free(username);
-					_mosquitto_free(client_id);
-					return MOSQ_ERR_NOMEM;
-				}else if(rc == MOSQ_ERR_PROTOCOL){
-					/* Password flag given, but no password. Ignore. */
-					password_flag = 0;
-				}
-			}
-			rc = mosquitto_unpwd_check(db, username, password);
-			context->username = username;
-			context->password = password;
-			if(rc == MOSQ_ERR_AUTH){
-				_mosquitto_send_connack(context, 2);
-				mqtt3_context_disconnect(db, context_index);
-				_mosquitto_free(client_id);
-				return MOSQ_ERR_SUCCESS;
-			}else if(rc == MOSQ_ERR_INVAL){
-				_mosquitto_free(client_id);
-				return MOSQ_ERR_INVAL;
-			}
-		}else if(rc == MOSQ_ERR_NOMEM){
-			_mosquitto_free(client_id);
-			return MOSQ_ERR_NOMEM;
-		}else{
-			/* Username flag given, but no username. Ignore. */
-			username_flag = 0;
-		}
-	}
-
-	if(!username_flag && db->config->allow_anonymous == false){
-		_mosquitto_send_connack(context, 2);
-		mqtt3_context_disconnect(db, context_index);
-		_mosquitto_free(client_id);
-		return MOSQ_ERR_SUCCESS;
-	}
-
-	/* Find if this client already has an entry. This must be done *after* any security checks. */
-	for(i=0; i<db->context_count; i++){
-		if(db->contexts[i] && db->contexts[i]->id && !strcmp(db->contexts[i]->id, client_id)){
-			/* Client does match. */
-			if(db->contexts[i]->sock == -1){
-				/* Client is reconnecting after a disconnect */
-				/* FIXME - does anything else need to be done here? */
-			}else{
-				/* Client is already connected, disconnect old version */
-				if(db->config->connection_messages == true){
-					_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Client %s already connected, closing old connection.", client_id);
-				}
-			}
-			db->contexts[i]->clean_session = clean_session;
-			mqtt3_context_cleanup(db, db->contexts[i], false);
-			db->contexts[i]->state = mosq_cs_connected;
-			db->contexts[i]->address = _mosquitto_strdup(context->address);
-			db->contexts[i]->sock = context->sock;
-			db->contexts[i]->listener = context->listener;
-			db->contexts[i]->last_msg_in = time(NULL);
-			db->contexts[i]->last_msg_out = time(NULL);
-			db->contexts[i]->keepalive = context->keepalive;
-			context->sock = -1;
-			context->state = mosq_cs_disconnecting;
-			context = db->contexts[i];
-			if(context->msgs){
-				/* Messages received when the client was disconnected are put
-				 * in the ms_queued state. If we don't change them to the
-				 * appropriate "publish" state, then the queued messages won't
-				 * get sent until the client next receives a message - and they
-				 * will be sent out of order.
-				 * This only sets a single message up to be published, but once
-				 * it is sent the full max_inflight amount of messages will be
-				 * queued up for sending.
-				 */
-				if(context->msgs->state == ms_queued && context->msgs->direction == mosq_md_out){
-					switch(context->msgs->qos){
-						case 0:
-							context->msgs->state = ms_publish;
-							break;
-						case 1:
-							context->msgs->state = ms_publish_puback;
-							break;
-						case 2:
-							context->msgs->state = ms_publish_pubrec;
-							break;
-					}
-				}
-			}
-			break;
-		}
-	}
-
-	context->id = client_id;
-	context->clean_session = clean_session;
-
-	context->will = will_struct;
-	if(context->will){
-		context->will->topic = will_topic;
-		if(will_message){
-			context->will->payload = (uint8_t *)will_message;
-			context->will->payloadlen = strlen(will_message);
-		}else{
-			context->will->payload = NULL;
-			context->will->payloadlen = 0;
-		}
-		context->will->qos = will_qos;
-		context->will->retain = will_retain;
-	}
-
-	/* Associate user with its ACL, assuming we have ACLs loaded. */
-	if(db->acl_list){
-		acl_tail = db->acl_list;
-		while(acl_tail){
-			if(context->username){
-				if(acl_tail->username && !strcmp(context->username, acl_tail->username)){
-					context->acl_list = acl_tail;
-					break;
-				}
-			}else{
-				if(acl_tail->username == NULL){
-					context->acl_list = acl_tail;
-					break;
-				}
-			}
-			acl_tail = acl_tail->next;
-		}
-	}else{
-		context->acl_list = NULL;
-	}
-
-	if(db->config->connection_messages == true){
-		_mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "New client connected from %s as %s.", context->address, client_id);
-	}
-
-	context->state = mosq_cs_connected;
-	return _mosquitto_send_connack(context, 0);
-}
-
-int mqtt3_handle_disconnect(mosquitto_db *db, int context_index)
-{
-	struct mosquitto *context;
-
-	context = db->contexts[context_index];
-
-	if(!context){
-		return MOSQ_ERR_INVAL;
-	}
-	if(context->in_packet.remaining_length != 0){
-		return MOSQ_ERR_PROTOCOL;
-	}
-	_mosquitto_log_printf(NULL, MOSQ_LOG_DEBUG, "Received DISCONNECT from %s", context->id);
-	context->state = mosq_cs_disconnecting;
-	mqtt3_context_disconnect(db, context_index);
-	return MOSQ_ERR_SUCCESS;
-}
-
-
-int mqtt3_handle_subscribe(mosquitto_db *db, struct mosquitto *context)
-{
-	int rc = 0;
-	int rc2;
-	uint16_t mid;
-	char *sub;
-	uint8_t qos;
-	uint8_t *payload = NULL, *tmp_payload;
-	uint32_t payloadlen = 0;
-	int len;
-	char *sub_mount;
-
-	if(!context) return MOSQ_ERR_INVAL;
-	_mosquitto_log_printf(NULL, MOSQ_LOG_DEBUG, "Received SUBSCRIBE from %s", context->id);
-	/* FIXME - plenty of potential for memory leaks here */
-
-	if(_mosquitto_read_uint16(&context->in_packet, &mid)) return 1;
-
-	while(context->in_packet.pos < context->in_packet.remaining_length){
-		sub = NULL;
-		if(_mosquitto_read_string(&context->in_packet, &sub)){
-			if(payload) _mosquitto_free(payload);
-			return 1;
-		}
-
-		if(sub){
-			if(_mosquitto_read_byte(&context->in_packet, &qos)){
-				_mosquitto_free(sub);
-				if(payload) _mosquitto_free(payload);
-				return 1;
-			}
-			if(qos > 2){
-				_mosquitto_log_printf(NULL, MOSQ_LOG_INFO, "Invalid QoS in subscription command from %s, disconnecting.",
-					context->address);
-				_mosquitto_free(sub);
-				if(payload) _mosquitto_free(payload);
-				return 1;
-			}
-			if(_mosquitto_fix_sub_topic(&sub)){
-				_mosquitto_free(sub);
-				if(payload) _mosquitto_free(payload);
-				return 1;
-			}
-			if(!strlen(sub)){
-				_mosquitto_log_printf(NULL, MOSQ_LOG_INFO, "Empty subscription string from %s, disconnecting.",
-					context->address);
-				_mosquitto_free(sub);
-				if(payload) _mosquitto_free(payload);
-				return 1;
-			}
-			if(context->listener && context->listener->mount_point){
-				len = strlen(context->listener->mount_point) + strlen(sub) + 1;
-				sub_mount = _mosquitto_calloc(len, sizeof(char));
-				if(!sub_mount){
-					_mosquitto_free(sub);
-					if(payload) _mosquitto_free(payload);
-					return MOSQ_ERR_NOMEM;
-				}
-				snprintf(sub_mount, len, "%s%s", context->listener->mount_point, sub);
-				_mosquitto_free(sub);
-				sub = sub_mount;
-
-			}
-			_mosquitto_log_printf(NULL, MOSQ_LOG_DEBUG, "\t%s (QoS %d)", sub, qos);
-			/* FIXME - need to deny access to retained messages. */
-#if 0
-			/* Check for topic access */
-			rc2 = mqtt3_acl_check(db, context, sub, MOSQ_ACL_READ);
-			if(rc2 == MOSQ_ERR_SUCCESS){
-				mqtt3_sub_add(context, sub, qos, &db->subs);
-				if(mqtt3_retain_queue(db, context, sub, qos)) rc = 1;
-			}else if(rc2 != MOSQ_ERR_ACL_DENIED){
-				rc = 1;
-			}
-#else
-			rc2 = mqtt3_sub_add(context, sub, qos, &db->subs);
-			if(rc2 == MOSQ_ERR_SUCCESS){
-				if(mqtt3_retain_queue(db, context, sub, qos)) rc = 1;
-			}else if(rc2 != -1){
-				rc = rc2;
-			}
-#endif
-			_mosquitto_free(sub);
-
-			tmp_payload = _mosquitto_realloc(payload, payloadlen + 1);
-			if(tmp_payload){
-				payload = tmp_payload;
-				payload[payloadlen] = qos;
-				payloadlen++;
-			}else{
-				if(payload) _mosquitto_free(payload);
-
-				return MOSQ_ERR_NOMEM;
-			}
-		}
-	}
-
-	if(_mosquitto_send_suback(context, mid, payloadlen, payload)) rc = 1;
-	_mosquitto_free(payload);
-	
-	return rc;
-}
-
-int mqtt3_handle_unsubscribe(mosquitto_db *db, struct mosquitto *context)
-{
-	uint16_t mid;
-	char *sub;
-
-	if(!context) return MOSQ_ERR_INVAL;
-	_mosquitto_log_printf(NULL, MOSQ_LOG_DEBUG, "Received UNSUBSCRIBE from %s", context->id);
-
-	if(_mosquitto_read_uint16(&context->in_packet, &mid)) return 1;
-
-	while(context->in_packet.pos < context->in_packet.remaining_length){
-		sub = NULL;
-		if(_mosquitto_read_string(&context->in_packet, &sub)){
-			return 1;
-		}
-
-		if(sub){
-			_mosquitto_log_printf(NULL, MOSQ_LOG_DEBUG, "\t%s", sub);
-			mqtt3_sub_remove(context, sub, &db->subs);
-			_mosquitto_free(sub);
-		}
-	}
-
-	return _mosquitto_send_command_with_mid(context, UNSUBACK, mid, false);
-}
-

=== removed directory '.pc/enable-libwrap.patch'
=== removed file '.pc/enable-libwrap.patch/config.h'
--- .pc/enable-libwrap.patch/config.h	2013-08-23 15:09:02 +0000
+++ .pc/enable-libwrap.patch/config.h	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/* ============================================================
- * Control compile time options.
- *
- * Largely, these are options that are designed to make mosquitto run more
- * easily in restrictive environments by removing features.
- * ============================================================ */
-
-#ifndef CMAKE
-/* Only use the compile time options defined here from the standard Makefile. */
-
-
-/* Uncomment to compile with tcpd/libwrap support. */
-//#define WITH_WRAP
-
-/* Compile with database upgrading support? If disabled, mosquitto won't
- * automatically upgrade old database versions. */
-//#define WITH_DB_UPGRADE
-
-/* Compile with memory tracking support? If disabled, mosquitto won't track
- * heap memory usage nor export '$SYS/broker/heap/current size', but will use
- * slightly less memory and CPU time. */
-#define WITH_MEMORY_TRACKING
-
-/* Compile with persistent database support. This allows the broker to store
- * retained messages and durable subscriptions to a file periodically and on
- * shutdown. This is usually desirable (and is suggested by the MQTT spec), but
- * it can be disabled by commenting out this define if required.
- */
-#define WITH_PERSISTENCE
-
-/* Compile with bridge support included. This allow the broker to connect to
- * other brokers and subscribe/publish to topics. You probably want to leave
- * this included unless you want to save a very small amount of memory size and
- * CPU time.
- */
-#define WITH_BRIDGE
-
-/* Compile with strict protocol support. This means that both the client
- * library and the broker will be very strict about protocol compliance on
- * incoming data. Neither of them will return an error on incorrect "remaining
- * length" values if this is commented out. The old behaviour (prior to 0.12)
- * is equivalent to compiling with WITH_STRICT_PROTOCOL defined and means that
- * clients will be immediately disconnected from the broker on non-compliance.
- */
-//#define WITH_STRICT_PROTOCOL
-
-/* Use the username/password and ACL checks defined in security_external.c
- * This is empty by default, but gives a more straightforward way of adding
- * support for existing username/password databases to mosquitto.
- * Uncommenting without adding your own code to security_external.c will
- * result in all access being denied.
- * It also enables the db_* config options in mosquitto.conf.
- * Get in touch with the authors if you need help adding support for your
- * system.
- */
-//#define WITH_EXTERNAL_SECURITY_CHECKS
-#endif
-
-/* ============================================================
- * Compatibility defines
- *
- * Generally for Windows native support.
- * ============================================================ */
-#ifdef WIN32
-#define snprintf sprintf_s
-#define strcasecmp strcmpi
-#define strtok_r strtok_s
-#define strerror_r(e, b, l) strerror_s(b, l, e)
-#endif

=== removed file '.pc/enable-libwrap.patch/config.mk'
--- .pc/enable-libwrap.patch/config.mk	2013-08-23 15:09:02 +0000
+++ .pc/enable-libwrap.patch/config.mk	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# Also bump lib/mosquitto.h, lib/python/setup.py, CMakeLists.txt,
-# installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi
-VERSION=0.15
-TIMESTAMP:=$(shell date "+%F %T%z")
-
-#MANCOUNTRIES=en_GB
-
-CFLAGS=-I. -I.. -ggdb -Wall -O2 -I../lib
-
-UNAME:=$(shell uname -s)
-ifeq ($(UNAME),QNX)
-	LIBS=-lsocket
-else
-	LIBS=
-endif
-
-LDFLAGS=
-# Add -lwrap to LDFLAGS if compiling with tcp wrappers support.
-
-CC=gcc
-INSTALL=install
-XGETTEXT=xgettext
-MSGMERGE=msgmerge
-MSGFMT=msgfmt
-DOCBOOK2MAN=docbook2man.pl
-
-prefix=/usr
-mandir=${prefix}/share/man
-localedir=${prefix}/share/locale

=== removed directory '.pc/fix-prefix.patch'
=== removed directory '.pc/fix-prefix.patch/client'
=== removed file '.pc/fix-prefix.patch/client/Makefile'
--- .pc/fix-prefix.patch/client/Makefile	2011-07-25 22:24:52 +0000
+++ .pc/fix-prefix.patch/client/Makefile	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-CC=cc
-CFLAGS=-I../lib -Wall -ggdb
-LDFLAGS=-L../lib ../lib/libmosquitto.so.0
-INSTALL=install
-prefix=/usr/local
-
-.PHONY: all install uninstall clean
-
-all : mosquitto_pub mosquitto_sub
-
-mosquitto_pub : pub_client.o ../lib/libmosquitto.so.0
-	${CC} $< -o $@ ${LDFLAGS}
-
-mosquitto_sub : sub_client.o ../lib/libmosquitto.so.0
-	${CC} $< -o $@ ${LDFLAGS}
-
-../lib/libmosquitto.so.0 :
-	$(MAKE) -C ../lib
-
-install : all
-	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
-	$(INSTALL) -s mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub
-	$(INSTALL) -s mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub
-
-uninstall :
-	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_pub
-	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_sub
-
-clean : 
-	-rm -f *.o mosquitto_pub mosquitto_sub

=== removed file '.pc/fix-prefix.patch/config.mk'
--- .pc/fix-prefix.patch/config.mk	2013-08-23 15:09:02 +0000
+++ .pc/fix-prefix.patch/config.mk	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-# Also bump lib/mosquitto.h, lib/python/setup.py, CMakeLists.txt,
-# installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi
-VERSION=0.15
-TIMESTAMP:=$(shell date "+%F %T%z")
-
-#MANCOUNTRIES=en_GB
-
-CFLAGS=-I. -I.. -ggdb -Wall -O2 -I../lib
-
-UNAME:=$(shell uname -s)
-ifeq ($(UNAME),QNX)
-	LIBS=-lsocket
-else
-	LIBS=
-endif
-
-LDFLAGS=
-# Add -lwrap to LDFLAGS if compiling with tcp wrappers support.
-
-CC=gcc
-INSTALL=install
-XGETTEXT=xgettext
-MSGMERGE=msgmerge
-MSGFMT=msgfmt
-DOCBOOK2MAN=docbook2man.pl
-
-prefix=/usr/local
-mandir=${prefix}/share/man
-localedir=${prefix}/share/locale

=== removed directory '.pc/install-apparmor.patch'
=== removed file '.pc/install-apparmor.patch/Makefile'
--- .pc/install-apparmor.patch/Makefile	2012-02-07 23:21:39 +0000
+++ .pc/install-apparmor.patch/Makefile	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-include config.mk
-
-DIRS=lib client src man
-DISTDIRS=man
-
-.PHONY : all mosquitto clean reallyclean install uninstall dist sign copy
-
-all : mosquitto
-
-mosquitto :
-	for d in ${DIRS}; do $(MAKE) -C $${d}; done
-
-clean :
-	for d in ${DIRS}; do $(MAKE) -C $${d} clean; done
-
-reallyclean : 
-	for d in ${DIRS}; do $(MAKE) -C $${d} reallyclean; done
-	-rm -f *.orig
-
-install : mosquitto
-	@for d in ${DIRS}; do $(MAKE) -C $${d} install; done
-	$(INSTALL) -d ${DESTDIR}/etc/mosquitto
-	$(INSTALL) -m 644 mosquitto.conf ${DESTDIR}/etc/mosquitto/mosquitto.conf
-	$(INSTALL) -m 644 aclfile.example ${DESTDIR}/etc/mosquitto/aclfile.example
-	$(INSTALL) -m 644 pwfile.example ${DESTDIR}/etc/mosquitto/pwfile.example
-
-uninstall :
-	@for d in ${DIRS}; do $(MAKE) -C $${d} uninstall; done
-
-dist : reallyclean
-	@for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done
-	
-	mkdir -p dist/mosquitto-${VERSION}
-	cp -r client installer lib logo man misc security service src ChangeLog.txt CMakeLists.txt COPYING Makefile compiling.txt config.h config.mk external_security_checks.txt readme.txt readme-windows.txt mosquitto.conf aclfile.example pwfile.example dist/mosquitto-${VERSION}/
-	cd dist; tar -zcf mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}/
-	for m in libmosquitto.3 mosquitto.8 mosquitto.conf.5 mosquitto_pub.1 mosquitto_sub.1 mqtt.7; \
-		do \
-		hfile=$$(echo $${m} | sed -e 's/\./-/g'); \
-		man2html man/$${m} > dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?8+mosquitto#mosquitto-8.html#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?3+libmosquitto#libmosquitto-3.html#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?5+mosquitto.conf#mosquitto-conf-5.html#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?1+mosquitto_pub#mosquitto_pub-1.html#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?1+mosquitto_sub#mosquitto_sub-1.html#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?7+mqtt#mqtt-7.html#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?5+hosts_access#http://www.linuxmanpages.com/man5/hosts_access.5.php#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html#http://mosquitto.org/#' dist/$${hfile}.html; \
-		sed -i '1,2d' dist/$${hfile}.html; \
-	done
-
-
-sign : dist
-	cd dist; gpg --detach-sign -a mosquitto-${VERSION}.tar.gz
-
-copy : sign
-	cd dist; scp mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}.tar.gz.asc mosquitto:mosquitto.org/files/source/
-	cd dist; scp *.html mosquitto:mosquitto.org/man/
-	scp ChangeLog.txt mosquitto:mosquitto.org/
-

=== removed directory '.pc/mosquitto.conf.patch'
=== removed file '.pc/mosquitto.conf.patch/mosquitto.conf'
--- .pc/mosquitto.conf.patch/mosquitto.conf	2013-08-23 15:09:02 +0000
+++ .pc/mosquitto.conf.patch/mosquitto.conf	1970-01-01 00:00:00 +0000
@@ -1,364 +0,0 @@
-# Config file for mosquitto
-#
-# See mosquitto.conf(5) for more information.
-#
-# Default values are shown, uncomment to change.
-#
-# Use the # character to indicate a comment, but only if it is the 
-# very first character on the line.
-
-# =================================================================
-# General configuration
-# =================================================================
-
-# Time in seconds to wait before resending an outgoing QoS=1 or 
-# QoS=2 message.
-#retry_interval 20
-
-# Time in seconds between updates of the $SYS tree.
-#sys_interval 10
-
-# Time in seconds between cleaning the internal message store of 
-# unreferenced messages. Lower values will result in lower memory 
-# usage but more processor time, higher values will have the 
-# opposite effect.
-# Setting a value of 0 means the unreferenced messages will be 
-# disposed of as quickly as possible.
-#store_clean_interval 10
-
-# Write process id to a file. Default is a blank string which means 
-# a pid file shouldn't be written.
-# This should be set to /var/run/mosquitto.pid if mosquitto is
-# being run automatically on boot with an init script and 
-# start-stop-daemon or similar.
-#pid_file
-
-# When run as root, drop privileges to this user and its primary 
-# group.
-# Leave blank to stay as root, but this is not recommended.
-# If run as a non-root user, this setting has no effect.
-# Note that on Windows this has no effect and so mosquitto should 
-# be started by the user you wish it to run as.
-#user mosquitto
-
-# The maximum number of QoS 1 and 2 messages currently inflight per 
-# client.
-# This includes messages that are partway through handshakes and 
-# those that are being retried. Defaults to 10. Set to 0 for no 
-# maximum. Setting to 1 will guarantee in-order delivery of QoS 1 
-# and 2 messages.
-#max_inflight_messages 10
-
-# The maximum number of QoS 1 and 2 messages to hold in a queue 
-# above those that are currently in-flight.  Defaults to 100. Set 
-# to 0 for no maximum (not recommended).
-#max_queued_messages 100
-
-# =================================================================
-# Default listener
-# =================================================================
-
-# IP address/hostname to bind the default listener to. If not
-# given, the default listener will not be bound to a specific 
-# address and so will be accessible to all network interfaces.
-# bind_address ip-address/host name
-#bind_address
-
-# Port to use for the default listener.
-#port 1883
-
-# The maximum number of client connections to allow. This is 
-# a per listener setting.
-# Default is -1, which means unlimited connections.
-# Note that other process limits mean that unlimited connections 
-# are not really possible. Typically the default maximum number of 
-# connections possible is around 1024.
-#max_connections -1
-
-# =================================================================
-# Extra listeners
-# =================================================================
-
-# Listen on a port/ip address combination. By using this variable 
-# multiple times, mosquitto can listen on more than one port. If 
-# this variable is used and neither bind_address nor port given, 
-# then the default listener will not be started.
-# The port number to listen on must be given. Optionally, an ip 
-# address or host name may be supplied as a second argument. In 
-# this case, mosquitto will attempt to bind the listener to that 
-# address and so restrict access to the associated network and 
-# interface. By default, mosquitto will listen on all interfaces.
-# listener port-number [ip address/host name]
-#listener
-
-# The maximum number of client connections to allow. This is 
-# a per listener setting.
-# Default is -1, which means unlimited connections.
-# Note that other process limits mean that unlimited connections 
-# are not really possible. Typically the default maximum number of 
-# connections possible is around 1024.
-#max_connections -1
-
-# The listener can be restricted to operating within a topic hierarchy using
-# the mount_point option. This is achieved be prefixing the mount_point string
-# to all topics for any clients connected to this listener. This prefixing only
-# happens internally to the broker; the client will not see the prefix.
-#mount_point
-
-# =================================================================
-# Persistence
-# =================================================================
-
-# If persistence is enabled, save the in-memory database to disk 
-# every autosave_interval seconds. If set to 0, the persistence 
-# database will only be written when mosquitto exits.
-# Note that writing of the persistence database can be forced by 
-# sending mosquitto a SIGUSR1 signal.
-#autosave_interval 1800
-
-# Save persistent message data to disk (true/false).
-# This saves information about all messages, including 
-# subscriptions, currently in-flight messages and retained 
-# messages.
-# retained_persistence is a synonym for this option.
-#persistence false
-
-# The filename to use for the persistent database, not including 
-# the path.
-#persistence_file mosquitto.db
-
-# Location for persistent database. Must include trailing /
-# Default is an empty string (current directory).
-# Set to /var/lib/mosquitto/ if running as a proper service.
-#persistence_location
-
-# =================================================================
-# Logging
-# =================================================================
-
-# Places to log to. Use multiple log_dest lines for multiple 
-# logging destinations.
-# Possible destinations are: stdout stderr syslog topic
-# stdout and stderr log to the console on the named output.
-# syslog uses the userspace syslog facility which usually ends up 
-# in /var/log/messages or similar.
-# topic logs to the broker topic '$SYS/broker/log/<severity>', 
-# where severity is one of D, E, W, N, I which are debug, error, 
-# warning, notice and information.
-# Use "log_dest none" if you wish to disable logging.
-#log_dest stderr
-
-# Types of messages to log. Use multiple log_type lines for logging
-# multiple types of messages.
-# Possible types are: debug, error, warning, notice, information, 
-# none.
-# Note that debug type messages are for decoding the incoming 
-# network packets.
-# They are not logged in syslog.
-#log_type error
-#log_type warning
-#log_type notice
-#log_type information
-
-# If set to true, client connection and disconnection messages will be included
-# in the log.
-#connection_messages true
-
-# If set to true, add a timestamp value to each log message.
-#log_timestamp true
-
-# =================================================================
-# Security
-# =================================================================
-
-# If set, only clients that have a matching prefix on their 
-# clientid will be allowed to connect to the broker. By default, 
-# all clients may connect.
-# For example, setting "secure-" here would mean a client "secure-
-# client" could connect but another with clientid "mqtt" couldn't.
-#clientid_prefixes
-
-# Boolean value that determines whether clients that connect 
-# without providing a username are allowed to connect. If set to 
-# false then a password file should be created (see the 
-# password_file option) to control authenticated client access. 
-# Defaults to true.
-#allow_anonymous true
-
-# Control access to the broker using a password file. The file is a
-# text file # of lines in the format:
-# username:password
-# The password (and colon) may be omitted if desired, although this 
-# offers very little in the way of security.
-#password_file
-
-# Control access to topics on the broker using an access control list
-# file. If this parameter is defined then only the topics listed will
-# have access.
-# Topic access is added with lines of the format:
-#
-# topic [read|write] <topic>
-# 
-# The access type is controlled using "read" or "write". This parameter
-# is optional - if not given then the access is read/write.
-# <topic> can contain the + or # wildcards as in subscriptions.
-# 
-# The first set of topics are applied to anonymous clients, assuming
-# allow_anonymous is true. User specific topic ACLs are added after a 
-# user line as follows:
-#
-# user <username>
-#
-# The username referred to here is the same as in password_file. It is
-# not the clientid.
-#
-#
-# If is also possible to define ACLs based on pattern substitution within the
-# topic. The patterns available for substition are:
-#
-# %c to match the client id of the client
-# %u to match the username of the client
-#
-# The substitution pattern must be the only text for that level of hierarchy.
-#
-# The form is the same as for the topic keyword, but using pattern as the
-# keyword.
-# Pattern ACLs apply to all users even if the "user" keyword has previously
-# been given.
-#
-# pattern [read|write] <topic>
-#
-# Example:
-#
-# pattern write sensor/%u/data
-#
-#acl_file
-
-# =================================================================
-# Bridges
-# =================================================================
-
-# Experimental support for connecting multiple MQTT brokers 
-# together.
-# Specify multiple sets of connection, address and topic 
-# configurations.
-# Each connection must have a unique name.
-# Only a single address per configuration is currently supported, 
-# unlike in rsmb.
-# The direction that the topic will be shared can be chosen by 
-# specifying out, in or both, where the default value is out. 
-# The QoS level of the bridged communication can be specified with the final
-# topic option. The default QoS level is 2, to change the QoS the topic
-# direction must also be given.
-# Multiple topics can be specified per connection, but be careful 
-# not to create any loops.
-#connection <name>
-#address <host>[:<port>]
-#topic <topic> [[out | in | both] qos-level]
-
-# Set the client id for this bridge connection. If not defined, 
-# this defaults to 'name.hostname' where name is the connection 
-# name and hostname is the hostname of this computer.
-#clientid
-
-# Set the clean session variable for this bridge.
-# When set to true, when the bridge disconnects for any reason, all 
-# messages and subscriptions will be cleaned up on the remote 
-# broker. Note that with cleansession set to true, there may be a 
-# significant amount of retained messages sent when the bridge 
-# reconnects after losing its connection.
-# When set to false, the subscriptions and messages are kept on the 
-# remote broker, and delivered when the bridge reconnects.
-#cleansession false
-
-# If set to true, publish notification messages to the local and remote brokers
-# giving information about the state of the bridge connection. Retained
-# messages are published to the topic $SYS/bridge/connection/<clientid>/state.
-# If the message is 1 then the connection is active, or 0 if the connection has
-# failed.
-#notifications true
-
-# Set the keepalive interval for this bridge connection, in 
-# seconds.
-#keepalive_interval 60
-
-# Set the start type of the bridge. This controls how the bridge starts and
-# can be one of three types: automatic, lazy and once. Note that RSMB provides
-# a fourth start type "manual" which isn't currently supported by mosquitto.
-#
-# "automatic" is the default start type and means that the bridge connection
-# will be started automatically when the broker starts and also restarted
-# after a short delay (30 seconds) if the connection fails.
-#
-# Bridges using the "lazy" start type will be started automatically when the
-# number of queued messages exceeds the number set with the "threshold"
-# parameter. It will be stopped automatically after the time set by the
-# "idle_timeout" parameter. Use this start type if you wish the connection to
-# only be active when it is needed.
-#
-# A bridge using the "once" start type will be started automatically when the
-# broker starts but will not be restarted if the connection fails.
-#start_type automatic
-
-# Set the amount of time a bridge using the lazy start type must be idle before
-# it will be stopped. Defaults to 60 seconds.
-#idle_timeout 60
-
-# Set the number of messages that need to be queued for a bridge with lazy
-# start type to be restarted. Defaults to 10 messages.
-# Must be less than max_queued_messages.
-#threshold 10
-
-# Set the username to use when connecting to an MQTT v3.1 broker 
-# that requires authentication.
-#username
-
-# Set the password to use when connecting to an MQTT v3.1 broker 
-# that requires authentication. This option is only used if 
-# username is also set.
-#password
-
-# =================================================================
-# External security checks
-# =================================================================
-
-# This section defines options for potential use with external
-# databases. 
-# They are intended to make it easier to add external security
-# checks along with WITH_EXT_SECURITY_CHECKS. If you haven't written
-# code to support another database and compiled support in, you are
-# unlikely to need to change anything here.
-
-# Database hostname.
-#db_host
-
-# Database port.
-#db_port
-
-# Database name.
-#db_name
-
-# Database username.
-#db_username
-
-# Database password.
-#db_password
-
-# =================================================================
-# Unsupported rsmb options - for the future
-# =================================================================
-
-#autosave_on_changes
-#addresses
-#notification_topic
-#round_robin
-
-# =================================================================
-# rsmb options - unlikely to ever be supported
-# =================================================================
-
-#ffdc_output
-#max_log_entries
-#trace_level
-#trace_output
-#try_private

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-02-07 23:21:39 +0000
+++ CMakeLists.txt	2013-08-24 09:38:26 +0000
@@ -1,6 +1,4 @@
 # This is a cmake script.
-# It is intended to be the default means of building mosquitto, but isn't
-# quite ready for all cases yet.
 
 set(CMAKE_LEGACY_CYGWIN_WIN32 0)
 
@@ -8,10 +6,10 @@
 
 cmake_minimum_required(VERSION 2.6)
 
-set (VERSION 0.15)
+set (VERSION 1.2)
 
 if (WIN32)
-	execute_process(COMMAND echo "%DATE% %TIME%" OUTPUT_VARIABLE TIMESTAMP
+	execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP
 			OUTPUT_STRIP_TRAILING_WHITESPACE)
 else (WIN32)
 	execute_process(COMMAND date "+%F %T%z" OUTPUT_VARIABLE TIMESTAMP
@@ -33,7 +31,12 @@
 else (WIN32)
 	set (BINDIR bin)
 	set (SBINDIR sbin)
-	set (SYSCONFDIR etc/mosquitto)
+	if (${CMAKE_INSTALL_PREFIX} STREQUAL /usr)
+		set (SYSCONFDIR /etc/mosquitto)
+	else (${CMAKE_INSTALL_PREFIX} STREQUAL /usr)
+		set (SYSCONFDIR etc/mosquitto)
+	endif (${CMAKE_INSTALL_PREFIX} STREQUAL /usr)
+	
 	set (LIBDIR lib${LIB_SUFFIX})
 	set (INCLUDEDIR include)
 	set (DATAROOTDIR share)
@@ -41,6 +44,20 @@
 	set (SHAREDIR ${DATAROOTDIR}/mosquitto)
 endif (WIN32)
 
+option(WITH_TLS
+	"Include SSL/TLS support?" ON)
+option(WITH_TLS_PSK
+	"Include TLS-PSK support (requires WITH_TLS)?" ON)
+if (${WITH_TLS} STREQUAL ON)
+	find_package(OpenSSL REQUIRED)
+	add_definitions("-DWITH_TLS")
+	if (${WITH_TLS_PSK} STREQUAL ON)
+		add_definitions("-DWITH_TLS_PSK")
+	endif (${WITH_TLS_PSK} STREQUAL ON)
+else (${WITH_TLS} STREQUAL ON)
+	set (OPENSSL_INCLUDE_DIR "")
+endif (${WITH_TLS} STREQUAL ON)
+
 # ========================================
 # Include projects
 # ========================================
@@ -54,4 +71,4 @@
 # Install config file
 # ========================================
 
-install(FILES mosquitto.conf aclfile.example pwfile.example DESTINATION ${SYSCONFDIR})
+install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION ${SYSCONFDIR})

=== removed file 'COPYING'
--- COPYING	2012-02-07 23:21:39 +0000
+++ COPYING	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-Copyright (c) 2009-2012 Roger Light <[e-mail]>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of mosquitto nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.

=== modified file 'ChangeLog.txt'
--- ChangeLog.txt	2012-02-07 23:21:39 +0000
+++ ChangeLog.txt	2013-08-24 09:38:26 +0000
@@ -1,3 +1,426 @@
+1.2 - 20130708
+==============
+
+Broker:
+- Replace O(n) username lookup on CONNECT with a roughly O(1) hashtable version.
+- It is now possible to disable $SYS at compile time.
+- Add dropped publish messages to load tree in $SYS. Closes bug #1183318.
+- Add support for logging SUBSCRIBE/UNSUBSCRIBE events.
+- Add "log_dest file" logging support.
+- Auth plugin ACL check function now passes the client id as well as username
+  and password.
+- The queue_qos0_messages option wasn't working correctly, this has now been
+  fixed. Closes bug #1125200.
+- Don't drop all messages for disconnected durable clients when
+  max_queued_messages=0.
+- Add support for "log_type all".
+- Add support for "-v" option on the command line to provide the equivalent of
+  "log_type all" without needing a config file.
+- Add the "upgrade_outgoing_qos" option, a non-standard feature.
+- Persistence data is now written to a temporary file which is atomically
+  renamed on completion, so a crash during writing will not produce a corrupt
+  file.
+- mosquitto.conf is now installed as mosquitto.conf.example
+- Configuration file errors are now reported with filename and line number.
+- The broker now uses a monotonic clock if available, to avoid changes in time
+  causing client disconnections or message retries.
+- Clean session and keepalive status are now display the log when a client
+  connects.
+- Add support for TLSv1.2 and TLSv1.1.
+- Clients that connect with zero length will topics are now rejected.
+- Add the ability to set a maximum allowed PUBLISH payload size.
+- Fix an ACL with topic "#" incorrectly granting access to $SYS.
+- Fix retained messages incorrectly being set on wildcard topics, leading to
+  duplicate retained messages being sent on subscription. Closes bug #1116233.
+- Don't discard listener values when no "port" option given. Closes bug
+  #1131406.
+- Client password check was always failing when security was being reapplied
+  after a config reload. This meant that all clients were being disconnected.
+  This has been fixed.
+- Fix build when WITH_TLS=no. Closes bug #1174971.
+- Fix single outgoing packets not being sent in a timely fashion if they were
+  not sent in one call to write(). Closes bug #1176796.
+- Fix remapping of messages for clients connected to a listener with
+  mount_point set. Closes bug #1180765.
+- Fix duplicate retained messages being sent for some wildcard patterns.
+- If a client connects with a will topic to which they do not have write
+  access, they are now disconnected with CONNACK "not authorised".
+- Fix retained messages on topic foo being incorrectly delivered to
+  subscriptions of /#
+- Fix handling of SSL errors on SSL_accept().
+- Fix handling of QoS 2 messages on client reconnect.
+- Drop privileges now sets supplementary groups correctly.
+- Fix load reporting interval (is now 60s).
+- Be strict with malformed PUBLISH packets - clients are now disconnected
+  rather than the packet discarded. This goes inline with future OASIS spec
+  changes and makes other changes more straightforward.
+- Process incoming messages denied by ACL properly so that clients don't keep
+  resending them.
+
+- Add support for round_robin bridge option.
+- Add bridge support for verifying remote server certificate subject against
+  the remote hostname.
+- Fix problem with out of order calls to free() when restarting a lazy bridge.
+- The broker now attempts to resolve bind_address and bridge addresses
+  immediately when parsing the config file in order to detect invalid hosts.
+- Bridges now set their notification state before attempting to connect, so if
+  they fail to connect the state can still be seen.
+- Fix bridge notification payload length - no need to send a null byte.
+
+- mosquitto_passwd utility now reports errors more clearly.
+- Fix "mosquitto_passwd -U".
+
+
+Client library:
+- Add support for TLSv1.2 and TLSv1.1, except for on the Python module.
+- Add support for verifying remote server certificate subject against the
+  remote hostname.
+- Add mosquitto_reconnect_async() support and make asynchronous connections
+  truely asynchronous rather than simply deferred. DNS lookups are still
+  blocking, so asynchronous connections require an IP address instead of
+  hostname.
+- Allow control of reconnection timeouts in mosquitto_loop_forever() and after
+  mosquitto_loop_start() by using mosquitto_reconnect_delay_set().
+- Fix building on Android NDK.
+- Re-raise unhandled errors in Python so as not to provide confusing error
+  messages later on.
+- Python module supports IPv6 connections.
+- mosquitto_sub_topic_tokenise() was behaving incorrectly if the last topic
+  hierarchy had only a single character. This has been fixed. Closes bug
+  #1163348.
+- Fix possible crash after disconnects when using the threaded interface with
+  TLS.
+- Allow build/install without Python. Closes bug #1174972.
+- Add support for binding connection to a local interface.
+- Implement maximum inflight messages handling.
+- Fix Python client not handling will_payload==None.
+- Fix potential memory leak when setting username/password.
+- Fix handling of QoS 2 messages on reconnect.
+- Improve handling of mosquitto_disconnect() with threaded mode.
+
+
+Clients:
+- Add support for TLSv1.2 and TLSv1.1.
+- Sub client can now suppress printing of messages with the retain bit set.
+- Add support for binding connection to a local interface.
+- Implement maximum inflight messages handling for the pub client.
+
+1.1.3 - 20130211
+================
+
+Broker:
+- mosquitto_passwd utility now uses tmpfile() to generate its temporary data
+  storage file. It also creates a backup file that can be used to recover data
+  if an errors occur.
+
+Other:
+- Build script fixes to help packaging on Debian.
+
+1.1.2 - 20130130
+================
+
+Client library:
+- Fix tls_cert_reqs not being set to SSL_VERIFY_PEER by default. This meant
+  that clients were not verifying the server certificate when connecting over
+  TLS. This affects the C, C++ and Python libraries.
+
+1.1.1 - 20130116
+================
+
+Broker:
+- Fix crash on reload if using acl patterns.
+
+Client library:
+- Fix static C++ functions not being exported on Windows. Fixes bug #1098256.
+
+1.1 - 20121219
+==============
+
+Broker:
+- Add $SYS/broker/messages/dropped
+- Add $SYS/broker/clients/expired
+- Replace $SYS/broker/+/per second/+ with moving average versions published at
+  $SYS/broker/load/#
+- Add $SYS/broker/load/sockets/+ and $SYS/broker/load/connections/+
+- Documentation on password file format has been fixed.
+- Disable SSL compression. This reduces memory usage significantly and removes
+  the possibility of CRIME type attacks.
+- Enable SSL_MODE_RELEASE_BUFFERS mode to reduce SSL memory usage further.
+- Add allow_duplicate_messages option.
+- ACL files can now have comment lines with # as the first character.
+- Display message on startup about which config is being loaded.
+- Fix max_inflight_messages and max_queued_messages not being applied.
+- Fix documentation error in mosquitto.conf.
+- Ensure that QoS 2 queued messages are sent out in a timely manner.
+- Local bridges now act on clean_session correctly.
+- Local bridges with clean_session==false now remove unused subscriptions on
+  broker restart.
+- The $SYS/broker/heap/# messages now no longer include "bytes" as part of the
+  string for ease of use.
+
+Client library:
+- Free memory used by OpenSSL in mosquitto_lib_cleanup() where possible.
+- Change WebSocket subprotocol name to mqttv3.1 to make future changes easier
+  and for compatibility with other implementations.
+- mosquitto_loop_read() and mosquitto_loop_write() now handle errors
+  themselves rather than having mosquitto_loop() handle their errors. This
+  makes using them in a separate event loop more straightforward.
+- Add mosquitto_loop_forever() / loop_forever() function call to make simple
+  clients easier.
+- Disable SSL compression. This reduces memory usage significantly and removes
+  the possibility of CRIME type attacks.
+- Enable SSL_MODE_RELEASE_BUFFERS mode to reduce SSL memory usage further.
+- mosquitto_tls_set() will now return an error or raise an exception
+  immediately if the CA certificate or client certificate/key cannot be
+  accessed.
+- Fix potential memory leaks on connection failures.
+- Don't produce return error from mosquitto_loop() if a system call is
+  interrupted. This prevents disconnects/reconnects in threaded mode and
+  simplifies non-threaded client handling.
+- Ignore SIGPIPE to prevent unnecessary client quits in threaded mode.
+- Fix document error for mosquitto_message_retry_set().
+- Fix mosquitto_topic_matches_sub() for subscriptions with + as the final
+  character. Fixes bug #1085797.
+- Rename all "obj" parameters to "userdata" for consistency with other
+  libraries.
+- Reset errno before network read/write to ensure EAGAIN isn't mistakenly
+  returned.
+- The message queue length is now tracked and used to determine the maximum
+  number of packets to process at once. This removes the need for the
+  max_packets parameter which is now unused.
+- Fix incorrect error value in Python error_string() function. Fixes bug
+  #1086777.
+- Reset last message in/out timer in Python module when we send a PINGREQ.
+  Fixes too-early disconnects.
+
+Clients:
+- Clients now display their own version number and library version number in
+  their help messages.
+- Fix "mosquitto_pub -l -q 2" disconnecting before all messages were
+  transmitted.
+- Fix potential out-of-bounds array access with client ids. Fixes bug
+  #1083182.
+
+Other:
+- mosquitto_passwd can now convert password files with plain text files to
+  hashed versions.
+
+1.0.5 - 20121103
+================
+
+Broker:
+- Fix crash when the broker has use_identity_as_username set to true but a
+  client connects without a certificate.
+- mosquitto_passwd should only be installed if WITH_TLS=yes.
+
+Library:
+- Use symbolic errno values rather than numbers in Python module to avoid
+  cross platform issues (incorrect errno on Mac OS).
+
+Other:
+- Build script fixes for FreeBSD.
+
+1.0.4 - 20121017
+================
+
+Broker:
+- Deal with poll() POLLIN/POLLOUT before POLL[RD]HUP to correctly handle the
+  case where a client sends data and immediately closes its socket.
+
+Library:
+- Fix memory leak with messages of QoS=2. Fixes bug #1064981.
+- Fix potential thread synchronisation problem with outgoing packets in the
+  Python module. Fixes bug #1064977.
+
+Clients:
+- Fix "mosquitto_sub -l" incorrectly only sending one message per second.
+
+1.0.3 - 20120927
+================
+
+Broker:
+- Fix loading of psk files.
+- Don't return an error when reloading config if an ACL file isn't defined.
+  This was preventing psk files being reloaded.
+- Clarify meaning of $SYS/broker/clients/total in mosquitto(8) man page.
+- Clarify meaning of $SYS/broker/messages/stored in mosquitto(8) man page.
+- Fix non-retained message delivery when subscribing to #.
+- Fix retained message delivery for subs to foo/# with retained messages at
+  foo.
+- Include the filename in password/acl file loading errors.
+
+Library:
+- Fix possible AttributeError when self._sock == None in Python module.
+- Fix reconnecting after a timeout in Python module.
+- Fix reconnecting when there were outgoing packets in the queue in the Python
+  module.
+- Fix problem with mutex initialisation causing crashes on some Windows
+  installations.
+
+1.0.2 - 20120919
+================
+
+Broker:
+- If the broker was configured for persistence, a durable client had a
+  subscription to topics in $SYS/# and had messages in its queue when the
+  broker restarted, then the persistent database would have messages missing
+  and so the broker would not restart properly. This has been fixed.
+
+Library:
+- Fix threading problem on some systems.
+
+Tests:
+- Close socket after 08-ssl-connect-no-auth-wrong-ca.py test to prevent
+  subsequent tests having problems.
+
+Build scripts:
+- Install pskfile.example in CMake. Fixes bug #1037504.
+
+Other:
+- Fix db_dump parameter printing message store and sub chunks.
+
+1.0.1 - 20120815
+================
+
+Broker:
+- Fix default log_dest when running as a Windows service.
+
+Client library:
+- Fix incorrect parameters in Python on_log() callback call. Fixes bug
+  #1036818.
+
+Clients:
+- Clients now don't display TLS/TLS-PSK usage help if they don't support it.
+
+Build scripts:
+- Fix TLS-PSK support in the CMake build files.
+- Fix man page installation in the CMake build files.
+- Fix SYSCONFDIR in cmake on *nix when installing to /usr. Fixes bug #1036908.
+
+Documentation:
+- Fix mqtt/MQTT capitalisation in man pages.
+- Update compiling.txt.
+- Fix incorrect callback docs in mosquitto.py. Fixes bug #1036607.
+- Fix various doc typos and remove obsolete script. Fixes bug #1037088.
+
+1.0 - 20120814
+==============
+
+Broker:
+
+- Add SSL/TLS support.
+- Add TLS-PSK support, providing a simpler encryption method for constrained
+  devices.
+- Passwords are now salted+hashed if compiled with WITH_TLS (recommended).
+- Add mosquitto_passwd for handling password files.
+- Add $SYS/broker/publish/messages/{sent|received} to show the number of
+  PUBLISH messages sent/received.
+- Add $SYS/broker/publish/bytes/{sent|received} to show the number of
+  PUBLISH bytes sent/received.
+- Add reload parameter for security init/cleanup functions.
+- Add option for expiring disconnected persistent clients.
+- Add option for queueing of QoS 0 messages when persistent clients are
+  disconnected.
+- Enforce client id limits in the broker (only when WITH_STRICT_PROTOCOL is
+  defined).
+- Fix reloading of log configuration.
+- Add support for try_private config option for bridge connections.
+- Add support for autosave_on_changes config option.
+- Add support for include_dir config option.
+- Add support for topic remapping.
+- Usernames were being lost when a non clean-session client reconnected,
+  potentially causing problems with ACLs. This has been fixed.
+- Significant improvement to memory handling on Windows.
+- Bridges with outgoing topics will now set the retain flag correctly so that
+  messages will be retained on the remote broker.
+- Incoming bridge connections are now detected by checking if bit 8 of the
+  protocol version number is set. This requires support from the remote broker.
+- Add support for notification_topic option.
+- Add $SYS/broker/subscriptions/count and $SYS/broker/retained messages/count.
+- Add restart_timeout to control the amount of time an automatic bridge will
+  wait before reconnecting.
+- Overlapping subscriptions are now handled properly. Fixes bug #928538.
+- Fix reloading of persistence_file and persistence_location.
+- Fix broker crash on incorrect protocol number.
+- Fix missing COMPAT_ECONNRESET define on Windows.
+- Clients that had disconnected were not always being detected immediately on
+  Linux. This has been fixed.
+- Don't save $SYS messages to the on-disk persistent db. All $SYS messages
+  should be reconstructed on a restart. This means bridge connection
+  notifications will now be correct on a restart.
+- Fix reloading of bridge clients from the persistent db. This means that
+  outgoing bridged topics should always work.
+- Local bridges are now no longer restricted by local ACLs.
+- Discard publish messages with zero length topics.
+- Drop to "mosquitto" user even if no config file specified.
+- Don't incorrectly allow topic access if ACL patterns but no normal ACL rules
+  are defined.
+
+Client library:
+
+- Add SSL/TLS support.
+- Add TLS-PSK support, providing a simpler encryption method for constrained
+  devices.
+- Add javascript/websockets client library.
+- Add "struct mosquitto *mosq" parameter for all callbacks in the client
+  library. This is a binary incompatible change so the soversion of the
+  libraries has been incremented. The new parameter should make it easier to
+  use callbacks in practice.
+- Add mosquitto_want_write() for use when using own select() loop with
+  mosquitto_socket().
+- Add mosquitto_connect_async() to provide a non-blocking connect client call.
+- Add mosquitto_user_data_set() to allow user data pointer to be updated.
+- Add "int rc" parameter to disconnect callback to indicate whether disconnect
+  was unexpected or the result of calling mosquitto_disconnect().
+- Add mosquitto_strerror() for obtaining a string description of error numbers.
+- Add mosquitto_connack_string() for obtaining a string description of MQTT
+  connection results.
+- Add mosquitto_will_clear() and change mosquitto_will_set() to only set the
+  will.
+- Add mosquitto_sub_topic_tokenise() and mosquitto_sub_topic_tokens_free()
+  utility functions to tokenise a subscription/topic string into a string
+  array.
+- Add mosquitto_topic_matches_sub() to check whether a topic matches a
+  subscription.
+- Replaced mosquitto_log_init() with mosquitto_log_callback_set() to allow
+  clients to decide what to do with log messages.
+- Client will now disconnect itself from the broker if it doesn't receive a
+  PINGRESP in the keepalive period after sending a PINGREQ.
+- Client will now send a PINGREQ if it has not received a message from the
+  broker in keepalive seconds.
+- mosquitto_new() will now generate a random client id if the id parameter is
+  NULL.
+- Added max_packets to mosquitto_loop(), mosquitto_loop_read() and
+  mosquitto_loop_write() to control the maximum number of packets that are
+  handled per call.
+- Payload parameters are now void * instead of uint8_t *.
+- The clean_session parameter has been moved from mosquitto_connect() to
+  mosquitto_new() because it is a client parameter rather than a connection
+  parameter.
+- Functions now use int instead of uint*_t where possible.
+- mosquitto_new() now sets errno to indicate failure type.
+- Return MOSQ_ERR_INVAL on zero length topic.
+- Fix automatic client id generation on Windows.
+- mosquitto_loop_misq() can now return MOSQ_ERR_NO_CONN.
+- Compile static library as well as dynamic library with default makefiles.
+- Rename C++ namespace from mosquittopp to mosqpp to remove ambiguity.
+- C++ lib_init(), lib_version() and lib_cleanup() are now in the mosqpp
+  namespace directly, not mosquittopp class members.
+- The Python library is now written in pure Python and so no longer depends on
+  libmosquitto. 
+- The Python library includes SSL/TLS support.
+- The Python library should now be compatible with Python 3.
+
+Other:
+
+- Fix db_dump reading of retained messages.
+- Add example of logging all messages to mysql.
+- Add C++ client example.
+- Fix potential buffer overflow in pub/sub clients.
+- Add "make binary" target that doesn't make documents.
+- Add "--help" arguments to pub/sub clients.
+- Fix building on Solaris.
+
 0.15 - 20120205
 ===============
 

=== added file 'LICENSE-3rd-party.txt'
--- LICENSE-3rd-party.txt	1970-01-01 00:00:00 +0000
+++ LICENSE-3rd-party.txt	2013-08-24 09:38:26 +0000
@@ -0,0 +1,666 @@
+============================================================================
+uthash.h license
+============================================================================
+
+Copyright (c) 2005-2010, Troy D. Hanson    http://uthash.sourceforge.net
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+============================================================================
+OpenSSL license
+============================================================================
+
+  LICENSE ISSUES
+  ==============
+
+  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+  the OpenSSL License and the original SSLeay license apply to the toolkit.
+  See below for the actual license texts. Actually both licenses are BSD-style
+  Open Source licenses. In case of any license issues related to OpenSSL
+  please contact [e-mail].
+
+  OpenSSL License
+  ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    [e-mail].
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * ([e-mail]).  This product includes software written by Tim
+ * Hudson ([e-mail]).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young ([e-mail])
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young ([e-mail]).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson ([e-mail]).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young ([e-mail])"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson ([e-mail])"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+
+
+============================================================================
+pthreads-win32 license
+============================================================================
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+

+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+

+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+

+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+

+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+

+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+

+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+

+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+

+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+

+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+

=== added file 'LICENSE.txt'
--- LICENSE.txt	1970-01-01 00:00:00 +0000
+++ LICENSE.txt	2013-08-24 09:38:26 +0000
@@ -0,0 +1,54 @@
+Copyright (c) 2009-2012 Roger Light <[e-mail]>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of mosquitto nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+
+
+
+
+uthash.h license:
+
+Copyright (c) 2005-2010, Troy D. Hanson    http://uthash.sourceforge.net
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

=== modified file 'Makefile'
--- Makefile	2012-02-07 23:21:39 +0000
+++ Makefile	2013-08-24 09:38:26 +0000
@@ -1,53 +1,62 @@
 include config.mk
 
-DIRS=lib client src man
+DIRS=lib client src
+DOCDIRS=man
 DISTDIRS=man
 
-.PHONY : all mosquitto clean reallyclean install uninstall dist sign copy
-
-all : mosquitto
+.PHONY : all mosquitto docs binary clean reallyclean test install uninstall dist sign copy
+
+all : mosquitto docs
+
+docs :
+	set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d}; done
+
+binary : mosquitto
 
 mosquitto :
-	for d in ${DIRS}; do $(MAKE) -C $${d}; done
+	set -e; for d in ${DIRS}; do $(MAKE) -C $${d}; done
 
 clean :
-	for d in ${DIRS}; do $(MAKE) -C $${d} clean; done
+	set -e; for d in ${DIRS}; do $(MAKE) -C $${d} clean; done
+	set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} clean; done
+	$(MAKE) -C test clean
 
 reallyclean : 
-	for d in ${DIRS}; do $(MAKE) -C $${d} reallyclean; done
+	set -e; for d in ${DIRS}; do $(MAKE) -C $${d} reallyclean; done
+	set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} reallyclean; done
+	$(MAKE) -C test reallyclean
 	-rm -f *.orig
 
+test : mosquitto
+	$(MAKE) -C test test
+
 install : mosquitto
-	@for d in ${DIRS}; do $(MAKE) -C $${d} install; done
+	set -e; for d in ${DIRS}; do $(MAKE) -C $${d} install; done
+	set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} install; done
 	$(INSTALL) -d ${DESTDIR}/etc/mosquitto
-	$(INSTALL) -m 644 mosquitto.conf ${DESTDIR}/etc/mosquitto/mosquitto.conf
+	$(INSTALL) -m 644 mosquitto.conf ${DESTDIR}/etc/mosquitto/mosquitto.conf.example
 	$(INSTALL) -m 644 aclfile.example ${DESTDIR}/etc/mosquitto/aclfile.example
 	$(INSTALL) -m 644 pwfile.example ${DESTDIR}/etc/mosquitto/pwfile.example
-	$(INSTALL) -d ${DESTDIR}/etc/apparmor.d
-	$(INSTALL) -m 644 security/mosquitto.apparmor ${DESTDIR}/etc/apparmor.d/usr.sbin.mosquitto
+	$(INSTALL) -m 644 pskfile.example ${DESTDIR}/etc/mosquitto/pskfile.example
 
 uninstall :
-	@for d in ${DIRS}; do $(MAKE) -C $${d} uninstall; done
+	set -e; for d in ${DIRS}; do $(MAKE) -C $${d} uninstall; done
+	rm -f ${DESTDIR}/etc/mosquitto/mosquitto.conf
+	rm -f ${DESTDIR}/etc/mosquitto/aclfile.example
+	rm -f ${DESTDIR}/etc/mosquitto/pwfile.example
+	rm -f ${DESTDIR}/etc/mosquitto/pskfile.example
 
 dist : reallyclean
-	@for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done
+	set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done
 	
+	echo $(hg log -r . --template "{node}") > changeset
 	mkdir -p dist/mosquitto-${VERSION}
-	cp -r client installer lib logo man misc security service src ChangeLog.txt CMakeLists.txt COPYING Makefile compiling.txt config.h config.mk external_security_checks.txt readme.txt readme-windows.txt mosquitto.conf aclfile.example pwfile.example dist/mosquitto-${VERSION}/
+	cp -r client changeset examples installer lib logo man misc security service src test ChangeLog.txt CMakeLists.txt LICENSE.txt LICENSE-3rd-party.txt Makefile compiling.txt config.h config.mk readme.txt readme-windows.txt mosquitto.conf aclfile.example pskfile.example pwfile.example dist/mosquitto-${VERSION}/
 	cd dist; tar -zcf mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}/
-	for m in libmosquitto.3 mosquitto.8 mosquitto.conf.5 mosquitto_pub.1 mosquitto_sub.1 mqtt.7; \
+	set -e; for m in man/*.xml; \
 		do \
-		hfile=$$(echo $${m} | sed -e 's/\./-/g'); \
-		man2html man/$${m} > dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?8+mosquitto#mosquitto-8.html#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?3+libmosquitto#libmosquitto-3.html#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?5+mosquitto.conf#mosquitto-conf-5.html#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?1+mosquitto_pub#mosquitto_pub-1.html#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?1+mosquitto_sub#mosquitto_sub-1.html#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?7+mqtt#mqtt-7.html#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html?5+hosts_access#http://www.linuxmanpages.com/man5/hosts_access.5.php#' dist/$${hfile}.html; \
-		sed -i 's#http://localhost/cgi-bin/man/man2html#http://mosquitto.org/#' dist/$${hfile}.html; \
-		sed -i '1,2d' dist/$${hfile}.html; \
+		hfile=$$(echo $${m} | sed -e 's#man/\(.*\)\.xml#\1#' | sed -e 's/\./-/g'); \
+		$(XSLTPROC) $(DB_HTML_XSL) $${m} > dist/$${hfile}.html; \
 	done
 
 
@@ -55,7 +64,7 @@
 	cd dist; gpg --detach-sign -a mosquitto-${VERSION}.tar.gz
 
 copy : sign
-	cd dist; scp mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}.tar.gz.asc mosquitto:mosquitto.org/files/source/
-	cd dist; scp *.html mosquitto:mosquitto.org/man/
-	scp ChangeLog.txt mosquitto:mosquitto.org/
+	cd dist; scp mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}.tar.gz.asc mosquitto:site/mosquitto.org/files/source/
+	cd dist; scp *.html mosquitto:site/mosquitto.org/man/
+	scp ChangeLog.txt mosquitto:site/mosquitto.org/
 

=== modified file 'aclfile.example'
--- aclfile.example	2011-05-01 20:12:51 +0000
+++ aclfile.example	2013-08-24 09:38:26 +0000
@@ -1,3 +1,9 @@
+# This affects access control for clients with no username.
 topic read $SYS/#
+
+# This only affects clients with username "roger".
 user roger
 topic foo/bar
+
+# This affects all clients.
+pattern write $SYS/broker/connection/%c/state

=== added file 'changeset'
--- changeset	1970-01-01 00:00:00 +0000
+++ changeset	2013-08-24 09:38:26 +0000
@@ -0,0 +1,1 @@
+

=== modified file 'client/Makefile'
--- client/Makefile	2011-07-25 22:24:52 +0000
+++ client/Makefile	2013-08-24 09:38:26 +0000
@@ -1,20 +1,22 @@
-CC=cc
-CFLAGS=-I../lib -Wall -ggdb
-LDFLAGS=-L../lib ../lib/libmosquitto.so.0
-INSTALL=install
-prefix=/usr
+include ../config.mk
 
-.PHONY: all install uninstall clean
+.PHONY: all install uninstall reallyclean clean
 
 all : mosquitto_pub mosquitto_sub
 
-mosquitto_pub : pub_client.o ../lib/libmosquitto.so.0
-	${CC} $< -o $@ ${LDFLAGS}
-
-mosquitto_sub : sub_client.o ../lib/libmosquitto.so.0
-	${CC} $< -o $@ ${LDFLAGS}
-
-../lib/libmosquitto.so.0 :
+mosquitto_pub : pub_client.o ../lib/libmosquitto.so.${SOVERSION}
+	${CC} $< -o $@ ${CLIENT_LDFLAGS}
+
+mosquitto_sub : sub_client.o ../lib/libmosquitto.so.${SOVERSION}
+	${CC} $< -o $@ ${CLIENT_LDFLAGS}
+
+pub_client.o : pub_client.c ../lib/libmosquitto.so.${SOVERSION}
+	${CC} -c $< -o $@ ${CLIENT_CFLAGS}
+
+sub_client.o : sub_client.c ../lib/libmosquitto.so.${SOVERSION}
+	${CC} -c $< -o $@ ${CLIENT_CFLAGS}
+
+../lib/libmosquitto.so.${SOVERSION} :
 	$(MAKE) -C ../lib
 
 install : all
@@ -26,5 +28,7 @@
 	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_pub
 	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_sub
 
+reallyclean : clean
+
 clean : 
 	-rm -f *.o mosquitto_pub mosquitto_sub

=== modified file 'client/pub_client.c'
--- client/pub_client.c	2012-02-07 23:21:39 +0000
+++ client/pub_client.c	2013-08-24 09:38:26 +0000
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2012 Roger Light <[e-mail]>
+Copyright (c) 2009-2013 Roger Light <[e-mail]>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,10 @@
 
 #define STATUS_CONNECTING 0
 #define STATUS_CONNACK_RECVD 1
+#define STATUS_WAITING 2
 
+/* Global variables for use in callbacks. See sub_client.c for an example of
+ * using a struct to hold variables for use in callbacks. */
 static char *topic = NULL;
 static char *message = NULL;
 static long msglen = 0;
@@ -60,16 +63,16 @@
 static int retain = 0;
 static int mode = MSGMODE_NONE;
 static int status = STATUS_CONNECTING;
-static uint16_t mid_sent = 0;
+static int mid_sent = 0;
+static int last_mid = -1;
 static bool connected = true;
 static char *username = NULL;
 static char *password = NULL;
 static bool disconnect_sent = false;
 static bool quiet = false;
 
-void my_connect_callback(void *obj, int result)
+void my_connect_callback(struct mosquitto *mosq, void *obj, int result)
 {
-	struct mosquitto *mosq = obj;
 	int rc = MOSQ_ERR_SUCCESS;
 
 	if(!result){
@@ -77,7 +80,7 @@
 			case MSGMODE_CMD:
 			case MSGMODE_FILE:
 			case MSGMODE_STDIN_FILE:
-				rc = mosquitto_publish(mosq, &mid_sent, topic, msglen, (uint8_t *)message, qos, retain);
+				rc = mosquitto_publish(mosq, &mid_sent, topic, msglen, message, qos, retain);
 				break;
 			case MSGMODE_NULL:
 				rc = mosquitto_publish(mosq, &mid_sent, topic, 0, NULL, qos, retain);
@@ -109,44 +112,35 @@
 			mosquitto_disconnect(mosq);
 		}
 	}else{
-		switch(result){
-			case 1:
-				if(!quiet) fprintf(stderr, "Connection Refused: unacceptable protocol version\n");
-				break;
-			case 2:
-				if(!quiet) fprintf(stderr, "Connection Refused: identifier rejected\n");
-				break;
-			case 3:
-				if(!quiet) fprintf(stderr, "Connection Refused: broker unavailable\n");
-				break;
-			case 4:
-				if(!quiet) fprintf(stderr, "Connection Refused: bad user name or password\n");
-				break;
-			case 5:
-				if(!quiet) fprintf(stderr, "Connection Refused: not authorised\n");
-				break;
-			default:
-				if(!quiet) fprintf(stderr, "Connection Refused: unknown reason\n");
-				break;
+		if(result && !quiet){
+			fprintf(stderr, "%s\n", mosquitto_connack_string(result));
 		}
 	}
 }
 
-void my_disconnect_callback(void *obj)
+void my_disconnect_callback(struct mosquitto *mosq, void *obj, int rc)
 {
 	connected = false;
 }
 
-void my_publish_callback(void *obj, uint16_t mid)
+void my_publish_callback(struct mosquitto *mosq, void *obj, int mid)
 {
-	struct mosquitto *mosq = obj;
-
-	if(mode != MSGMODE_STDIN_LINE && disconnect_sent == false){
+	if(mode == MSGMODE_STDIN_LINE){
+		if(mid == last_mid){
+			mosquitto_disconnect(mosq);
+			disconnect_sent = true;
+		}
+	}else if(disconnect_sent == false){
 		mosquitto_disconnect(mosq);
 		disconnect_sent = true;
 	}
 }
 
+void my_log_callback(struct mosquitto *mosq, void *obj, int level, const char *str)
+{
+	printf("%s\n", str);
+}
+
 int load_stdin(void)
 {
 	long pos = 0, rlen;
@@ -215,12 +209,27 @@
 
 void print_usage(void)
 {
-	printf("mosquitto_pub is a simple mqtt client that will publish a message on a single topic and exit.\n\n");
+	int major, minor, revision;
+
+	mosquitto_lib_version(&major, &minor, &revision);
+	printf("mosquitto_pub is a simple mqtt client that will publish a message on a single topic and exit.\n");
+	printf("mosquitto_pub version %s running on libmosquitto %d.%d.%d.\n\n", VERSION, major, minor, revision);
 	printf("Usage: mosquitto_pub [-h host] [-p port] [-q qos] [-r] {-f file | -l | -n | -m message} -t topic\n");
+	printf("                     [-A bind_address]\n");
 	printf("                     [-i id] [-I id_prefix]\n");
 	printf("                     [-d] [--quiet]\n");
+	printf("                     [-M max_inflight]\n");
 	printf("                     [-u username [-P password]]\n");
-	printf("                     [--will-topic [--will-payload payload] [--will-qos qos] [--will-retain]]\n\n");
+	printf("                     [--will-topic [--will-payload payload] [--will-qos qos] [--will-retain]]\n");
+#ifdef WITH_TLS
+	printf("                     [{--cafile file | --capath dir} [--cert file] [--key file] [--insecure]]\n");
+#ifdef WITH_TLS_PSK
+	printf("                     [--psk hex-key --psk-identity identity]\n");
+#endif
+#endif
+	printf("       mosquitto_pub --help\n\n");
+	printf(" -A : bind the outgoing socket to this host/ip address. Use to control which interface\n");
+	printf("      the client communicates over.\n");
 	printf(" -d : enable debug messages.\n");
 	printf(" -f : send the contents of a file as the message.\n");
 	printf(" -h : mqtt host to connect to. Defaults to localhost.\n");
@@ -229,6 +238,7 @@
 	printf("      broker is using the clientid_prefixes option.\n");
 	printf(" -l : read messages from stdin, sending a separate message for each line.\n");
 	printf(" -m : message payload to send.\n");
+	printf(" -M : the maximum inflight messages for QoS 1/2..\n");
 	printf(" -n : send a null (zero length) message.\n");
 	printf(" -p : network port to connect to. Defaults to 1883.\n");
 	printf(" -q : quality of service level to use for all messages. Defaults to 0.\n");
@@ -237,6 +247,7 @@
 	printf(" -t : mqtt topic to publish to.\n");
 	printf(" -u : provide a username (requires MQTT 3.1 broker)\n");
 	printf(" -P : provide a password (requires MQTT 3.1 broker)\n");
+	printf(" --help : display this message.\n");
 	printf(" --quiet : don't print error messages.\n");
 	printf(" --will-payload : payload for the client Will, which is sent by the broker in case of\n");
 	printf("                  unexpected disconnection. If not given and will-topic is set, a zero\n");
@@ -244,6 +255,24 @@
 	printf(" --will-qos : QoS level for the client Will.\n");
 	printf(" --will-retain : if given, make the client Will retained.\n");
 	printf(" --will-topic : the topic on which to publish the client Will.\n");
+#ifdef WITH_TLS
+	printf(" --cafile : path to a file containing trusted CA certificates to enable encrypted\n");
+	printf("            communication.\n");
+	printf(" --capath : path to a directory containing trusted CA certificates to enable encrypted\n");
+	printf("            communication.\n");
+	printf(" --cert : client certificate for authentication, if required by server.\n");
+	printf(" --key : client private key for authentication, if required by server.\n");
+	printf(" --tls-version : TLS protocol version, can be one of tlsv1.2 tlsv1.1 or tlsv1.\n");
+	printf("                 Defaults to tlsv1.2 if available.\n");
+	printf(" --insecure : do not check that the server certificate hostname matches the remote\n");
+	printf("              hostname. Using this option means that you cannot be sure that the\n");
+	printf("              remote host is the server you wish to connect to and so is insecure.\n");
+	printf("              Do not use this option in a production environment.\n");
+#ifdef WITH_TLS_PSK
+	printf(" --psk : pre-shared-key in hexadecimal (no leading 0x) to enable TLS-PSK mode.\n");
+	printf(" --psk-identity : client identity string for TLS-PSK mode.\n");
+#endif
+#endif
 	printf("\nSee http://mosquitto.org/ for more information.\n\n");
 }
 
@@ -254,22 +283,34 @@
 	int i;
 	char *host = "localhost";
 	int port = 1883;
+	char *bind_address = NULL;
 	int keepalive = 60;
-	int opt;
 	char buf[1024];
 	bool debug = false;
 	struct mosquitto *mosq = NULL;
 	int rc;
 	int rc2;
-	char hostname[21];
+	char hostname[256];
 	char err[1024];
+	int len;
+	unsigned int max_inflight = 20;
 
-	uint8_t *will_payload = NULL;
+	char *will_payload = NULL;
 	long will_payloadlen = 0;
 	int will_qos = 0;
 	bool will_retain = false;
 	char *will_topic = NULL;
 
+	bool insecure = false;
+	char *cafile = NULL;
+	char *capath = NULL;
+	char *certfile = NULL;
+	char *keyfile = NULL;
+	char *tls_version = NULL;
+
+	char *psk = NULL;
+	char *psk_identity = NULL;
+
 	for(i=1; i<argc; i++){
 		if(!strcmp(argv[i], "-p") || !strcmp(argv[i], "--port")){
 			if(i==argc-1){
@@ -285,6 +326,42 @@
 				}
 			}
 			i++;
+		}else if(!strcmp(argv[i], "-A")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: -A argument given but no address specified.\n\n");
+				print_usage();
+				return 1;
+			}else{
+				bind_address = argv[i+1];
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--cafile")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --cafile argument given but no file specified.\n\n");
+				print_usage();
+				return 1;
+			}else{
+				cafile = argv[i+1];
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--capath")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --capath argument given but no directory specified.\n\n");
+				print_usage();
+				return 1;
+			}else{
+				capath = argv[i+1];
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--cert")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --cert argument given but no file specified.\n\n");
+				print_usage();
+				return 1;
+			}else{
+				certfile = argv[i+1];
+			}
+			i++;
 		}else if(!strcmp(argv[i], "-d") || !strcmp(argv[i], "--debug")){
 			debug = true;
 		}else if(!strcmp(argv[i], "-f") || !strcmp(argv[i], "--file")){
@@ -300,6 +377,9 @@
 				if(load_file(argv[i+1])) return 1;
 			}
 			i++;
+		}else if(!strcmp(argv[i], "--help")){
+			print_usage();
+			return 0;
 		}else if(!strcmp(argv[i], "-h") || !strcmp(argv[i], "--host")){
 			if(i==argc-1){
 				fprintf(stderr, "Error: -h argument given but no host specified.\n\n");
@@ -309,6 +389,8 @@
 				host = argv[i+1];
 			}
 			i++;
+		}else if(!strcmp(argv[i], "--insecure")){
+			insecure = true;
 		}else if(!strcmp(argv[i], "-i") || !strcmp(argv[i], "--id")){
 			if(id_prefix){
 				fprintf(stderr, "Error: -i and -I argument cannot be used together.\n\n");
@@ -337,6 +419,15 @@
 				id_prefix = argv[i+1];
 			}
 			i++;
+		}else if(!strcmp(argv[i], "--key")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --key argument given but no file specified.\n\n");
+				print_usage();
+				return 1;
+			}else{
+				keyfile = argv[i+1];
+			}
+			i++;
 		}else if(!strcmp(argv[i], "-l") || !strcmp(argv[i], "--stdin-line")){
 			if(mode != MSGMODE_NONE){
 				fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
@@ -344,13 +435,6 @@
 				return 1;
 			}else{
 				mode = MSGMODE_STDIN_LINE;
-#ifndef WIN32
-				opt = fcntl(fileno(stdin), F_GETFL, 0);
-				if(opt == -1 || fcntl(fileno(stdin), F_SETFL, opt | O_NONBLOCK) == -1){
-					fprintf(stderr, "Error: Unable to set stdin to non-blocking.\n");
-					return 1;
-				}
-#endif
 			}
 		}else if(!strcmp(argv[i], "-m") || !strcmp(argv[i], "--message")){
 			if(mode != MSGMODE_NONE){
@@ -367,6 +451,15 @@
 				mode = MSGMODE_CMD;
 			}
 			i++;
+		}else if(!strcmp(argv[i], "-M")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: -M argument given but max_inflight not specified.\n\n");
+				print_usage();
+				return 1;
+			}else{
+				max_inflight = atoi(argv[i+1]);
+			}
+			i++;
 		}else if(!strcmp(argv[i], "-n") || !strcmp(argv[i], "--null-message")){
 			if(mode != MSGMODE_NONE){
 				fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n");
@@ -375,6 +468,24 @@
 			}else{
 				mode = MSGMODE_NULL;
 			}
+		}else if(!strcmp(argv[i], "--psk")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --psk argument given but no key specified.\n\n");
+				print_usage();
+				return 1;
+			}else{
+				psk = argv[i+1];
+			}
+			i++;
+		}else if(!strcmp(argv[i], "--psk-identity")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --psk-identity argument given but no identity specified.\n\n");
+				print_usage();
+				return 1;
+			}else{
+				psk_identity = argv[i+1];
+			}
+			i++;
 		}else if(!strcmp(argv[i], "-q") || !strcmp(argv[i], "--qos")){
 			if(i==argc-1){
 				fprintf(stderr, "Error: -q argument given but no QoS specified.\n\n");
@@ -410,6 +521,15 @@
 				topic = argv[i+1];
 			}
 			i++;
+		}else if(!strcmp(argv[i], "--tls-version")){
+			if(i==argc-1){
+				fprintf(stderr, "Error: --tls-version argument given but no version specified.\n\n");
+				print_usage();
+				return 1;
+			}else{
+				tls_version = argv[i+1];
+			}
+			i++;
 		}else if(!strcmp(argv[i], "-u") || !strcmp(argv[i], "--username")){
 			if(i==argc-1){
 				fprintf(stderr, "Error: -u argument given but no username specified.\n\n");
@@ -434,8 +554,8 @@
 				print_usage();
 				return 1;
 			}else{
-				will_payload = (uint8_t *)argv[i+1];
-				will_payloadlen = strlen((char *)will_payload);
+				will_payload = argv[i+1];
+				will_payloadlen = strlen(will_payload);
 			}
 			i++;
 		}else if(!strcmp(argv[i], "--will-qos")){
@@ -468,23 +588,6 @@
 			return 1;
 		}
 	}
-	if(id_prefix){
-		id = malloc(strlen(id_prefix)+10);
-		if(!id){
-			if(!quiet) fprintf(stderr, "Error: Out of memory.\n");
-			return 1;
-		}
-		snprintf(id, strlen(id_prefix)+10, "%s%d", id_prefix, getpid());
-	}else if(!id){
-		id = malloc(30);
-		if(!id){
-			if(!quiet) fprintf(stderr, "Error: Out of memory.\n");
-			return 1;
-		}
-		memset(hostname, 0, 21);
-		gethostname(hostname, 20);
-		snprintf(id, 23, "mosq_pub_%d_%s", getpid(), hostname);
-	}
 
 	if(!topic || mode == MSGMODE_NONE){
 		fprintf(stderr, "Error: Both topic and message must be supplied.\n");
@@ -505,30 +608,100 @@
 	if(password && !username){
 		if(!quiet) fprintf(stderr, "Warning: Not using password since username not set.\n");
 	}
+	if((certfile && !keyfile) || (keyfile && !certfile)){
+		fprintf(stderr, "Error: Both certfile and keyfile must be provided if one of them is.\n");
+		print_usage();
+		return 1;
+	}
+	if((cafile || capath) && psk){
+		if(!quiet) fprintf(stderr, "Error: Only one of --psk or --cafile/--capath may be used at once.\n");
+		return 1;
+	}
+	if(psk && !psk_identity){
+		if(!quiet) fprintf(stderr, "Error: --psk-identity required if --psk used.\n");
+		return 1;
+	}
+
 	mosquitto_lib_init();
-	mosq = mosquitto_new(id, NULL);
+
+	if(id_prefix){
+		id = malloc(strlen(id_prefix)+10);
+		if(!id){
+			if(!quiet) fprintf(stderr, "Error: Out of memory.\n");
+			mosquitto_lib_cleanup();
+			return 1;
+		}
+		snprintf(id, strlen(id_prefix)+10, "%s%d", id_prefix, getpid());
+	}else if(!id){
+		hostname[0] = '\0';
+		gethostname(hostname, 256);
+		hostname[255] = '\0';
+		len = strlen("mosqpub/-") + 6 + strlen(hostname);
+		id = malloc(len);
+		if(!id){
+			if(!quiet) fprintf(stderr, "Error: Out of memory.\n");
+			mosquitto_lib_cleanup();
+			return 1;
+		}
+		snprintf(id, len, "mosqpub/%d-%s", getpid(), hostname);
+		if(strlen(id) > MOSQ_MQTT_ID_MAX_LENGTH){
+			/* Enforce maximum client id length of 23 characters */
+			id[MOSQ_MQTT_ID_MAX_LENGTH] = '\0';
+		}
+	}
+
+	mosq = mosquitto_new(id, true, NULL);
 	if(!mosq){
-		if(!quiet) fprintf(stderr, "Error: Out of memory.\n");
+		switch(errno){
+			case ENOMEM:
+				if(!quiet) fprintf(stderr, "Error: Out of memory.\n");
+				break;
+			case EINVAL:
+				if(!quiet) fprintf(stderr, "Error: Invalid id.\n");
+				break;
+		}
+		mosquitto_lib_cleanup();
 		return 1;
 	}
 	if(debug){
-		mosquitto_log_init(mosq, MOSQ_LOG_DEBUG | MOSQ_LOG_ERR | MOSQ_LOG_WARNING
-				| MOSQ_LOG_NOTICE | MOSQ_LOG_INFO, MOSQ_LOG_STDERR);
+		mosquitto_log_callback_set(mosq, my_log_callback);
 	}
-	if(will_topic && mosquitto_will_set(mosq, true, will_topic, will_payloadlen, will_payload, will_qos, will_retain)){
+	if(will_topic && mosquitto_will_set(mosq, will_topic, will_payloadlen, will_payload, will_qos, will_retain)){
 		if(!quiet) fprintf(stderr, "Error: Problem setting will.\n");
+		mosquitto_lib_cleanup();
 		return 1;
 	}
 	if(username && mosquitto_username_pw_set(mosq, username, password)){
 		if(!quiet) fprintf(stderr, "Error: Problem setting username and password.\n");
-		return 1;
-	}
-
+		mosquitto_lib_cleanup();
+		return 1;
+	}
+	if((cafile || capath) && mosquitto_tls_set(mosq, cafile, capath, certfile, keyfile, NULL)){
+		if(!quiet) fprintf(stderr, "Error: Problem setting TLS options.\n");
+		mosquitto_lib_cleanup();
+		return 1;
+	}
+	if(insecure && mosquitto_tls_insecure_set(mosq, true)){
+		if(!quiet) fprintf(stderr, "Error: Problem setting TLS insecure option.\n");
+		mosquitto_lib_cleanup();
+		return 1;
+	}
+	if(psk && mosquitto_tls_psk_set(mosq, psk, psk_identity, NULL)){
+		if(!quiet) fprintf(stderr, "Error: Problem setting TLS-PSK options.\n");
+		mosquitto_lib_cleanup();
+		return 1;
+	}
+	if(tls_version && mosquitto_tls_opts_set(mosq, 1, tls_version, NULL)){
+		if(!quiet) fprintf(stderr, "Error: Problem setting TLS options.\n");
+		mosquitto_lib_cleanup();
+		return 1;
+	}
+	mosquitto_max_inflight_messages_set(mosq, max_inflight);
 	mosquitto_connect_callback_set(mosq, my_connect_callback);
 	mosquitto_disconnect_callback_set(mosq, my_disconnect_callback);
 	mosquitto_publish_callback_set(mosq, my_publish_callback);
 
-	rc = mosquitto_connect(mosq, host, port, keepalive, true);
+	rc = mosquitto_connect_bind(mosq, host, port, keepalive, bind_address);
 	if(rc){
 		if(!quiet){
 			if(rc == MOSQ_ERR_ERRNO){
@@ -542,30 +715,57 @@
 				fprintf(stderr, "Unable to connect (%d).\n", rc);
 			}
 		}
+		mosquitto_lib_cleanup();
 		return rc;
 	}
 
+	if(mode == MSGMODE_STDIN_LINE){
+		mosquitto_loop_start(mosq);
+	}
+
 	do{
-		if(mode == MSGMODE_STDIN_LINE && status == STATUS_CONNACK_RECVD){
-			if(fgets(buf, 1024, stdin)){
-				buf[strlen(buf)-1] = '\0';
-				rc2 = mosquitto_publish(mosq, &mid_sent, topic, strlen(buf), (uint8_t *)buf, qos, retain);
-				if(rc2){
-					if(!quiet) fprintf(stderr, "Error: Publish returned %d, disconnecting.\n", rc2);
-					mosquitto_disconnect(mosq);
+		if(mode == MSGMODE_STDIN_LINE){
+			if(status == STATUS_CONNACK_RECVD){
+				if(fgets(buf, 1024, stdin)){
+					buf[strlen(buf)-1] = '\0';
+					rc2 = mosquitto_publish(mosq, &mid_sent, topic, strlen(buf), buf, qos, retain);
+					if(rc2){
+						if(!quiet) fprintf(stderr, "Error: Publish returned %d, disconnecting.\n", rc2);
+						mosquitto_disconnect(mosq);
+					}
+				}else if(feof(stdin)){
+					last_mid = mid_sent;
+					status = STATUS_WAITING;
 				}
-			}else if(feof(stdin) && disconnect_sent == false){
-				mosquitto_disconnect(mosq);
-				disconnect_sent = true;
+			}else if(status == STATUS_WAITING){
+#ifdef WIN32
+				Sleep(1000);
+#else
+				usleep(1000000);
+#endif
 			}
+			rc = MOSQ_ERR_SUCCESS;
+		}else{
+			rc = mosquitto_loop(mosq, -1, 1);
 		}
-		rc = mosquitto_loop(mosq, -1);
 	}while(rc == MOSQ_ERR_SUCCESS && connected);
 
+	if(mode == MSGMODE_STDIN_LINE){
+		mosquitto_loop_stop(mosq, false);
+	}
+
 	if(message && mode == MSGMODE_FILE){
 		free(message);
 	}
 	mosquitto_destroy(mosq);
 	mosquitto_lib_cleanup();
+
+	if(rc){
+		if(rc == MOSQ_ERR_ERRNO){
+			fprintf(stderr, "Error: %s\n", strerror(errno));
+		}else{
+			fprintf(stderr, "Error: %s\n", mosquitto_strerror(rc));
+		}
+	}
 	return rc;
 }

=== modified file 'client/sub_client.c'
--- client/sub_client.c	2012-02-07 23:21:39 +0000
+++ client/sub_client.c	2013-08-24 09:38:26 +0000
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009-2012 Roger Light <[e-mail]>
+Copyright (c) 2009-2013 Roger Light <[e-mail]>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -27,6 +27,7 @@
 POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,83 +42,105 @@
 
 #include <mosquitto.h>
 
-static char **topics = NULL;
-static int topic_count = 0;
-static int topic_qos = 0;
-static char *username = NULL;
-static char *password = NULL;
-int verbose = 0;
-bool quiet = false;
+/* This struct is used to pass data to callbacks.
+ * An instance "ud" is created in main() and populated, then passed to
+ * mosquitto_new(). */
+struct userdata {
+	char **topics;
+	int topic_count;
+	int topic_qos;
+	char *username;
+	char *password;
+	int verbose;
+	bool quiet;
+	bool no_retain;
+};
 
-void my_message_callback(void *obj, const struct mosquitto_message *message)
+void my_message_callback(struct mosquitto *mosq, void *obj, const struct mosquitto_message *message)
 {
-	if(verbose){
+	struct userdata *ud;
+
+	assert(obj);
+	ud = (struct userdata *)obj;
+
+	if(message->retain && ud->no_retain) return;
+
+	if(ud->verbose){
 		if(message->payloadlen){
-			printf("%s %s\n", message->topic, message->payload);
+			printf("%s %s\n", message->topic, (const char *)message->payload);
 		}else{
 			printf("%s (null)\n", message->topic);
 		}
 		fflush(stdout);
 	}else{
 		if(message->payloadlen){
-			printf("%s\n", message->payload);
+			printf("%s\n", (const char *)message->payload);
 			fflush(stdout);
 		}
 	}
 }
 
-void my_connect_callback(void *obj, int result)
+void my_connect_callback(struct mosquitto *mosq, void *obj, int result)
 {
-	struct mosquitto *mosq = obj;
-
 	int i;
+	struct userdata *ud;
+
+	assert(obj);
+	ud = (struct userdata *)obj;
+
 	if(!result){
-		for(i=0; i<topic_count; i++){
-			mosquitto_subscribe(mosq, NULL, topics[i], topic_qos);
+		for(i=0; i<ud->topic_count; i++){
+			mosquitto_subscribe(mosq, NULL, ud->topics[i], ud->topic_qos);
 		}
 	}else{
-		switch(result){
-			case 1:
-				if(!quiet) fprintf(stderr, "Connection Refused: unacceptable protocol version\n");
-				break;
-			case 2:
-				if(!quiet) fprintf(stderr, "Connection Refused: identifier rejected\n");
-				break;
-			case 3:
-				if(!quiet) fprintf(stderr, "Connection Refused: broker unavailable\n");
-				break;
-			case 4:
-				if(!quiet) fprintf(stderr, "Connection Refused: bad user name or password\n");
-				break;
-			case 5:
-				if(!quiet) fprintf(stderr, "Connection Refused: not authorised\n");
-				break;
-			default:
-				if(!quiet) fprintf(stderr, "Connection Refused: unknown reason\n");
-				break;
+		if(result && !ud->quiet){
+			fprintf(stderr, "%s\n", mosquitto_connack_string(result));
 		}
 	}
 }
 
-void my_subscribe_callback(void *obj, uint16_t mid, int qos_count, const uint8_t *granted_qos)
+void my_subscribe_callback(struct mosquitto *mosq, void *obj, int mid, int qos_count, const int *granted_qos)
 {
 	int i;
-
-	if(!quiet) printf("Subscribed (mid: %d): %d", mid, granted_qos[0]);
+	struct userdata *ud;
+
+	assert(obj);
+	ud = (struct userdata *)obj;
+
+	if(!ud->quiet) printf("Subscribed (mid: %d): %d", mid, granted_qos[0]);
 	for(i=1; i<qos_count; i++){
-		if(!quiet) printf(", %d", granted_qos[i]);
+		if(!ud->quiet) printf(", %d", granted_qos[i]);
 	}
-	if(!quiet) printf("\n");
+	if(!ud->quiet) printf("\n");
+}
+
+void my_log_callback(struct mosquitto *mosq, void *obj, int level, const char *str)
+{
+	printf("%s\n", str);
 }
 
 void print_usage(void)
 {
-	printf("mosquitto_sub is a simple mqtt client that will subscribe to a single topic and print all messages it receives.\n\n");
-	printf("Usage: mosquitto_sub [-c] [-h host] [-k keepalive] [-p port] [-q qos] [-v] -t topic ...\n");
+	int major, minor, revision;
+
+	mosquitto_lib_version(&major, &minor, &revision);
+	printf("mosquitto_sub is a simple mqtt client that will subscribe to a single topic and print all messages it receives.\n");
+	printf("mosquitto_sub version %s running on libmosquitto %d.%d.%d.\n\n", VERSION, major, minor, revision);
+	printf("Usage: mosquitto_sub [-c] [-h host] [-k keepalive] [-p port] [-q qos] [-R] [-v] -t topic ...\n");
+	printf("                     [-A bind_address]\n");
 	printf("                     [-i id] [-I id_prefix]\n");
 	printf("                     [-d] [--quiet]\n");
 	printf("                     [-u username [-P password]]\n");
-	printf("                     [--will-topic [--will-payload payload] [--will-qos qos] [--will-retain]]\n\n");
+	printf("                     [--will-topic [--will-payload payload] [--will-qos qos] [--will-retain]]\n");
+#ifdef WITH_TLS
+	printf("                     [{--cafile file | --capath dir} [--cert file] [--key file] [--insecure]]\n");
+#ifdef WITH_TLS_PSK
+	printf("                     [--psk hex-key --psk-identity identity]\n");
+#endif
+#endif
+	printf("       mosquitto_sub --help\n\n");
+	printf(" -A : bind the outgoing socket to this host/ip address. Use to control which interface\n");
+	printf("      the client communicates over.\n");
 	printf(" -c : disable 'clean session' (store subscription and pending messages when client disconnects).\n");
 	printf(" -d : enable debug messages.\n");
 	printf(" -h : mqtt host to connect to. Defaults to localhost.\n");
@@ -127,10 +150,12 @@
 	printf(" -k : keep alive in seconds for this client. Defaults to 60.\n");
 	printf(" -p : network port to connect to. Defaults to 1883.\n");
 	printf(" -q : quality of service level to use for the subscription. Defaults to 0.\n");
+	printf(" -R : do not print stale messages (those with retain set).\n");
 	printf(" -t : mqtt topic to subscribe to. May be repeated multiple times.\n");
 	printf(" -u : provide a username (requires MQTT 3.1 broker)\n");
 	printf(" -v : print published messages verbosely.\n");
 	printf(" -P : provide a password (requires MQTT 3.1 broker)\n");
+	printf(" --help : display this message.\n");
 	printf(" --quiet : don't print error messages.\n");
 	printf(" --will-payload : payload for the client Will, which is sent by the broker in case of\n");
 	printf("                  unexpected disconnection. If not given and will-topic is set, a zero\n");
@@ -138,6 +163,24 @@
 	printf(" --will-qos : QoS level for the client Will.\n");
 	printf(" --will-retain : if given, make the client Will retained.\n");
 	printf(" --will-topic : the topic on which to publish the client Will.\n");
+#ifdef WITH_TLS
+	printf(" --cafile : path to a file containing trusted CA certificates to enable encrypted\n");
+	printf("            certificate based communication.\n");
+	printf(" --capath : path to a directory containing trusted CA certificates to enable encrypted\n");
+	printf("            communication.\n");
+	printf(" --cert : client certificate for authentication, if required by server.\n");
+	printf(" --key : client private key for authentication, if required by server.\n");
+	printf(" --tls-version : TLS protocol version, can be one of tlsv1.2 tlsv1.1 or tlsv1.\n");
+	printf("                 Defaults to tlsv1.2 if available.\n");
+	printf(" --insecure : do not check that the server certificate hostname matches the remote\n");
+	printf("              hostname. Using this option means that you cannot be sure that the\n");
+	printf("              remote host is the server you wish to connect to and so is insecure.\n");
+	printf("              Do not use this option in a production environment.\n");
+#ifdef WITH_TLS_PSK
+	printf(" --psk : pre-shared-key in hexadecimal (no leading 0x) to enable TLS-PSK mode.\n");
+	printf(" --psk-identity : client identity string for TLS-PSK mode.\n");
+#endif
+#endif
 	printf("\nSee http://mosquitto.org/ for more information.\n\n");
 }
 
@@ -148,20 +191,35 @@
 	int i;
 	char *host = "localhost";
 	int port = 1883;
+	char *bind_address = NULL;
 	int keepalive = 60;
 	bool clean_session = true;
 	bool debug = false;