From: bfernhomberg <bfernhomberg>
Date: Sat, 24 Jan 2004 18:05:26 +0000 (+0000)
Subject: options need strdup, remove a syslog call
X-Git-Tag: netatalk-2-0-alpha2~32
X-Git-Url: https://arthur.barton.de/gitweb/?a=commitdiff_plain;h=0ce473ae81c90e5f7e59ce2c5a3532650229f1a5;p=netatalk.git

options need strdup, remove a syslog call
---

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 781dc381..f75085d1 100644
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_options.c,v 1.30.2.2.2.4 2004-01-08 19:16:57 lenneis Exp $
+ * $Id: afp_options.c,v 1.30.2.2.2.5 2004-01-24 18:05:26 bfernhomberg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -470,23 +470,31 @@ int afp_options_parseline(char *buf, struct afp_options *options)
             if ((opt = strdup(c)))
                 options->fqdn = opt;
         }
+	else {
+            LOG(log_error, logtype_afpd, "error parsing -fqdn, gethostbyname failed for: %s", c);
+	}
     }
 
     if ((c = getoption(buf, "-unixcodepage"))) {
-	options->unixcodepage = c;
-    	if ( 0 == ( options->unixcharset = add_charset(options->unixcodepage)) ) {
-		options->unixcodepage= "LOCALE";
-        	options->unixcharset = CH_UNIX;
+    	if ((charset_t)-1  == ( options->unixcharset = add_charset(c)) ) {
+            options->unixcharset = CH_UNIX;
+            LOG(log_warning, logtype_afpd, "setting Unix codepage to '%s' failed", c);
     	}
+	else {
+            if (opt = strdup(c))
+                options->unixcodepage = strdup(c);
+	}
     }
 	
     if ((c = getoption(buf, "-maccodepage"))) {
-	options->maccodepage = c;
-    	if ( 0 == ( options->maccharset = add_charset(options->maccodepage)) ) {
-		options->maccodepage= "Mac_Roman";
-        	options->maccharset = CH_MAC;
+    	if ((charset_t)-1 == ( options->maccharset = add_charset(c)) ) {
+            options->maccharset = CH_MAC;
+            LOG(log_warning, logtype_afpd, "setting Mac codepage to '%s' failed", c);
     	}
-	LOG(log_debug, logtype_afpd, "Setting Mac Codepage to '%s'", options->maccodepage);
+	else {
+            if (opt = strdup(c))
+                options->maccodepage = strdup(c);
+	}
     }
 
     return 1;
diff --git a/etc/afpd/catsearch.c b/etc/afpd/catsearch.c
index 83fe0e43..207061e0 100644
--- a/etc/afpd/catsearch.c
+++ b/etc/afpd/catsearch.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <dirent.h>
 #include <errno.h>
-#include <syslog.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <string.h>
@@ -228,7 +227,7 @@ static int resolve_dir(struct vol *vol, int cidx)
 
 		path.u_name = dstack[cidx].path;   
 		if (of_stat(&path)==-1) {
-			syslog(LOG_DEBUG, "resolve_dir: stat %s: %s", dstack[cidx].path, strerror(errno));
+			LOG(log_debug, logtype_afpd, "resolve_dir: stat %s: %s", dstack[cidx].path, strerror(errno));
 			return 0;
 		}
 		path.m_name = dstack[cidx].m_name;