Merge remote branch 'sf/branch-allea' into branch-allea

diff --git a/bin/misc/uuidtest.c b/bin/misc/uuidtest.c
index 81d117361aa4105c576876d1f5dea587ce2b7504..a9c0285546c8127bf0cebbc2f328dda71896a37a 100644 (file)
--- a/bin/misc/uuidtest.c
+++ b/bin/misc/uuidtest.c
@@ -45,23 +45,23 @@ static void parse_ldapconf()
 
     if (! inited) {
 #ifdef HAVE_LDAP
-        /* Parse afp_ldap.conf */
-        printf("Start parsing afp_ldap.conf\n");
+        /* Parse afp.conf */
+        printf("Start parsing afp.conf\n");
         iniconfig = iniparser_load(_PATH_CONFDIR "afp.conf");
         acl_ldap_readconfig(iniconfig);
-        printf("Finished parsing afp_ldap.conf\n");
+        printf("Finished parsing afp.conf\n");
         if (ldap_config_valid) {
             if (ldap_auth_method == LDAP_AUTH_NONE)
-                printf("afp_ldap.conf is ok. Using anonymous bind.\n");
+                printf("afp.conf is ok. Using anonymous bind.\n");
             else if (ldap_auth_method == LDAP_AUTH_SIMPLE)
-                printf("afp_ldap.conf is ok. Using simple bind.\n");
+                printf("afp.conf is ok. Using simple bind.\n");
             else {
                 ldap_config_valid = 0;
-                printf("afp_ldap.conf wants SASL which is not yet supported.\n");
+                printf("afp.conf wants SASL which is not yet supported.\n");
                 exit(EXIT_FAILURE);
             }
         } else {
-            printf("afp_ldap.conf is not ok, not using LDAP. Only local UUID testing available.\n");
+            printf("afp.conf is not ok, not using LDAP. Only local UUID testing available.\n");
         }
 #else
         printf("Built without LDAP support, only local UUID testing available.\n");

diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c
index cdc9e4f0100ff50f8cf297cec0815d97d748d4f4..121c2124c04cd93b7c4b5d28ff28215c53cbf521 100644 (file)
--- a/etc/afpd/afp_config.c
+++ b/etc/afpd/afp_config.c
@@ -117,7 +117,7 @@ int configinit(AFPObj *obj)
         EC_FAIL;
 
 #ifdef HAVE_LDAP
-    /* Parse afp_ldap.conf */
+    /* Parse afp.conf */
     acl_ldap_readconfig(obj->iniconfig);
 #endif /* HAVE_LDAP */
 

diff --git a/libatalk/acl/ldap_config.c b/libatalk/acl/ldap_config.c
index bbba8b66c2fae1e8cce37b7d7781cd07bfcc40fc..88cc44a6157b8aa6223ca6d748fdb0e97980a56d 100644 (file)
--- a/libatalk/acl/ldap_config.c
+++ b/libatalk/acl/ldap_config.c
@@ -70,7 +70,7 @@ int acl_ldap_readconfig(dictionary *iniconfig)
 
     while(ldap_prefs[i].pref != NULL) {
         if ( ldap_prefs[i].valid != 0) {
-            LOG(log_debug, logtype_afpd,"afp_ldap.conf: Missing option: \"%s\"", ldap_prefs[i].name);
+            LOG(log_debug, logtype_afpd,"LDAP: Missing option: \"%s\"", ldap_prefs[i].name);
             ldap_config_valid = 0;
             break;
         }
@@ -79,15 +79,15 @@ int acl_ldap_readconfig(dictionary *iniconfig)
 
     if (ldap_config_valid) {
         if (ldap_auth_method == LDAP_AUTH_NONE)
-            LOG(log_debug, logtype_afpd,"afp_ldap.conf: Using anonymous bind.");
+            LOG(log_debug, logtype_afpd,"LDAP: Using anonymous bind.");
         else if (ldap_auth_method == LDAP_AUTH_SIMPLE)
-            LOG(log_debug, logtype_afpd,"afp_ldap.conf: Using simple bind.");
+            LOG(log_debug, logtype_afpd,"LDAP: Using simple bind.");
         else {
             ldap_config_valid = 0;
-            LOG(log_error, logtype_afpd,"afp_ldap.conf: SASL not yet supported.");
+            LOG(log_error, logtype_afpd,"LDAP: SASL not yet supported.");
         }
     } else
-        LOG(log_info, logtype_afpd,"afp_ldap.conf: not used");
+        LOG(log_info, logtype_afpd,"LDAP: not used");
     return 0;
 }
 #endif /* HAVE_LDAP */