X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fafp_config.c;h=8c8ac012ad964c79e441d9463869bc4fe096203f;hp=0096eb5775fce890b2974523a0e8de544ac8de3c;hb=75fe310224dffb96868d7f2cb1ec9125a84f2a08;hpb=a24a8fa9f80174f42fc8d35af3354f53702b1a66

diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c
index 0096eb57..8c8ac012 100644
--- a/etc/afpd/afp_config.c
+++ b/etc/afpd/afp_config.c
@@ -1,18 +1,40 @@
-/* 
+/*
+ * $Id: afp_config.c,v 1.29 2009-11-05 14:38:07 franklahm Exp $
+ *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
+
+/* STDC check */
+#if STDC_HEADERS
+#include <string.h>
+#else /* STDC_HEADERS */
+#ifndef HAVE_STRCHR
+#define strchr index
+#define strrchr index
+#endif /* HAVE_STRCHR */
+char *strchr (), *strrchr ();
+#ifndef HAVE_MEMCPY
+#define memcpy(d,s,n) bcopy ((s), (d), (n))
+#define memmove(d,s,n) bcopy ((s), (d), (n))
+#endif /* ! HAVE_MEMCPY */
+#endif /* STDC_HEADERS */
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif /* HAVE_UNISTD_H */
 #include <ctype.h>
-#include <syslog.h>
+#include <atalk/logger.h>
+#include <atalk/util.h>
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -25,6 +47,12 @@
 #include <atalk/afp.h>
 #include <atalk/compat.h>
 #include <atalk/server_child.h>
+#ifdef USE_SRVLOC
+#include <slp.h>
+#endif /* USE_SRVLOC */
+#ifdef HAVE_NFSv4_ACLS
+#include <atalk/ldapconfig.h>
+#endif
 
 #include "globals.h"
 #include "afp_config.h"
