revert misguided bytes2hex move

diff --git a/authbind.h b/authbind.h
index 94abaa0748af502e95fe58d217da495686c3f244..3911c08db967068da7bf91c90c12cd0515fe6cf2 100644 (file)
--- a/authbind.h
+++ b/authbind.h
@@ -30,18 +30,8 @@
 # define HELPER "/usr/local/lib/authbind/helper"
 #endif
 
-#ifndef CONFIGDIR
-# define CONFIGDIR "/etc/authbind"
-#endif
-
 #define PRELOAD_VAR "LD_PRELOAD"
 #define AUTHBINDLIB_VAR "AUTHBIND_LIB"
 #define AUTHBIND_LEVELS_VAR "AUTHBIND_LEVELS"
 
-static inline void bytes2hex(const unsigned char *in, char *out, size_t len) {
-  size_t i;
-  for (i=0; i<16; i++)
-    sprintf(out+i*2,"%02x", in[i]);
-}
-
 #endif

diff --git a/helper.c b/helper.c
index 9e8ab865b9ee4ee29d0c23624c295386405dd81f..f58ee9ec4f30c9a4aa359b6e7bcd3b608ee46b4f 100644 (file)
--- a/helper.c
+++ b/helper.c
@@ -30,7 +30,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "authbind.h"
+#ifndef CONFIGDIR
+# define CONFIGDIR "/etc/authbind"
+#endif
 
 static void exiterrno(int e) {
   exit(e>0 && e<128 ? e : ENOSYS);

diff --git a/libauthbind.c b/libauthbind.c
index 03905e454d82dc39dce956f94858fe3285ae3aa5..a685ce3fe200c957a5f686a90eaf3e19811fb66b 100644 (file)
--- a/libauthbind.c
+++ b/libauthbind.c
@@ -185,7 +185,9 @@ int bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {
     break;
   case AF_INET6:
     afarg = "6";
-    bytes2hex(((struct sockaddr_in6*)addr)->sin6_addr.s6_addr, addrarg, 16);
+    for (i=0; i<16; i++)
+      sprintf(addrarg+i*2,"%02x",
+             ((struct sockaddr_in6*)addr)->sin6_addr.s6_addr[i]);
     break;
   default:
     abort();