summaryrefslogtreecommitdiffstats
path: root/avahi-core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-10-24 22:41:39 +0000
committerLennart Poettering <lennart@poettering.net>2005-10-24 22:41:39 +0000
commitf17d2832301b0f2fcd50fdcc6fec77666178158f (patch)
tree1f221330303258df9897b794df536672c9ef3fd0 /avahi-core
parent71a48fcf258fbff06507d111b9c790a6d94a95f7 (diff)
* add new entry group state AVAHI_ENTRY_GROUP_FAILURE
* pass error code alongside entry gorup state changes over DBUS * add new server state AVAHI_SERVER_FAILURE * pass error code alongside server state changes over DBUS * fix client-publish-service * rename error code AVAHI_ERR_LOCAL_COLLISION to AVAHI_ERR_COLLISION * update TODO git-svn-id: file:///home/lennart/svn/public/avahi/trunk@854 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core')
-rw-r--r--avahi-core/entry.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/avahi-core/entry.c b/avahi-core/entry.c
index 5ef2a67..89f313e 100644
--- a/avahi-core/entry.c
+++ b/avahi-core/entry.c
@@ -224,7 +224,7 @@ static AvahiEntry * server_add_internal(
/* Add a new record */
if (check_record_conflict(s, interface, protocol, r, flags) < 0) {
- avahi_server_set_errno(s, AVAHI_ERR_LOCAL_COLLISION);
+ avahi_server_set_errno(s, AVAHI_ERR_COLLISION);
return NULL;
}