wip about to undo

[authbind.git] / helper.c

diff --git a/helper.c b/helper.c
index cc4efe25ce7652c8bf4c8db3c751157ffcec85ea..9e8ab865b9ee4ee29d0c23624c295386405dd81f 100644 (file)
--- a/helper.c
+++ b/helper.c
@@ -30,9 +30,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#ifndef CONFIGDIR
-# define CONFIGDIR "/etc/authbind"
-#endif
+#include "authbind.h"
 
 static void exiterrno(int e) {
   exit(e>0 && e<128 ? e : ENOSYS);
@@ -138,15 +136,21 @@ int main(int argc, const char *const *argv) {
   assert(np);
 
   if (af == AF_INET) {
-    snprintf(fnbuf,sizeof(fnbuf)-1,"byaddr/%s%s:%u",np,tophalfchar,hport);
+    snprintf(fnbuf,sizeof(fnbuf)-1,"byaddr/%s%s:%u",tophalfchar,np,hport);
     if (!access(fnbuf,X_OK)) authorised();
     if (errno != ENOENT) exiterrno(errno);
   }
 
-  snprintf(fnbuf,sizeof(fnbuf)-1,"byaddr/%s%s,%u",np,tophalfchar,hport);
+  snprintf(fnbuf,sizeof(fnbuf)-1,"byaddr/%s%s,%u",tophalfchar,np,hport);
   if (!access(fnbuf,X_OK)) authorised();
   if (errno != ENOENT) exiterrno(errno);
 
+  if (af == AF_INET6) {
+    char sbuf[addrlen_any*2+1];
+    bytes2hex(addr_any,sbuf,addrlen_any);
+    snprintf(fnbuf,sizeof(fnbuf)-1,"byaddr/%s%s,%u",tophalfchar,sbuf,hport);
+  }
+
   uid= getuid(); if (uid==(uid_t)-1) perrorfail("getuid");
   snprintf(fnbuf,sizeof(fnbuf)-1,"byuid/%s%lu",tophalfchar,(unsigned long)uid);