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
/*
- $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 <franklahm@gmail.com>
This program is free software; you can redistribute it and/or modify
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;
}
* 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
-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)/\"
/*
- $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 <franklahm@gmail.com>
This program is free software; you can redistribute it and/or modify
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
/*
- * $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.
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();
/*
- $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 <franklahm@gmail.com>
This program is free software; you can redistribute it and/or modify
return 0;
}
-/* Parse the ldap.conf file */
+/* Parse the afp_ldap.conf file */
int acl_ldap_readconfig(char *name)
{
int i, j;
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)
--- /dev/null
+.\" Title: afp_ldap.conf
+.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
+.\" Date: 31-01-2009
+.\" Manual: Netatalk 2.0 Manual
+.\" Source: :NETATALK_VERSION:
+.\" Language: English
+.\"
+.TH "LDAP\&.CONF" "5" "31-01-2009" ":NETATALK_VERSION:" "Netatalk 2.0 Manual"
+.\" -----------------------------------------------------------------
+.\" * (re)Define some macros
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" BB/BE - put background/screen (filled box) around block of text
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de BB
+.if t \{\
+.sp -.5
+.br
+.in +2n
+.ll -2n
+.gcolor red
+.di BX
+.\}
+..
+.de EB
+.if t \{\
+.if "\\$2"adjust-for-leading-newline" \{\
+.sp -1
+.\}
+.br
+.di
+.in
+.ll
+.gcolor
+.nr BW \\n(.lu-\\n(.i
+.nr BH \\n(dn+.5v
+.ne \\n(BHu+.5v
+.ie "\\$2"adjust-for-leading-newline" \{\
+\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+.\}
+.el \{\
+\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+.\}
+.in 0
+.sp -.5v
+.nf
+.BX
+.in
+.sp .5v
+.fi
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" BM/EM - put colored marker in margin next to block of text
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de BM
+.if t \{\
+.br
+.ll -2n
+.gcolor red
+.di BX
+.\}
+..
+.de EM
+.if t \{\
+.br
+.di
+.ll
+.gcolor
+.nr BH \\n(dn
+.ne \\n(BHu
+\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[]
+.in 0
+.nf
+.BX
+.in
+.fi
+.\}
+..
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "Name"
+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[]
+is the configuration file used by
+\fBafpd\fR
+to set up an LDAP connection to an LDAP server\&.
+.PP
+Any line not prefixed with # is interpreted\&.
+.PP
+.if n \{\
+.sp
+.\}
+.RS 4
+.BM yellow
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+.PP
+You can use
+\fBuuidtest\fR(1)
+to syntactically check your config
+.sp .5v
+.EM yellow
+.RE
+The required parameters and their meanings are:
+.SH "Parameter"
+.PP
+ldap_server
+.RS 4
+Name or IP address of your LDAP Server
+.sp
+.RE
+.PP
+ldap_auth_method
+.RS 4
+<none|simple|sasl>
+.PP
+none
+.RS 4
+anonymous LDAP bind
+.RE
+.PP
+simple
+.RS 4
+simple LDAP bind
+.RE
+.PP
+sasl
+.RS 4
+SASL\&. Not yet supported !
+.RE
+.RE
+.PP
+ldap_auth_dn
+.RS 4
+Distinguished Name of the user for simple bind\&.
+.sp
+.RE
+.PP
+ldap_auth_pw
+.RS 4
+Distinguished Name of the user for simple bind\&.
+.sp
+.RE
+.PP
+ldap_userbase
+.RS 4
+DN of the user container in LDAP\&.
+.sp
+.RE
+.PP
+ldap_groupbase
+.RS 4
+DN of the group container in LDAP\&.
+.sp
+.RE
+.PP
+ldap_uuuid_attr
+.RS 4
+Name of the LDAP attribute with the UUIDs\&.
+.sp
+Note: this is used both for users and groups\&.
+.sp
+.RE
+.PP
+ldap_name_attr
+.RS 4
+Name of the LDAP attribute with the users short name\&.
+.sp
+.RE
+.PP
+ldap_group_attr
+.RS 4
+Name of the LDAP attribute with the groups short name\&.
+.sp
+.RE
+.SH "Examples"
+.PP
+\fBExample.\ \&afp_ldap.conf setup with simple bind\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.fam C
+.ps -1
+.nf
+.BB lightgray
+ldap_server = localhost
+ldap_auth_method = simple
+ldap_auth_dn = cn=admin,dc=domain,dc=org
+ldap_auth_pw = notthisone
+ldap_userbase = ou=users,dc=domain,dc=org
+ldap_groupbase = ou=groups,dc=domain,dc=org
+ldap_uuid_attr = some_attribute
+ldap_name_attr = cn
+ldap_group_attr = cn
+.EB lightgray
+.fi
+.fam
+.ps +1
+.if n \{\
+.RE
+.\}
+.SH "See also"
+.PP
+\fBafpd\fR(8),
+\fBAppleVolumes.default\fR(5),\fBuuidtest\fR(1)
+++ /dev/null
-.\" Title: ldap.conf
-.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
-.\" Date: 31-01-2009
-.\" Manual: Netatalk 2.0 Manual
-.\" Source: :NETATALK_VERSION:
-.\" Language: English
-.\"
-.TH "LDAP\&.CONF" "5" "31-01-2009" ":NETATALK_VERSION:" "Netatalk 2.0 Manual"
-.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" BB/BE - put background/screen (filled box) around block of text
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.de BB
-.if t \{\
-.sp -.5
-.br
-.in +2n
-.ll -2n
-.gcolor red
-.di BX
-.\}
-..
-.de EB
-.if t \{\
-.if "\\$2"adjust-for-leading-newline" \{\
-.sp -1
-.\}
-.br
-.di
-.in
-.ll
-.gcolor
-.nr BW \\n(.lu-\\n(.i
-.nr BH \\n(dn+.5v
-.ne \\n(BHu+.5v
-.ie "\\$2"adjust-for-leading-newline" \{\
-\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
-.\}
-.el \{\
-\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
-.\}
-.in 0
-.sp -.5v
-.nf
-.BX
-.in
-.sp .5v
-.fi
-.\}
-..
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" BM/EM - put colored marker in margin next to block of text
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.de BM
-.if t \{\
-.br
-.ll -2n
-.gcolor red
-.di BX
-.\}
-..
-.de EM
-.if t \{\
-.br
-.di
-.ll
-.gcolor
-.nr BH \\n(dn
-.ne \\n(BHu
-\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[]
-.in 0
-.nf
-.BX
-.in
-.fi
-.\}
-..
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * 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\&.
-.SH "Description"
-.PP
-\FC:ETCDIR:/ldap\&.conf\F[]
-is the configuration file used by
-\fBafpd\fR
-to set up an LDAP connection to an LDAP server\&.
-.PP
-Any line not prefixed with # is interpreted\&.
-.PP
-.if n \{\
-.sp
-.\}
-.RS 4
-.BM yellow
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-.PP
-You can use
-\fBuuidtest\fR(1)
-to syntactically check your config
-.sp .5v
-.EM yellow
-.RE
-The required parameters and their meanings are:
-.SH "Parameter"
-.PP
-ldap_server
-.RS 4
-Name or IP address of your LDAP Server
-.sp
-.RE
-.PP
-ldap_auth_method
-.RS 4
-<none|simple|sasl>
-.PP
-none
-.RS 4
-anonymous LDAP bind
-.RE
-.PP
-simple
-.RS 4
-simple LDAP bind
-.RE
-.PP
-sasl
-.RS 4
-SASL\&. Not yet supported !
-.RE
-.RE
-.PP
-ldap_auth_dn
-.RS 4
-Distinguished Name of the user for simple bind\&.
-.sp
-.RE
-.PP
-ldap_auth_pw
-.RS 4
-Distinguished Name of the user for simple bind\&.
-.sp
-.RE
-.PP
-ldap_userbase
-.RS 4
-DN of the user container in LDAP\&.
-.sp
-.RE
-.PP
-ldap_groupbase
-.RS 4
-DN of the group container in LDAP\&.
-.sp
-.RE
-.PP
-ldap_uuuid_attr
-.RS 4
-Name of the LDAP attribute with the UUIDs\&.
-.sp
-Note: this is used both for users and groups\&.
-.sp
-.RE
-.PP
-ldap_name_attr
-.RS 4
-Name of the LDAP attribute with the users short name\&.
-.sp
-.RE
-.PP
-ldap_group_attr
-.RS 4
-Name of the LDAP attribute with the groups short name\&.
-.sp
-.RE
-.SH "Examples"
-.PP
-\fBExample.\ \&ldap.conf setup with simple bind\fR
-.sp
-.if n \{\
-.RS 4
-.\}
-.fam C
-.ps -1
-.nf
-.BB lightgray
-ldap_server = localhost
-ldap_auth_method = simple
-ldap_auth_dn = cn=admin,dc=domain,dc=org
-ldap_auth_pw = notthisone
-ldap_userbase = ou=users,dc=domain,dc=org
-ldap_groupbase = ou=groups,dc=domain,dc=org
-ldap_uuid_attr = some_attribute
-ldap_name_attr = cn
-ldap_group_attr = cn
-.EB lightgray
-.fi
-.fam
-.ps +1
-.if n \{\
-.RE
-.\}
-.SH "See also"
-.PP
-\fBafpd\fR(8),
-\fBAppleVolumes.default\fR(5),\fBuuidtest\fR(1)
.RE
.SH "SEE ALSO"
.PP
-\fBldap.conf\fR(5),
+\fBafp_ldap.conf\fR(5),
\fBAppleVolumes.default\fR(5)
projects / netatalk.git / commitdiff