Bug#642352: FTBFS on armel: redefinition of 'struct user'

[Daniel T Chen]

Package: honeyd
Version: 1.5c-9
Followup-For: Bug #642352
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * honeydstats.[ch]: Rename struct user to honeyd_user to avoid collision
    on armel. Fixes FTBFS. (Closes: #642352)


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -u honeyd-1.5c/honeydstats.c honeyd-1.5c/honeydstats.c
--- honeyd-1.5c/honeydstats.c
+++ honeyd-1.5c/honeydstats.c
@@ -89,15 +89,15 @@
     char *address, uint16_t port);
 
 static int
-user_compare(struct user *a, struct user *b)
+user_compare(struct honeyd_user *a, struct honeyd_user *b)
 {
 	return (strcmp(a->name, b->name));
 }
 
 struct usertree users;
 
-SPLAY_PROTOTYPE(usertree, user, node, user_compare);
-SPLAY_GENERATE(usertree, user, node, user_compare);
+SPLAY_PROTOTYPE(usertree, honeyd_user, node, user_compare);
+SPLAY_GENERATE(usertree, honeyd_user, node, user_compare);
 
 int checkpoint_fd = -1;
 struct evbuffer *checkpoint_evbuf;
@@ -107,11 +107,11 @@
 void
 user_new(const char *name, const char *password)
 {
-	struct user *user = NULL, tmp;
+	struct honeyd_user *user = NULL, tmp;
 
 	tmp.name = name;
 	if ((user = SPLAY_FIND(usertree, &users, &tmp)) == NULL) {
-		if ((user = calloc(1, sizeof(struct user))) == NULL)
+		if ((user = calloc(1, sizeof(struct honeyd_user))) == NULL)
 			err(1, "%s: calloc", __func__);
 
 		if ((user->name = strdup(name)) == NULL)
@@ -171,7 +171,7 @@
  */
 
 int
-record_process(struct user *user, struct evbuffer *evbuf)
+record_process(struct honeyd_user *user, struct evbuffer *evbuf)
 {
 	struct record *record;
 	int res = -1;
@@ -196,7 +196,7 @@
 }
 
 int
-measurement_process(struct user *user, struct evbuffer *evbuf)
+measurement_process(struct honeyd_user *user, struct evbuffer *evbuf)
 {
 	uint32_t counter;
 	struct timeval tv_start, tv_end, tv_diff;
@@ -260,7 +260,7 @@
 int
 signature_process(struct evbuffer *evbuf)
 {
-	struct user *user = NULL, tmpuser;
+	struct honeyd_user *user = NULL, tmpuser;
 	uint8_t tag;
 	struct evbuffer *tmp = NULL;
 	char *username = NULL;
diff -u honeyd-1.5c/debian/changelog honeyd-1.5c/debian/changelog
only in patch2:
unchanged:
--- honeyd-1.5c.orig/honeydstats.h
+++ honeyd-1.5c/honeydstats.h
@@ -32,8 +32,8 @@
 #ifndef _HONEYDSTATS_H_
 #define _HONEYDSTATS_H_
 
-struct user {
-	SPLAY_ENTRY(user) node;
+struct honeyd_user {
+	SPLAY_ENTRY(honeyd_user) node;
 	const char *name;
 	struct hmac_state hmac;
 
@@ -44,7 +44,7 @@
 	uint32_t seqnr;		/* last sequence number */
 };
 
-SPLAY_HEAD(usertree, user);
+SPLAY_HEAD(usertree, honeyd_user);
 
 int signature_process(struct evbuffer *evbuf);
 void checkpoint_replay(int fd);