reorganised the log messages, fixed the typo conscerning unsetuplog in afp_options...

[netatalk.git] / etc / afpd / afp_options.c

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 3196e8f7cfea0170f58aeae8ca18903a13884e51..f56b7ea1ec9f1153a0a934003eced527d6433f34 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_options.c,v 1.25 2002-08-24 01:32:19 sibaz Exp $
+ * $Id: afp_options.c,v 1.27 2002-08-24 05:00:07 sibaz Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -249,12 +249,12 @@ int afp_options_parseline(char *buf, struct afp_options *options)
 
 #ifndef DISABLE_LOGGER
     /* -setuplogtype <syslog|filelog> <logtype> <loglevel> <filename>*/
-    /* -setuplogtype <logtype> <loglevel> [<filename>]*/
-    if ((c = getoption(buf, "-setuplogtype")))
+    /* -[no]setuplog <logtype> <loglevel> [<filename>]*/
+    if ((c = getoption(buf, "-setuplog")))
     {
       char *ptr, *logsource, *logtype, *loglevel, *filename;
 
-      LOG(log_extradebug, logtype_afpd, "setting up logtype, c is %s", c);
+      LOG(log_debug6, logtype_afpd, "setting up logtype, c is %s", c);
       ptr = c;
       
       /* 
@@ -307,16 +307,60 @@ int afp_options_parseline(char *buf, struct afp_options *options)
         }
       }
 
-      /*
-      LOG(log_extradebug, logtype_afpd, "Doing setuplog %s %s %s %s", 
-          logsource, logtype, loglevel, filename);
-      */
-      LOG(log_extradebug, logtype_afpd, "Doing setuplog %s %s %s", 
+      LOG(log_debug7, logtype_afpd, "calling setuplog %s %s %s", 
           logtype, loglevel, filename);
 
-      /* setuplog(logsource, logtype, loglevel, filename); */
       setuplog(logtype, loglevel, filename);
     }
+
+    if ((c = getoption(buf, "-unsetuplog")))
+    {
+      char *ptr, *logtype, *loglevel, *filename;
+
+      LOG(log_debug6, logtype_afpd, "unsetting up logtype, c is %s", c);
+
+      ptr = c;
+      logtype = ptr;
+      if (ptr)
+      {
+        ptr = strpbrk(ptr, " \t");
+        if (ptr)
+        {
+          *ptr++ = 0;
+          while (*ptr && isspace(*ptr))
+            ptr++;
+        }
+      }
+
+      loglevel = ptr;
+      if (ptr)
+      {
+        ptr = strpbrk(ptr, " \t");
+        if (ptr)
+        {
+          *ptr++ = 0;
+           while (*ptr && isspace(*ptr))
+             ptr++;
+        }
+      }
+
+      filename = ptr;
+      if (ptr)
+      {
+        ptr = strpbrk(ptr, " \t");
+        if (ptr)
+        {
+          *ptr++ = 0;
+          while (*ptr && isspace(*ptr))
+            ptr++;
+        }
+      }
+      
+      LOG(log_debug7, logtype_afpd, "calling setuplog %s %s %s",
+              logtype, NULL, filename);
+
+      setuplog(logtype, NULL, filename);
+    }
 #endif /* DISABLE_LOGGER */
 #ifdef ADMIN_GRP
     if ((c = getoption(buf, "-admingroup"))) {