Merge branch POSIX ACLs

diff --git a/NEWS b/NEWS
index 64908a2f837bc46580f9349516b338eb722383d5..1ff6440fe24dc90d64d6ecde12e4df5c2aa82aac 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@ Changes in 2.1.2
 * UPD: afpd: umask for home folders is no longer taken from startup umask.
 * UPD: afpd: dont and permissions with parent folder when creating new
        directories on "upriv" volumes.
+* UPD: afpd: use 'afpserver@fqdn' instead of 'afpserver/fqdn@realm'.
+       Prevents a crash in older GNU GSSAPI libs on eg. CentOS 5.x.
  
 Changes in 2.1.1
 ================

diff --git a/VERSION b/VERSION
index 3e3c2f1e5edb083aab93646ac7b076daa38516dd..eca07e4c1a8cbc603e5d5c2885dc0f0f9b1eef8d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.1
+2.1.2

diff --git a/config/AppleVolumes.default.tmpl b/config/AppleVolumes.default.tmpl
index 5825039d76b68b4c6661f8c8420f7e4404231b7a..d4453a70fac615573447571e95d5a41bfdd6d639 100644 (file)
--- a/config/AppleVolumes.default.tmpl
+++ b/config/AppleVolumes.default.tmpl
@@ -89,11 +89,15 @@
 #
 # perm                -> default permission value
 #                        OR with the client requested perm
+#                        Use with options:upriv
 # dperm               -> default permission value for directories
 #                        OR with the client requested perm
+#                        Use with options:upriv
 # fperm               -> default permission value for files
 #                        OR with the client requested perm
+#                        Use with options:upriv
 # umask               -> set perm mask
+#                        Use with options:upriv
 # dbpath:path         -> store the database stuff in the following path.
 # cnidserver:server[:port]
 #                     -> Query this servername or IP address

