From f2e4a5f9b0919dc16ea83a8826e8d52b02178b38 Mon Sep 17 00:00:00 2001
From: Jakub Sławiński
Date: Sun, 3 Jul 2005 23:15:19 +0200
Subject: v0.7.1

  - Added: afserver certificate storing and checking
  - Modified: generating keys and certificate
  - Fixed: creating apf directory
  - Fixed: some bugs in proxy tunnel initialization
---
 src/afserver.c | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

(limited to 'src/afserver.c')

diff --git a/src/afserver.c b/src/afserver.c
index 76f8ffc..2361ebe 100644
--- a/src/afserver.c
+++ b/src/afserver.c
@@ -428,9 +428,13 @@ main(int argc, char **argv)
         "Setting ciphers list failed... exiting");
 		exit(1);
 	}
-  if ((flags = create_apf_dir())) {
+  if ((flags = create_apf_dir(0))) {
     aflog(LOG_T_INIT, LOG_I_WARNING,
         "Warning: Creating ~/.apf directory failed (%d)", flags);
+    if ((flags = create_apf_dir(1))) {
+      aflog(LOG_T_INIT, LOG_I_WARNING,
+          "Warning: Creating ./apf directory failed (%d)", flags);
+    }
   }
   if ((flags = generate_rsa_key(&config.keys))) {
     aflog(LOG_T_INIT, LOG_I_WARNING,
@@ -450,7 +454,6 @@ main(int argc, char **argv)
         "Setting certificate failed (%s)... exiting", config.certif);
 		exit(1);
 	}
-
 	if (config.size == 0) {
 		aflog(LOG_T_INIT, LOG_I_CRIT,
         "Working without sense is really without sense...");
@@ -964,8 +967,14 @@ main(int argc, char **argv)
     			len = pointer->addrlen;
     			sent = accept(pointer->usrclitable[l].listenfd, pointer->cliaddr, &len);
           if (sent == -1) {
-      			aflog(LOG_T_USER, LOG_I_DDEBUG,
-                "realm[%s]: listenfd: FD_ISSET --> EAGAIN", get_realmname(&config, j));
+            if (errno == EAGAIN) {
+              aflog(LOG_T_USER, LOG_I_DDEBUG,
+                  "realm[%s]: listenfd: FD_ISSET --> EAGAIN", get_realmname(&config, j));
+            }
+            else {
+              aflog(LOG_T_USER, LOG_I_DDEBUG,
+                  "realm[%s]: listenfd: FD_ISSET --> errno=%d", get_realmname(&config, j), errno);
+            }
             continue;
           }
     			flags = fcntl(sent, F_GETFL, 0);
@@ -1033,8 +1042,14 @@ main(int argc, char **argv)
 			len = pointer->addrlen;
 			sent = accept(pointer->clitable[k].listenfd, pointer->cliaddr, &len);
       if (sent == -1) {
-  			aflog(LOG_T_USER, LOG_I_DDEBUG,
-            "realm[%s]: listenfd: FD_ISSET --> EAGAIN", get_realmname(&config, j));
+        if (errno == EAGAIN) {
+          aflog(LOG_T_USER, LOG_I_DDEBUG,
+              "realm[%s]: listenfd: FD_ISSET --> EAGAIN", get_realmname(&config, j));
+        }
+        else {
+          aflog(LOG_T_USER, LOG_I_DDEBUG,
+              "realm[%s]: listenfd: FD_ISSET --> errno=%d", get_realmname(&config, j), errno);
+        }
         continue;
       }
 			flags = fcntl(sent, F_GETFL, 0);
@@ -1854,8 +1869,14 @@ main(int argc, char **argv)
         sent = accept(pointer->usrclitable[l].managefd, pointer->cliaddr, &len);
 #endif
         if (sent == -1) {
-          aflog(LOG_T_USER, LOG_I_DDEBUG,
-              "realm[%s]: listenfd: FD_ISSET --> EAGAIN", get_realmname(&config, j));
+          if (errno == EAGAIN) {
+            aflog(LOG_T_USER, LOG_I_DDEBUG,
+                "realm[%s]: managefd: FD_ISSET --> EAGAIN", get_realmname(&config, j));
+          }
+          else {
+            aflog(LOG_T_USER, LOG_I_DDEBUG,
+                "realm[%s]: managefd: FD_ISSET --> errno=%d", get_realmname(&config, j), errno);
+          }
           continue;
         }
         flags = fcntl(sent, F_GETFL, 0);
-- 
cgit v1.1