@@ -38,325 +66,547 @@
  * garbage collection ... */
 void configfree(AFPConfig *configs, const AFPConfig *config)
 {
-  AFPConfig *p, *q;
+    AFPConfig *p, *q;
 
-  for (p = configs; p; p = q) {
-    q = p->next;
-    if (p == config)
-      continue;
+    for (p = configs; p; p = q) {
+        q = p->next;
+        if (p == config)
+            continue;
 
-    /* do a little reference counting */
-    if (--(*p->optcount) < 1) {
-      afp_options_free(&p->obj.options, p->defoptions);
-      free(p->optcount);
-    }
+        /* do a little reference counting */
+        if (--(*p->optcount) < 1) {
+            afp_options_free(&p->obj.options, p->defoptions);
+            free(p->optcount);
+        }
 
-    switch (p->obj.proto) {
+        switch (p->obj.proto) {
 #ifndef NO_DDP
-    case AFPPROTO_ASP:
-      free(p->obj.Obj);
-      free(p->obj.Type);
-      free(p->obj.Zone);
-      atp_close(((ASP) p->obj.handle)->asp_atp);
-      free(p->obj.handle);
-      break;
+        case AFPPROTO_ASP:
+            free(p->obj.Obj);
+            free(p->obj.Type);
+            free(p->obj.Zone);
+            atp_close(((ASP) p->obj.handle)->asp_atp);
+            free(p->obj.handle);
+            break;
 #endif /* no afp/asp */
-    case AFPPROTO_DSI:
-      close(p->fd);
-      free(p->obj.handle);
-      break;
+        case AFPPROTO_DSI:
+            close(p->fd);
+            free(p->obj.handle);
+            break;
+        }
+        free(p);
     }
-    free(p);
-  }
 }
 
+#ifdef USE_SRVLOC
+static void SRVLOC_callback(SLPHandle hslp _U_, SLPError errcode, void *cookie) {
+    *(SLPError*)cookie = errcode;
+}
+
+static char hex[17] = "0123456789abcdef";
+
+static char * srvloc_encode(const struct afp_options *options, const char *name)
+{
+	static char buf[512];
+	char *conv_name;
+	unsigned char *p;
+	unsigned int i = 0;
+#ifndef NO_DDP
+	char *Obj, *Type = "", *Zone = "";
+#endif
+
+	/* Convert name to maccharset */
+        if ((size_t)-1 ==(convert_string_allocate( options->unixcharset, options->maccharset,
+			 name, -1, &conv_name)) )
+		return (char*)name;
+
+	/* Escape characters */
+	p = conv_name;
+	while (*p && i<(sizeof(buf)-4)) {
+	    if (*p == '@')
+		break;
+	    else if (isspace(*p)) {
+	        buf[i++] = '%';
+           	buf[i++] = '2';
+           	buf[i++] = '0';
+		p++;
+	    }	
+	    else if ((!isascii(*p)) || *p <= 0x2f || *p == 0x3f ) {
+	        buf[i++] = '%';
+           	buf[i++] = hex[*p >> 4];
+           	buf[i++] = hex[*p++ & 15];
+	    }
+	    else {
+		buf[i++] = *p++;
+	    }
+	}
+	buf[i] = '\0';
+
+#ifndef NO_DDP
+	/* Add ZONE,  */
+        if (nbp_name(options->server, &Obj, &Type, &Zone )) {
+        	LOG(log_error, logtype_afpd, "srvloc_encode: can't parse %s", options->server );
+    	}
+	else {
+		snprintf( buf+i, sizeof(buf)-i-1 ,"&ZONE=%s", Zone);
+	}
+#endif
+	free (conv_name);
+
+	return buf;
+}
+#endif /* USE_SRVLOC */
+
+#ifdef USE_SRVLOC
+static void dsi_cleanup(const AFPConfig *config)
+{
+    SLPError err;
+    SLPError callbackerr;
+    SLPHandle hslp;
+    DSI *dsi = (DSI *)config->obj.handle;
+
+    /*  Do nothing if we didn't register.  */
+    if (!dsi || dsi->srvloc_url[0] == '\0')
+        return;
+
+    err = SLPOpen("en", SLP_FALSE, &hslp);
+    if (err != SLP_OK) {
+        LOG(log_error, logtype_afpd, "dsi_cleanup: Error opening SRVLOC handle");
+        goto srvloc_dereg_err;
+    }
+
+    err = SLPDereg(hslp,
+                   dsi->srvloc_url,
+                   SRVLOC_callback,
+                   &callbackerr);
+    if (err != SLP_OK) {
+        LOG(log_error, logtype_afpd, "dsi_cleanup: Error unregistering %s from SRVLOC", dsi->srvloc_url);
+        goto srvloc_dereg_err;
+    }
+
+    if (callbackerr != SLP_OK) {
+        LOG(log_error, logtype_afpd, "dsi_cleanup: Error in callback while trying to unregister %s from SRVLOC (%d)", dsi->srvloc_url, callbackerr);
+        goto srvloc_dereg_err;
+    }
+
+srvloc_dereg_err:
+    dsi->srvloc_url[0] = '\0';
+    SLPClose(hslp);
+}
+#endif /* USE_SRVLOC */
+
 #ifndef NO_DDP
 static void asp_cleanup(const AFPConfig *config)
 {
-  nbp_unrgstr(config->obj.Obj, config->obj.Type, config->obj.Zone,
-	      &config->obj.options.ddpaddr);
+    /* we need to stop tickle handler */
+    asp_stop_tickle();
+    nbp_unrgstr(config->obj.Obj, config->obj.Type, config->obj.Zone,
+                &config->obj.options.ddpaddr);
 }
 
 /* these two are almost identical. it should be possible to collapse them
  * into one with minimal junk. */
-static int asp_start(AFPConfig *config, AFPConfig *configs, 
-		     server_child *server_children) 
+static int asp_start(AFPConfig *config, AFPConfig *configs,
+                     server_child *server_children)
 {
-  ASP asp;
-
-  if (!(asp = asp_getsession(config->obj.handle, server_children, 
-			     config->obj.options.tickleval))) {
-    syslog( LOG_ERR, "main: asp_getsession: %m" );
-    exit( 1 );
-  } 
-  
-  if (asp->child) {
-    configfree(configs, config); /* free a bunch of stuff */
-    afp_over_asp(&config->obj);
-    exit (0);
-  }
-
-  return 0;
+    ASP asp;
+
+    if (!(asp = asp_getsession(config->obj.handle, server_children,
+                               config->obj.options.tickleval))) {
+        LOG(log_error, logtype_afpd, "main: asp_getsession: %s", strerror(errno) );
+        exit( EXITERR_CLNT );
+    }
+
+    if (asp->child) {
+        configfree(configs, config); /* free a bunch of stuff */
+        afp_over_asp(&config->obj);
+        exit (0);
+    }
+
+    return 0;
 }
 #endif /* no afp/asp */
 
 static int dsi_start(AFPConfig *config, AFPConfig *configs,
-		     server_child *server_children)
+                     server_child *server_children)
 {
-  DSI *dsi;
-
-  if (!(dsi = dsi_getsession(config->obj.handle, server_children,
-			     config->obj.options.tickleval))) {
-    syslog( LOG_ERR, "main: dsi_getsession: %m" );
-    exit( 1 );
-  } 
-  
-  /* we've forked. */
-  if (dsi->child) {
-    configfree(configs, config);
-    afp_over_dsi(&config->obj); /* start a session */
-    exit (0);
-  }
-
-  return 0;
+    DSI *dsi;
+
+    if (!(dsi = dsi_getsession(config->obj.handle, server_children,
+                               config->obj.options.tickleval))) {
+        LOG(log_error, logtype_afpd, "main: dsi_getsession: %s", strerror(errno) );
+        exit( EXITERR_CLNT );
+    }
+
+    /* we've forked. */
+    if (dsi->child) {
+        configfree(configs, config);
+        afp_over_dsi(&config->obj); /* start a session */
+        exit (0);
+    }
+
+    return 0;
 }
 
 #ifndef NO_DDP
 static AFPConfig *ASPConfigInit(const struct afp_options *options,
-				unsigned char *refcount)
+                                unsigned char *refcount)
 {
-  AFPConfig *config;
-  ATP atp;
-  ASP asp;
-  char *Obj, *Type = "AFPServer", *Zone = "*";
-  
-  if ((config = (AFPConfig *) calloc(1, sizeof(AFPConfig))) == NULL)
-    return NULL;
-  
-  if ((atp = atp_open(ATADDR_ANYPORT, &options->ddpaddr)) == NULL)  {
-    syslog( LOG_ERR, "main: atp_open: %m");
-    free(config);
-    return NULL;
-  }
-  
-  if ((asp = asp_init( atp )) == NULL) {
-    syslog( LOG_ERR, "main: asp_init: %m" );
-    atp_close(atp);
-    free(config);
-    return NULL;
-  }
-  
-  /* register asp server */
-  Obj = (char *) options->hostname;
-  if (nbp_name(options->server, &Obj, &Type, &Zone )) {
-    syslog( LOG_ERR, "main: can't parse %s", options->server );
-    goto serv_free_return;
-  }
-
-  /* dup Obj, Type and Zone as they get assigned to a single internal
-   * buffer by nbp_name */
-  if ((config->obj.Obj  = strdup(Obj)) == NULL) 
-    goto serv_free_return;
-
-  if ((config->obj.Type = strdup(Type)) == NULL) {
-    free(config->obj.Obj);
-    goto serv_free_return;
-  }
-
-  if ((config->obj.Zone = strdup(Zone)) == NULL) {
-    free(config->obj.Obj);
-    free(config->obj.Type);
-    goto serv_free_return;
-  }
-  
-  /* make sure we're not registered */
-  nbp_unrgstr(Obj, Type, Zone, &options->ddpaddr); 
-  if (nbp_rgstr( atp_sockaddr( atp ), Obj, Type, Zone ) < 0 ) {
-    syslog( LOG_ERR, "Can't register %s:%s@%s", Obj, Type, Zone );
-    free(config->obj.Obj);
-    free(config->obj.Type);
-    free(config->obj.Zone);
-    goto serv_free_return;
-  }
-
-  syslog( LOG_INFO, "%s:%s@%s started on %u.%u:%u (%s)", Obj, Type, Zone,
-	  ntohs( atp_sockaddr( atp )->sat_addr.s_net ),
-	  atp_sockaddr( atp )->sat_addr.s_node,
-	  atp_sockaddr( atp )->sat_port, VERSION );
-  
-  config->fd = atp_fileno(atp);
-  config->obj.handle = asp;
-  config->obj.config = config;
-  config->obj.proto = AFPPROTO_ASP;
-
-  memcpy(&config->obj.options, options, sizeof(struct afp_options));
-  config->optcount = refcount;
-  (*refcount)++;
-
-  config->server_start = asp_start;
-  config->server_cleanup = asp_cleanup;
-
-  return config;
+    AFPConfig *config;
+    ATP atp;
+    ASP asp;
+    char *Obj, *Type = "AFPServer", *Zone = "*";
+    char *convname = NULL;
+
+    if ((config = (AFPConfig *) calloc(1, sizeof(AFPConfig))) == NULL)
+        return NULL;
+
+    if ((atp = atp_open(ATADDR_ANYPORT, &options->ddpaddr)) == NULL)  {
+        LOG(log_error, logtype_afpd, "main: atp_open: %s", strerror(errno) );
+        free(config);
+        return NULL;
+    }
+
+    if ((asp = asp_init( atp )) == NULL) {
+        LOG(log_error, logtype_afpd, "main: asp_init: %s", strerror(errno) );
+        atp_close(atp);
+        free(config);
+        return NULL;
+    }
+
+    /* register asp server */
+    Obj = (char *) options->hostname;
+    if (options->server && (size_t)-1 ==(convert_string_allocate( options->unixcharset, options->maccharset,
+                         options->server, strlen(options->server), &convname)) ) {
+        if ((convname = strdup(options->server)) == NULL ) {
+            LOG(log_error, logtype_afpd, "malloc: %s", strerror(errno) );
+            goto serv_free_return;
+        }
+    }
+
+    if (nbp_name(convname, &Obj, &Type, &Zone )) {
+        LOG(log_error, logtype_afpd, "main: can't parse %s", options->server );
+        goto serv_free_return;
+    }
+    if (convname)
+        free (convname);
+
+    /* dup Obj, Type and Zone as they get assigned to a single internal
+     * buffer by nbp_name */
+    if ((config->obj.Obj  = strdup(Obj)) == NULL)
+        goto serv_free_return;
+
+    if ((config->obj.Type = strdup(Type)) == NULL) {
+        free(config->obj.Obj);
+        goto serv_free_return;
+    }
+
+    if ((config->obj.Zone = strdup(Zone)) == NULL) {
+        free(config->obj.Obj);
+        free(config->obj.Type);
+        goto serv_free_return;
+    }
+
+    /* make sure we're not registered */
+    nbp_unrgstr(Obj, Type, Zone, &options->ddpaddr);
+    if (nbp_rgstr( atp_sockaddr( atp ), Obj, Type, Zone ) < 0 ) {
+        LOG(log_error, logtype_afpd, "Can't register %s:%s@%s", Obj, Type, Zone );
+        free(config->obj.Obj);
+        free(config->obj.Type);
+        free(config->obj.Zone);
+        goto serv_free_return;
+    }
+
+    LOG(log_info, logtype_afpd, "%s:%s@%s started on %u.%u:%u (%s)", Obj, Type, Zone,
+        ntohs( atp_sockaddr( atp )->sat_addr.s_net ),
+        atp_sockaddr( atp )->sat_addr.s_node,
+        atp_sockaddr( atp )->sat_port, VERSION );
+
+    config->fd = atp_fileno(atp);
+    config->obj.handle = asp;
+    config->obj.config = config;
+    config->obj.proto = AFPPROTO_ASP;
+
+    memcpy(&config->obj.options, options, sizeof(struct afp_options));
+    config->optcount = refcount;
+    (*refcount)++;
+
+    config->server_start = asp_start;
+    config->server_cleanup = asp_cleanup;
+
+    return config;
 
 serv_free_return:
-  asp_close(asp);
-  free(config);
-  return NULL;
+                    asp_close(asp);
+    free(config);
+    return NULL;
 }
 #endif /* no afp/asp */
 
 
 static AFPConfig *DSIConfigInit(const struct afp_options *options,
-				unsigned char *refcount,
-				const dsi_proto protocol) 
+                                unsigned char *refcount,
+                                const dsi_proto protocol)
 {
-  AFPConfig *config;
-  DSI *dsi;
-  char *p, *q;
+    AFPConfig *config;
+    DSI *dsi;
+    char *p, *q;
+#ifdef USE_SRVLOC
+    SLPError err;
+    SLPError callbackerr;
+    SLPHandle hslp;
+    struct servent *afpovertcp;
+    int afp_port = 548;
+    char *srvloc_hostname, *hostname;
+#endif /* USE_SRVLOC */
+
+    if ((config = (AFPConfig *) calloc(1, sizeof(AFPConfig))) == NULL) {
+        LOG(log_error, logtype_afpd, "DSIConfigInit: malloc(config): %s", strerror(errno) );
+        return NULL;
+    }
 
-  if ((config = (AFPConfig *) calloc(1, sizeof(AFPConfig))) == NULL) {
-    syslog( LOG_ERR, "DSIConfigInit: malloc(config): %m" );
-    return NULL;
-  }
+    LOG(log_debug, logtype_afpd, "DSIConfigInit: hostname: %s, ip/port: %s/%s, ",
+        options->hostname,
+        options->ipaddr ? options->ipaddr : "default",
+        options->port ? options->port : "548");
+
+    if ((dsi = dsi_init(protocol, "afpd", options->hostname,
+                        options->ipaddr, options->port,
+                        options->flags & OPTION_PROXY,
+                        options->server_quantum)) == NULL) {
+        LOG(log_error, logtype_afpd, "main: dsi_init: %s", strerror(errno) );
+        free(config);
+        return NULL;
+    }
 
-  if ((dsi = dsi_init(protocol, "afpd", options->hostname,
-		      options->ipaddr, options->port, 
-		      options->flags & OPTION_PROXY, 
-		      options->server_quantum)) == NULL) {
-    syslog( LOG_ERR, "main: dsi_init: %m" );
-    free(config);
-    return NULL;
-  }
-
-  if (options->flags & OPTION_PROXY) {
-    syslog(LOG_INFO, "ASIP proxy initialized for %s:%d (%s)",
-	   inet_ntoa(dsi->server.sin_addr), ntohs(dsi->server.sin_port), 
-	   VERSION);
-  } else {
-    syslog(LOG_INFO, "ASIP started on %s:%d(%d) (%s)",
-	   inet_ntoa(dsi->server.sin_addr), ntohs(dsi->server.sin_port), 
-	   dsi->serversock, VERSION);
-  }
-
-  config->fd = dsi->serversock;
-  config->obj.handle = dsi;
-  config->obj.config = config;
-  config->obj.proto = AFPPROTO_DSI;
-
-  memcpy(&config->obj.options, options, sizeof(struct afp_options));
-  /* get rid of any appletalk info. we use the fact that the DSI
-   * stuff is done after the ASP stuff. */
-  p = config->obj.options.server;
-  if (p && (q = strchr(p, ':')))
-    *q = '\0';
-    
-  config->optcount = refcount;
-  (*refcount)++;
-
-  config->server_start = dsi_start;
-  return config;
+    if (options->flags & OPTION_PROXY) {
+        LOG(log_info, logtype_afpd, "AFP/TCP proxy initialized for %s:%d (%s)",
+            getip_string((struct sockaddr *)&dsi->server), getip_port((struct sockaddr *)&dsi->server), VERSION);
+    } else {
+        LOG(log_info, logtype_afpd, "AFP/TCP started, advertising %s:%d (%s)",
+            getip_string((struct sockaddr *)&dsi->server), getip_port((struct sockaddr *)&dsi->server), VERSION);
+    }
+
+#ifdef USE_SRVLOC
+    dsi->srvloc_url[0] = '\0';	/*  Mark that we haven't registered.  */
+    if (!(options->flags & OPTION_NOSLP)) {
+	err = SLPOpen("en", SLP_FALSE, &hslp);
+	if (err != SLP_OK) {
+	    LOG(log_error, logtype_afpd, "DSIConfigInit: Error opening SRVLOC handle");
+	    goto srvloc_reg_err;
+	}
+
+	/* XXX We don't want to tack on the port number if we don't have to.
+	 * Why?
+	 * Well, this seems to break MacOS < 10.  If the user _really_ wants to
+	 * use a non-default port, they can, but be aware, this server might
+	 * not show up int the Network Browser.
+	 */
+	afpovertcp = getservbyname("afpovertcp", "tcp");
+	if (afpovertcp != NULL) {
+	    afp_port = afpovertcp->s_port;
+	}
+	/* If specified use the FQDN to register with srvloc, otherwise use IP. */
+	p = NULL;
+	if (options->fqdn) {
+	    hostname = options->fqdn;
+	    p = strchr(hostname, ':');
+	}	
+	else 
+	    hostname = inet_ntoa(dsi->server.sin_addr);
+	srvloc_hostname = srvloc_encode(options, (options->server ? options->server : options->hostname));
+
+	if (strlen(srvloc_hostname) > (sizeof(dsi->srvloc_url) - strlen(hostname) - 21)) {
+	    LOG(log_error, logtype_afpd, "DSIConfigInit: Hostname is too long for SRVLOC");
+	    dsi->srvloc_url[0] = '\0';
+	    goto srvloc_reg_err;
+	}
+	if ((p) || dsi->server.sin_port == afp_port) {
+	    sprintf(dsi->srvloc_url, "afp://%s/?NAME=%s", hostname, srvloc_hostname);
+	}
+	else {
+	    sprintf(dsi->srvloc_url, "afp://%s:%d/?NAME=%s", hostname, ntohs(dsi->server.sin_port), srvloc_hostname);
+	}
+
+	err = SLPReg(hslp,
+		     dsi->srvloc_url,
+		     SLP_LIFETIME_MAXIMUM,
+		     "afp",
+		     "",
+		     SLP_TRUE,
+		     SRVLOC_callback,
+		     &callbackerr);
+	if (err != SLP_OK) {
+	    LOG(log_error, logtype_afpd, "DSIConfigInit: Error registering %s with SRVLOC", dsi->srvloc_url);
+	    dsi->srvloc_url[0] = '\0';
+	    goto srvloc_reg_err;
+	}
+
+	if (callbackerr != SLP_OK) {
+	    LOG(log_error, logtype_afpd, "DSIConfigInit: Error in callback trying to register %s with SRVLOC", dsi->srvloc_url);
+	    dsi->srvloc_url[0] = '\0';
+	    goto srvloc_reg_err;
+	}
+
+	LOG(log_info, logtype_afpd, "Sucessfully registered %s with SRVLOC", dsi->srvloc_url);
+
+srvloc_reg_err:
+	SLPClose(hslp);
+    }
+#endif /* USE_SRVLOC */
+
+
+    config->fd = dsi->serversock;
+    config->obj.handle = dsi;
+    config->obj.config = config;
+    config->obj.proto = AFPPROTO_DSI;
+
+    memcpy(&config->obj.options, options, sizeof(struct afp_options));
+    /* get rid of any appletalk info. we use the fact that the DSI
+     * stuff is done after the ASP stuff. */
+    p = config->obj.options.server;
+    if (p && (q = strchr(p, ':')))
+        *q = '\0';
+
+    config->optcount = refcount;
+    (*refcount)++;
+
+    config->server_start = dsi_start;
+#ifdef USE_SRVLOC
+    config->server_cleanup = dsi_cleanup;
+#endif 
+    return config;
 }
 
 /* allocate server configurations. this should really store the last
  * entry in config->last or something like that. that would make
  * supporting multiple dsi transports easier. */
 static AFPConfig *AFPConfigInit(const struct afp_options *options,
-				const struct afp_options *defoptions)
+                                const struct afp_options *defoptions)
 {
-  AFPConfig *config = NULL, *next = NULL;
-  unsigned char *refcount;
+    AFPConfig *config = NULL, *next = NULL;
+    unsigned char *refcount;
 
-  if ((refcount = (unsigned char *) 
-       calloc(1, sizeof(unsigned char))) == NULL) {
-    syslog( LOG_ERR, "AFPConfigInit: calloc(refcount): %m" );
-    return NULL;
-  }
+    if ((refcount = (unsigned char *)
+                    calloc(1, sizeof(unsigned char))) == NULL) {
+        LOG(log_error, logtype_afpd, "AFPConfigInit: calloc(refcount): %s", strerror(errno) );
+        return NULL;
+    }
 
 #ifndef NO_DDP
-  /* handle asp transports */
-  if ((options->transports & AFPTRANS_DDP) && 
-      (config = ASPConfigInit(options, refcount)))
-    config->defoptions = defoptions;
-#endif
+    /* handle asp transports */
+    if ((options->transports & AFPTRANS_DDP) &&
+            (config = ASPConfigInit(options, refcount)))
+        config->defoptions = defoptions;
+#endif /* NO_DDP */
+
+    /* handle dsi transports and dsi proxies. we only proxy
+     * for DSI connections. */
+
+    /* this should have something like the following:
+     * for (i=mindsi; i < maxdsi; i++)
+     *   if (options->transports & (1 << i) && 
+     *     (next = DSIConfigInit(options, refcount, i)))
+     *     next->defoptions = defoptions;
+     */
+    if ((options->transports & AFPTRANS_TCP) &&
+            (((options->flags & OPTION_PROXY) == 0) ||
+             ((options->flags & OPTION_PROXY) && config))
+            && (next = DSIConfigInit(options, refcount, DSI_TCPIP)))
+        next->defoptions = defoptions;
+
+    /* load in all the authentication modules. we can load the same
+       things multiple times if necessary. however, loading different
+       things with the same names will cause complaints. by not loading
+       in any uams with proxies, we prevent ddp connections from succeeding.
+    */
+    auth_load(options->uampath, options->uamlist);
+
+    /* this should be able to accept multiple dsi transports. i think
+     * the only thing that gets affected is the net addresses. */
+    status_init(config, next, options);
+
+    /* attach dsi config to tail of asp config */
+    if (config) {
+        config->next = next;
+        return config;
+    }
 
-  /* handle dsi transports and dsi proxies. we only proxy
-   * for DSI connections. */
-
-  /* this should have something like the following:
-   * for (i=mindsi; i < maxdsi; i++)
-   *   if (options->transports & (1 << i) && 
-   *     (next = DSIConfigInit(options, refcount, i)))
-   *     next->defoptions = defoptions;
-   */
-  if ((options->transports & AFPTRANS_TCP) &&
-      (((options->flags & OPTION_PROXY) == 0) ||
-       ((options->flags & OPTION_PROXY) && config))
-      && (next = DSIConfigInit(options, refcount, DSI_TCPIP)))
-    next->defoptions = defoptions;
-
-  /* load in all the authentication modules. we can load the same
-     things multiple times if necessary. however, loading different
-     things with the same names will cause complaints. by not loading
-     in any uams with proxies, we prevent ddp connections from succeeding.
-  */
-  auth_load(options->uampath, options->uamlist);
-
-  /* this should be able to accept multiple dsi transports. i think
-   * the only thing that gets affected is the net addresses. */
-  status_init(config, next, options);
-
-  /* attach dsi config to tail of asp config */
-  if (config) {
-    config->next = next;
-    return config;
-  } 
-    
-  return next;
+    return next;
 }
 
 /* fill in the appropriate bits for each interface */
 AFPConfig *configinit(struct afp_options *cmdline)
 {
-  FILE *fp;
-  char buf[LINESIZE + 1], *p, have_option = 0;
-  struct afp_options options;
-  AFPConfig *config, *first = NULL;
-
-  /* if config file doesn't exist, load defaults */
-  if ((fp = fopen(cmdline->configfile, "r")) == NULL) 
-    return AFPConfigInit(cmdline, cmdline);
-
-  /* scan in the configuration file */
-  while (!feof(fp)) {
-    if (!fgets(buf, sizeof(buf), fp) || buf[0] == '#')
-      continue;
-    
-    /* a little pre-processing to get rid of spaces and end-of-lines */
-    p = buf;
-    while (p && isspace(*p)) 
-      p++;
-    if (!p || (*p == '\0'))
-      continue;
-
-    have_option = 1;
-
-    memcpy(&options, cmdline, sizeof(options));
-    if (!afp_options_parseline(p, &options))
-      continue;
-
-    /* this should really get a head and a tail to simplify things. */
-    if (!first) {
-      if ((first = AFPConfigInit(&options, cmdline)))
-	config = first->next ? first->next : first;
-    } else if ((config->next = AFPConfigInit(&options, cmdline))) {
-      config = config->next->next ? config->next->next : config->next;
+    FILE *fp;
+    char buf[LINESIZE + 1], *p, have_option = 0;
+    size_t len;
+    struct afp_options options;
+    AFPConfig *config=NULL, *first = NULL; 
+
+#ifdef HAVE_NFSv4_ACLS
+    /* Parse ldap.conf first so we can set the uuid option */
+    LOG(log_debug, logtype_afpd, "Start parsing ldap.conf");
+    acl_ldap_readconfig(_PATH_ACL_LDAPCONF);
+    LOG(log_debug, logtype_afpd, "Finished parsing ldap.conf");
+#endif
+
+    status_reset();
+    /* if config file doesn't exist, load defaults */
+    if ((fp = fopen(cmdline->configfile, "r")) == NULL)
+    {
+        LOG(log_debug, logtype_afpd, "ConfigFile %s not found, assuming defaults",
+            cmdline->configfile);
+        return AFPConfigInit(cmdline, cmdline);
+    }
+
+    LOG(log_debug, logtype_afpd, "Loading ConfigFile"); 
+
+    /* scan in the configuration file */
+    len = 0;
+    while (!feof(fp)) {
+	if (!fgets(&buf[len], LINESIZE - len, fp) || buf[len] == '#')
+            continue;
+	len = strlen(buf);
+	if ( len >= 2 && buf[len-2] == '\\' ) {
+	    len -= 2;
+	    continue;
+	} else
+	    len = 0;
+
+        /* a little pre-processing to get rid of spaces and end-of-lines */
+        p = buf;
+        while (p && isspace(*p))
+            p++;
+        if (!p || (*p == '\0'))
+            continue;
+
+        have_option = 1;
+
+        memcpy(&options, cmdline, sizeof(options));
+        if (!afp_options_parseline(p, &options))
+            continue;
+
+#ifdef HAVE_NFSv4_ACLS
+	/* Enable UUID support if LDAP config is complete */
+	if (ldap_config_valid)
+	    options.flags |= OPTION_UUID;
+#endif
+
+        /* this should really get a head and a tail to simplify things. */
+        if (!first) {
+            if ((first = AFPConfigInit(&options, cmdline)))
+                config = first->next ? first->next : first;
+        } else if ((config->next = AFPConfigInit(&options, cmdline))) {
+            config = config->next->next ? config->next->next : config->next;
+        }
     }
-  }
 
-  fclose(fp);
+    LOG(log_debug, logtype_afpd, "Finished parsing Config File");
+    fclose(fp);
 
-  if (!have_option)
-    return AFPConfigInit(cmdline, cmdline);
+    if (!have_option)
+        first = AFPConfigInit(cmdline, cmdline);
 
-  return first;
+    return first;
 }