diff --git a/etc/uams/uams_gss.c b/etc/uams/uams_gss.c
index fb5e73c791a6cd72cfd82d3eb1a315c7b97db2a0..044dd278bac78dea2d88ac3e72e8555ccf440812 100644 (file)
--- a/etc/uams/uams_gss.c
+++ b/etc/uams/uams_gss.c
@@ -125,7 +125,8 @@ static void log_ctx_flags( OM_uint32 flags )
 
 static void log_principal(gss_name_t server_name)
 {
-#ifdef DEBUG1
+#if 0
+    /* FIXME: must call gss_canonicalize_name before gss_export_name */
     OM_uint32 major_status = 0, minor_status = 0;
     gss_buffer_desc exported_name;
 
@@ -140,16 +141,12 @@ static void log_principal(gss_name_t server_name)
 static int get_afpd_principal(void *obj, gss_name_t *server_name)
 {
     OM_uint32 major_status = 0, minor_status = 0;
-    char *realm, *fqdn, *service, *principal, *p;
-    size_t realmlen=0, fqdnlen=0, servicelen=0;
+    char *fqdn, *service, *principal, *p;
+    size_t fqdnlen=0, servicelen=0;
     size_t principal_length;
     gss_buffer_desc s_princ_buffer;
 
     /* get all the required information from afpd */
-    if (uam_afpserver_option(obj, UAM_OPTION_KRB5REALM, (void*) &realm, &realmlen) < 0)
-        return 1;
-    LOG(log_debug, logtype_uams, "get_afpd_principal: REALM: %s", realm);
-
     if (uam_afpserver_option(obj, UAM_OPTION_FQDN, (void*) &fqdn, &fqdnlen) < 0)
         return 1;
     LOG(log_debug, logtype_uams, "get_afpd_principal: fqdn: %s", fqdn);
@@ -159,14 +156,14 @@ static int get_afpd_principal(void *obj, gss_name_t *server_name)
     LOG(log_debug, logtype_uams, "get_afpd_principal: service: %s", service);
 
     /* we need all the info, log error and return if one's missing */
-    if (!service || !servicelen || !fqdn || !fqdnlen || !realm || !realmlen) {
+    if (!service || !servicelen || !fqdn || !fqdnlen) {
         LOG(log_error, logtype_uams,
             "get_afpd_principal: could not retrieve required information from afpd.");
         return 1;
     }
 
     /* allocate memory to hold the temporary principal string */
-    principal_length = servicelen + 1 + fqdnlen + 1 + realmlen + 1;
+    principal_length = servicelen + 1 + fqdnlen + 1;
     if ( NULL == (principal = (char*) malloc( principal_length)) ) {
         LOG(log_error, logtype_uams,
             "get_afpd_principal: out of memory allocating %u bytes",
@@ -176,24 +173,21 @@ static int get_afpd_principal(void *obj, gss_name_t *server_name)
 
     /*
      * Build the principal string.
-     * Format: 'service/fqdn@realm'
+     * Format: 'service@fqdn'
      */
     strlcpy( principal, service, principal_length);
-    strlcat( principal, "/", principal_length);
+    strlcat( principal, "@", principal_length);
 
     /*
      * The fqdn we get from afpd may contain a port.
      * We need to strip the port from fqdn for principal.
      */
-    p = strchr(fqdn, ':');
-    if (p)
+    if ((p = strchr(fqdn, ':')))
         *p = '\0';
+
     strlcat( principal, fqdn, principal_length);
     if (p)
         *p = ':';
-    strlcat( principal, "@", principal_length);
-    strlcat( principal, realm, principal_length);
-
     /*
      * Import our principal into the gssapi internal representation
      * stored in server_name.
@@ -204,7 +198,7 @@ static int get_afpd_principal(void *obj, gss_name_t *server_name)
     LOG(log_debug, logtype_uams, "get_afpd_principal: importing principal `%s'", principal);
     major_status = gss_import_name( &minor_status,
                                     &s_princ_buffer,
-                                    GSS_C_NO_OID,
+                                    GSS_C_NT_HOSTBASED_SERVICE,
                                     server_name );
 
     /*

diff --git a/man/man1/achfile.1 b/man/man1/achfile.1
index 8143b1ed0bf3951acc4c9e5fffafbaddd6dff396..3acef044b2c40df8647a74c8a0c97a05ce8c6864 100644 (file)
--- a/man/man1/achfile.1
+++ b/man/man1/achfile.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: achfile
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 26 Feb 1998
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/ad.1 b/man/man1/ad.1
index f7fc2ab23879fdc6df9eb2ce4a4c3e60ff2de204..597b4a4e5ef190f2859b7b402582c13cdebef5db 100644 (file)
--- a/man/man1/ad.1
+++ b/man/man1/ad.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: ad
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 01 Sep 2009
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/aecho.1 b/man/man1/aecho.1
index 0e00354820785a7e76e17b2be02222bb537d3d4c..24e108aedcac433fbb5065f1678a11627fb0f158 100644 (file)
--- a/man/man1/aecho.1
+++ b/man/man1/aecho.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: aecho
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 17 Dec 1991
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/afile.1 b/man/man1/afile.1
index 2bc2eae8a16456540cf9de09d6a766bc4652618d..f53772609438965229d1c09937bc160912fe62d3 100644 (file)
--- a/man/man1/afile.1
+++ b/man/man1/afile.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: afile
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 26 Feb 1998
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/afppasswd.1 b/man/man1/afppasswd.1
index b8febea3ddbc7cd14d3ebc8c0067202eb23747ea..0fea6807c4a7c5692da2ec65e0760767a7388e91 100644 (file)
--- a/man/man1/afppasswd.1
+++ b/man/man1/afppasswd.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: afppasswd
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 22 Aug 2004
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/apple_cp.1.tmpl b/man/man1/apple_cp.1.tmpl
index da22c6b14c61f749cf977a9cc0c4b81922df7e10..59dd84b08682b7b0f6bbf01a7aaa1b700dae9b4a 100644 (file)
--- a/man/man1/apple_cp.1.tmpl
+++ b/man/man1/apple_cp.1.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: apple_cp
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 22 Aug 2004
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/apple_dump.1 b/man/man1/apple_dump.1
index 496ef2644da6eb7ed455f5952364090718d0a1c8..d915cd8cdfe43db2884537e0f2068587e189225c 100644 (file)
--- a/man/man1/apple_dump.1
+++ b/man/man1/apple_dump.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: apple_dump
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 31 Mar 2010
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/apple_mv.1.tmpl b/man/man1/apple_mv.1.tmpl
index 29de033899c3702e69b678a37cb1e24ddfbe9077..e91d28cef0824daf29096afb57f46f48e7a322c5 100644 (file)
--- a/man/man1/apple_mv.1.tmpl
+++ b/man/man1/apple_mv.1.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: apple_mv
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 22 Aug 2004
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/apple_rm.1.tmpl b/man/man1/apple_rm.1.tmpl
index 26aa8d1cf25a6628bdd8789fb7d67dc33b3ab1df..90dc0a9846a7d4e9c89457731ca9fab6c0244970 100644 (file)
--- a/man/man1/apple_rm.1.tmpl
+++ b/man/man1/apple_rm.1.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: apple_rm
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 22 Aug 2004
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/asip-status.pl.1.tmpl b/man/man1/asip-status.pl.1.tmpl
index cd94707260ee05eb7ea4ee9c3fc4317c532f8481..f5c2d64afcd35a286af6a1774819a3a2104dbc31 100644 (file)
--- a/man/man1/asip-status.pl.1.tmpl
+++ b/man/man1/asip-status.pl.1.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: asip-status.pl
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 22 Aug 2004
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/dbd.1 b/man/man1/dbd.1
index 8093fe5fab371480ab57949196ef9738143e93be..54d40ee6f2a20866c76936f10754f7354b9db869 100644 (file)
--- a/man/man1/dbd.1
+++ b/man/man1/dbd.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: dbd
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 23 Dec 2009
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/getzones.1 b/man/man1/getzones.1
index 1571c5811bfe8da88ec540c74842a8c0d5df05ba..c60148629b1064febac5bb9bb093aacf031ca0ec 100644 (file)
--- a/man/man1/getzones.1
+++ b/man/man1/getzones.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: getzones
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 17 Dec 1991
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/megatron.1 b/man/man1/megatron.1
index 2e8e6e84eacf9d69bccc7c42a5c0fa61c38ac651..b665673ec0ee3cffd67cfd2fc71c7b2c27c287c6 100644 (file)
--- a/man/man1/megatron.1
+++ b/man/man1/megatron.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: megatron
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 8 Jan 1992
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/nbp.1 b/man/man1/nbp.1
index f286b5d2fb4e16879b42121807e3a1b6d0c12ad6..036cd31886a6a6f8bb6a04493efffa00db3341c0 100644 (file)
--- a/man/man1/nbp.1
+++ b/man/man1/nbp.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: nbp
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 24 June 2004
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/netatalk-config.1 b/man/man1/netatalk-config.1
index c61a5175c76d23fb112a26de333e12966f1df54e..3ceecbcefefc6cfdb99b2354ebbad4a35b39fe13 100644 (file)
--- a/man/man1/netatalk-config.1
+++ b/man/man1/netatalk-config.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: netatalk-config
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 09 June 2001
 .\"    Manual: The Netatalk Project
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/pap.1 b/man/man1/pap.1
index 90a67430c6d1abc64cb5fb2afa139e04f36330bb..784ae4b7151c8ca6623f46783058988f7c1c6c15 100644 (file)
--- a/man/man1/pap.1
+++ b/man/man1/pap.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: pap
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 6 May 2002
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/psorder.1 b/man/man1/psorder.1
index fb50d8a10864bc34aa519c3ec78ced0596934fdf..9f736cb0eacc10d0f9bf031502b75c6a2206cf40 100644 (file)
--- a/man/man1/psorder.1
+++ b/man/man1/psorder.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: psorder
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 17 Dec 1991
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man1/uniconv.1.tmpl b/man/man1/uniconv.1.tmpl
index 512fb58c6ecf2910c354d4f5737ba58f92b15d09..1d49c30b170a21a0e18d942e97468002f7d601d9 100644 (file)
--- a/man/man1/uniconv.1.tmpl
+++ b/man/man1/uniconv.1.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: uniconv
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 24 Jun 2004
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man3/atalk_aton.3 b/man/man3/atalk_aton.3
index 83d61c409f2cd7a79f8692d38ce8732af73bd71c..f8420ead7bd0f691f9497af040d2a9e13e0fd477 100644 (file)
--- a/man/man3/atalk_aton.3
+++ b/man/man3/atalk_aton.3
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: atalk_aton
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 12 Jan 1994
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man3/nbp_name.3 b/man/man3/nbp_name.3
index 93a11337066be549c2d47a078d42ad0980f25ec2..4a9e1026d877766e56564d5f271b44a8ebb6e71b 100644 (file)
--- a/man/man3/nbp_name.3
+++ b/man/man3/nbp_name.3
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: nbp_name
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 12 Jan 1994
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man4/atalk.4 b/man/man4/atalk.4
index 5c6f6f5c5b58320d41297b3db26b5c49af5cc980..24be709eaf66244a1d73e14c2afe35d3949b1cc9 100644 (file)
--- a/man/man4/atalk.4
+++ b/man/man4/atalk.4
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: atalk
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 17 Dec 1991
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man5/AppleVolumes.default.5.tmpl b/man/man5/AppleVolumes.default.5.tmpl
index 3ca6ddacfc1df998f64ba0f857eeb796d3740038..9b3914ed779550d5ab052c377ecfe25400117ab9 100644 (file)
--- a/man/man5/AppleVolumes.default.5.tmpl
+++ b/man/man5/AppleVolumes.default.5.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: AppleVolumes.default
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 22 Apr 2010
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1
@@ -321,7 +321,8 @@ is for directories only\&. Use with
 .PP
 umask:\fI[mode]\fR
 .RS 4
-set perm mask\&.
+set perm mask\&. Use with
+\fBoptions:upriv\fR\&.
 .RE
 .PP
 preexec:\fI[command]\fR

diff --git a/man/man5/afp_ldap.conf.5.tmpl b/man/man5/afp_ldap.conf.5.tmpl
index 3076edc9135ea8d7ad71bb88bc61f03c298274c3..0b909e330338867f9df634309bd7ad12adad6539 100644 (file)
--- a/man/man5/afp_ldap.conf.5.tmpl
+++ b/man/man5/afp_ldap.conf.5.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: afp_ldap.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 28 November 2009
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man5/afp_signature.conf.5.tmpl b/man/man5/afp_signature.conf.5.tmpl
index cb27350a4caf6e263de624f9bf952a60c5ec2707..59de330138122c603f06814f902e7bfc32a97ed0 100644 (file)
--- a/man/man5/afp_signature.conf.5.tmpl
+++ b/man/man5/afp_signature.conf.5.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: afp_signature.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 29 March 2010
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man5/afpd.conf.5.tmpl b/man/man5/afpd.conf.5.tmpl
index 4165cd82912bfebd2d36c88352a513c6eaa31aa2..0b440d05d7b8fb8aac28241c051713bd1478b31d 100644 (file)
--- a/man/man5/afpd.conf.5.tmpl
+++ b/man/man5/afpd.conf.5.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: afpd.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 23 December 2009
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man5/atalkd.conf.5.tmpl b/man/man5/atalkd.conf.5.tmpl
index 22c4c6fa24bda7e53ae0e0bce9a6027f0ac54acd..b618c764ef7ba8862a4d00e3b975148fc7f79b35 100644 (file)
--- a/man/man5/atalkd.conf.5.tmpl
+++ b/man/man5/atalkd.conf.5.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: atalkd.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 22 September 2000
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man5/netatalk.conf.5.tmpl b/man/man5/netatalk.conf.5.tmpl
index 499bd6b57d406101dba8f32813716043345c1b08..138fb62562937ae07a2db64b5410eef8e14a66e7 100644 (file)
--- a/man/man5/netatalk.conf.5.tmpl
+++ b/man/man5/netatalk.conf.5.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: netatalk.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 9 Jun 2009
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man5/papd.conf.5.tmpl b/man/man5/papd.conf.5.tmpl
index a3cf2192a43f32fec3fa1c4d334784a3ee9b9ec4..ca8103fa144dfafbc29868a473e8812a4212ebfb 100644 (file)
--- a/man/man5/papd.conf.5.tmpl
+++ b/man/man5/papd.conf.5.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: papd.conf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 06 Sep 2004
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man8/afp_acls.8.tmpl b/man/man8/afp_acls.8.tmpl
index 3a4c7d69f55df19253c51f83ccd44c8b5100af1d..c09f03ba7c237f34a43f8757de3d3925edb2b63d 100644 (file)
--- a/man/man8/afp_acls.8.tmpl
+++ b/man/man8/afp_acls.8.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: afp_acls
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 02 Feb 2009
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man8/afpd.8.tmpl b/man/man8/afpd.8.tmpl
index 117fecb6d034a5e1e8ce8d82b4922982c629d5df..1995473a7ae58170221b20a9ff88ae092eb14111 100644 (file)
--- a/man/man8/afpd.8.tmpl
+++ b/man/man8/afpd.8.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: afpd
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 21 Apr 2010
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man8/atalkd.8.tmpl b/man/man8/atalkd.8.tmpl
index 7cb4ccf29b3f2ea8c919bd34e4d9192d9d65d60f..3f478fab24a4b049406beb30ed608f3da9b5e7ec 100644 (file)
--- a/man/man8/atalkd.8.tmpl
+++ b/man/man8/atalkd.8.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: atalkd
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 06 Sep 2004
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man8/cnid_dbd.8.tmpl b/man/man8/cnid_dbd.8.tmpl
index e6578852f5dd8c79bf4cad9b115bdcaeef7b0987..5fc967a55bd7f8f21a37ef63b90ae696ad3223b7 100644 (file)
--- a/man/man8/cnid_dbd.8.tmpl
+++ b/man/man8/cnid_dbd.8.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: cnid_dbd
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 21 Mar 2009
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man8/cnid_metad.8.tmpl b/man/man8/cnid_metad.8.tmpl
index 8719da6a19804d455f3debf3fcc3b766da9764cf..1698faab2fc51bb0d837230fd78c82f6ab1e83cc 100644 (file)
--- a/man/man8/cnid_metad.8.tmpl
+++ b/man/man8/cnid_metad.8.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: cnid_metad
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 23 Dec 2009
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1
@@ -123,7 +123,7 @@ before serving requests\&. This userid will be inherited by all
 daemon processes started\&.
 .RE
 .PP
-\fB\-u\fR\fI group\fR
+\fB\-g\fR\fI group\fR
 .RS 4
 Switch to the groupid of
 \fIgroup\fR

diff --git a/man/man8/papd.8.tmpl b/man/man8/papd.8.tmpl
index 68fa8e9bfcfdf2dd0ab852b8ab0006c06717752e..3e94ed8bd86211237d9b8f1c98bf0514a9ca2e8d 100644 (file)
--- a/man/man8/papd.8.tmpl
+++ b/man/man8/papd.8.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: papd
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 06 September 2004
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1
@@ -258,7 +258,7 @@ when using CUPS 1\&.1\&.19 or above)\&.
 When printing clients run MacOS 10\&.2 or above, take care that PPDs do not make use of
 \fB*cupsFilter:\fR
 comments unless the appropriate filters are installed at the client\'s side, too (remember: Starting with 10\&.2 Apple chose to integrate CUPS into MacOS X)\&. For in\-depth information on how CUPS uses PPDs see chapter 3\&.4 in
-\m[blue]\fB http://tinyurl\&.com/zbxn\fR\m[]\&\s-2\u[2]\d\s+2)\&.
+\m[blue]\fBhttp://tinyurl\&.com/zbxn\fR\m[]\&\s-2\u[2]\d\s+2)\&.
 .SH "SEE ALSO"
 .PP
 \fBlpr\fR(1),\fBlprm\fR(1),\fBprintcap\fR(5),\fBlpc\fR(8),\fBlpd\fR(8),

diff --git a/man/man8/papstatus.8.tmpl b/man/man8/papstatus.8.tmpl
index 5e40b4ef5a84d9457a8b09c9ca65b77310f04993..ad4b6fbde4b9c17f8391140b3f56247a05ae55e0 100644 (file)
--- a/man/man8/papstatus.8.tmpl
+++ b/man/man8/papstatus.8.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: papstatus
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 17 Dec 1991
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man8/psf.8.tmpl b/man/man8/psf.8.tmpl
index b53d5adefef19bee0d4aaf74df36e191e66a347f..18913946b3dd389a317c82ecb9e01af15671d69f 100644 (file)
--- a/man/man8/psf.8.tmpl
+++ b/man/man8/psf.8.tmpl
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: psf
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 17 Dec 1991
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1

diff --git a/man/man8/timelord.8 b/man/man8/timelord.8
index ba2b7f165d0584b5f49e1a330585cc4e7c97e231..46a6829300b18121f01aa7a1ff5cad5b974a410c 100644 (file)
--- a/man/man8/timelord.8
+++ b/man/man8/timelord.8
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: timelord
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 27 Jun 2001
 .\"    Manual: The Netatalk Project
 .\"    Source: Netatalk 2.1