From 334f52f05d5cf4c9b4a612c7164ed94394a8e817 Mon Sep 17 00:00:00 2001 From: franklahm Date: Fri, 20 Nov 2009 17:45:46 +0000 Subject: [PATCH] Rename ldap.conf stuff to afp_ldap.conf. Kudos to HAT. --- contrib/acltests/Makefile.am | 2 +- contrib/acltests/uuidtest.c | 16 ++++++++-------- doc/README.acls | 2 +- etc/afpd/Makefile.am | 2 +- etc/afpd/acls.h | 4 ++-- etc/afpd/afp_config.c | 8 ++++---- libatalk/acl/ldap_config.c | 4 ++-- man/man5/Makefile.am | 4 ++-- .../{ldap.conf.5.tmpl => afp_ldap.conf.5.tmpl} | 6 +++--- man/man8/afp_acls.8.tmpl | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) rename man/man5/{ldap.conf.5.tmpl => afp_ldap.conf.5.tmpl} (93%) diff --git a/contrib/acltests/Makefile.am b/contrib/acltests/Makefile.am index a8736f85..69e8e131 100644 --- a/contrib/acltests/Makefile.am +++ b/contrib/acltests/Makefile.am @@ -6,5 +6,5 @@ bin_PROGRAMS = uuidtest uuidtest_SOURCES = uuidtest.c uuidtest_LDADD = $(top_builddir)/libatalk/libatalk.la -AM_CFLAGS = -D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/ldap.conf\" +AM_CFLAGS = -D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/afp_ldap.conf\" endif diff --git a/contrib/acltests/uuidtest.c b/contrib/acltests/uuidtest.c index 5db47111..1444962a 100644 --- a/contrib/acltests/uuidtest.c +++ b/contrib/acltests/uuidtest.c @@ -1,5 +1,5 @@ /* - $Id: uuidtest.c,v 1.2 2009-02-10 15:31:48 franklahm Exp $ + $Id: uuidtest.c,v 1.3 2009-11-20 17:45:46 franklahm Exp $ Copyright (c) 2008,2009 Frank Lahm This program is free software; you can redistribute it and/or modify @@ -43,21 +43,21 @@ int main( int argc, char **argv) return -1; } - /* Parse ldap.conf */ - printf("Start parsing ldap.conf\n"); + /* Parse afp_ldap.conf */ + printf("Start parsing afp_ldap.conf\n"); acl_ldap_readconfig(_PATH_ACL_LDAPCONF); - printf("Finished parsing ldap.conf\n"); + printf("Finished parsing afp_ldap.conf\n"); if (ldap_config_valid) { if (ldap_auth_method == LDAP_AUTH_NONE) - printf("ldap.conf is ok. Using anonymous bind.\n"); + printf("afp_ldap.conf is ok. Using anonymous bind.\n"); else if (ldap_auth_method == LDAP_AUTH_SIMPLE) - printf("ldap.conf is ok. Using simple bind.\n"); + printf("afp_ldap.conf is ok. Using simple bind.\n"); else { ldap_config_valid = 0; - printf("ldap.conf want SASL which is not yet supported.\n"); + printf("afp_ldap.conf want SASL which is not yet supported.\n"); } } else { - printf("ldap.conf is not ok.\n"); + printf("afp_ldap.conf is not ok.\n"); return 1; } diff --git a/doc/README.acls b/doc/README.acls index 266b74b6..6c477251 100644 --- a/doc/README.acls +++ b/doc/README.acls @@ -44,7 +44,7 @@ In order to be able to support ACLs, the following things have to be configured: * as long as user/group names/ids in the filesystem are equal * * to their counterparts in the LDAP/OD datastore * - - configure Netatalk via ldap.conf so that Netatalk is able to retrieve the UUID + - configure Netatalk via afp_ldap.conf so that Netatalk is able to retrieve the UUID for users and groups via LDAP search queries 3. Netatalk Volumes diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am index df38c476..9cab23c4 100644 --- a/etc/afpd/Makefile.am +++ b/etc/afpd/Makefile.am @@ -24,7 +24,7 @@ afpd_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \ -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \ -D_PATH_AFPDCONF=\"$(pkgconfdir)/afpd.conf\" \ -D_PATH_AFPDUAMPATH=\"$(UAMS_PATH)/\" \ - -D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/ldap.conf\" \ + -D_PATH_ACL_LDAPCONF=\"$(pkgconfdir)/afp_ldap.conf\" \ -DAPPLCNAME \ -DSERVERTEXT=\"$(SERVERTEXT)/\" diff --git a/etc/afpd/acls.h b/etc/afpd/acls.h index b79faaff..a1b1e52d 100644 --- a/etc/afpd/acls.h +++ b/etc/afpd/acls.h @@ -1,5 +1,5 @@ /* - $Id: acls.h,v 1.2 2009-10-15 10:43:13 didg Exp $ + $Id: acls.h,v 1.3 2009-11-20 17:45:47 franklahm Exp $ Copyright (c) 2008,2009 Frank Lahm This program is free software; you can redistribute it and/or modify @@ -105,7 +105,7 @@ int afp_access (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rb int afp_getacl (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); int afp_setacl (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); -/* Parse ldap.conf */ +/* Parse afp_ldap.conf */ extern int acl_ldap_readconfig(char *name); #endif diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c index 8a9f245b..c52430d5 100644 --- a/etc/afpd/afp_config.c +++ b/etc/afpd/afp_config.c @@ -1,5 +1,5 @@ /* - * $Id: afp_config.c,v 1.30 2009-11-06 03:50:32 didg Exp $ + * $Id: afp_config.c,v 1.31 2009-11-20 17:45:47 franklahm Exp $ * * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu) * All Rights Reserved. See COPYRIGHT. @@ -542,10 +542,10 @@ AFPConfig *configinit(struct afp_options *cmdline) 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"); + /* Parse afp_ldap.conf first so we can set the uuid option */ + LOG(log_debug, logtype_afpd, "Start parsing afp_ldap.conf"); acl_ldap_readconfig(_PATH_ACL_LDAPCONF); - LOG(log_debug, logtype_afpd, "Finished parsing ldap.conf"); + LOG(log_debug, logtype_afpd, "Finished parsing afp_ldap.conf"); #endif status_reset(); diff --git a/libatalk/acl/ldap_config.c b/libatalk/acl/ldap_config.c index 546cbbed..dd7acc67 100644 --- a/libatalk/acl/ldap_config.c +++ b/libatalk/acl/ldap_config.c @@ -1,5 +1,5 @@ /* - $Id: ldap_config.c,v 1.1 2009-02-02 11:55:01 franklahm Exp $ + $Id: ldap_config.c,v 1.2 2009-11-20 17:45:47 franklahm Exp $ Copyright (c) 2009 Frank Lahm This program is free software; you can redistribute it and/or modify @@ -58,7 +58,7 @@ static int getpref(char *buf, char **R_pref, char **R_val) return 0; } -/* Parse the ldap.conf file */ +/* Parse the afp_ldap.conf file */ int acl_ldap_readconfig(char *name) { int i, j; diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am index e8670277..c3f37ddc 100644 --- a/man/man5/Makefile.am +++ b/man/man5/Makefile.am @@ -13,11 +13,11 @@ SUFFIXES = .tmpl . man_MANS = AppleVolumes.default.5 afpd.conf.5 \ atalkd.conf.5 netatalk.conf.5 papd.conf.5 \ - ldap.conf.5 + afp_ldap.conf.5 TEMPLATE_FILES = AppleVolumes.default.5.tmpl afpd.conf.5.tmpl \ atalkd.conf.5.tmpl netatalk.conf.5.tmpl papd.conf.5.tmpl \ - ldap.conf.5.tmpl + afp_ldap.conf.5.tmpl CLEANFILES = $(man_MANS) diff --git a/man/man5/ldap.conf.5.tmpl b/man/man5/afp_ldap.conf.5.tmpl similarity index 93% rename from man/man5/ldap.conf.5.tmpl rename to man/man5/afp_ldap.conf.5.tmpl index b7dc0649..17df2bd3 100644 --- a/man/man5/ldap.conf.5.tmpl +++ b/man/man5/afp_ldap.conf.5.tmpl @@ -1,4 +1,4 @@ -.\" Title: ldap.conf +.\" Title: afp_ldap.conf .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.74.0 .\" Date: 31-01-2009 @@ -89,7 +89,7 @@ .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "Name" -ldap.conf \- Configuration file used by afpd(8) to configure a LDAP connection to an LDAP server\&. That is needed for ACL support in order to be able to query LDAP for UUIDs\&. +afp_ldap.conf \- Configuration file used by afpd(8) to configure a LDAP connection to an LDAP server\&. That is needed for ACL support in order to be able to query LDAP for UUIDs\&. .SH "Description" .PP \FC:ETCDIR:/ldap\&.conf\F[] @@ -193,7 +193,7 @@ Name of the LDAP attribute with the groups short name\&. .RE .SH "Examples" .PP -\fBExample.\ \&ldap.conf setup with simple bind\fR +\fBExample.\ \&afp_ldap.conf setup with simple bind\fR .sp .if n \{\ .RS 4 diff --git a/man/man8/afp_acls.8.tmpl b/man/man8/afp_acls.8.tmpl index 4e7d7d82..0b76d036 100644 --- a/man/man8/afp_acls.8.tmpl +++ b/man/man8/afp_acls.8.tmpl @@ -225,5 +225,5 @@ option to the volume defintion\&. .RE .SH "SEE ALSO" .PP -\fBldap.conf\fR(5), +\fBafp_ldap.conf\fR(5), \fBAppleVolumes.default\fR(5) -- 2.39.2