From 8623997475df1cee8cf7b12825d86237c0cd1ebd Mon Sep 17 00:00:00 2001
From: franklahm <franklahm>
Date: Thu, 8 Apr 2010 05:51:16 +0000
Subject: [PATCH] Revert upriv -> noupriv change

---
 etc/afpd/volume.c                    |  7 +++----
 man/man5/AppleVolumes.default.5.tmpl | 14 +++++---------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index bcdcef47..1a7380a8 100644
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.124 2010-04-06 12:00:27 franklahm Exp $
+ * $Id: volume.c,v 1.125 2010-04-08 05:51:16 franklahm Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -444,8 +444,8 @@ static void volset(struct vol_option *options, struct vol_option *save,
                 options[VOLOPT_PREEXEC].i_value = 1;
             else if (strcasecmp(p, "root_preexec_close") == 0)
                 options[VOLOPT_ROOTPREEXEC].i_value = 1;
-            else if (strcasecmp(p, "noupriv") == 0)
-                options[VOLOPT_FLAGS].i_value &= ~AFPVOL_UNIX_PRIV;
+            else if (strcasecmp(p, "upriv") == 0)
+                options[VOLOPT_FLAGS].i_value |= AFPVOL_UNIX_PRIV;
             else if (strcasecmp(p, "acls") == 0)
                 options[VOLOPT_FLAGS].i_value |= AFPVOL_ACLS;
             else if (strcasecmp(p, "nodev") == 0)
@@ -1119,7 +1119,6 @@ static int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int us
 
     /* Enable some default options for all volumes */
     save_options[VOLOPT_FLAGS].i_value |= AFPVOL_CACHE;
-    save_options[VOLOPT_FLAGS].i_value |= AFPVOL_UNIX_PRIV;
     save_options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_AUTO;
 
     while ( myfgets( buf, sizeof( buf ), fp ) != NULL ) {
diff --git a/man/man5/AppleVolumes.default.5.tmpl b/man/man5/AppleVolumes.default.5.tmpl
index 38139f12..998c90d6 100644
--- a/man/man5/AppleVolumes.default.5.tmpl
+++ b/man/man5/AppleVolumes.default.5.tmpl
@@ -2,12 +2,12 @@
 .\"     Title: AppleVolumes.default
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.74.3 <http://docbook.sf.net/>
-.\"      Date: 06 Apr 2010
+.\"      Date: 31 Mar 2010
 .\"    Manual: Netatalk 2.1
 .\"    Source: Netatalk 2.1
 .\"  Language: English
 .\"
-.TH "APPLEVOLUMES\&.DEFAU" "5" "06 Apr 2010" "Netatalk 2.1" "Netatalk 2.1"
+.TH "APPLEVOLUMES\&.DEFAU" "5" "31 Mar 2010" "Netatalk 2.1" "Netatalk 2.1"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -55,11 +55,7 @@ line\&. Though newline escaping is supported\&.
 .RE
 .PP
 It is possible to specify default options for all volumes with a
-\fI:DEFAULT: \fRline preceeding these volume definitions:
-.PP
-\fBExample.\ \&:DEFAULT: configuration line\fR
-.PP
-:DEFAULT: options:usedots dbpath:/var/dbd/AppleDB/$v dperm:0775 fperm:0664
+\fI:DEFAULT: \fRline preceeding these volume definitions:.PP \fBExample.\ \&:DEFAULT: configuration line\fR .PP :DEFAULT: options:upriv,usedots dbpath:/var/dbd/AppleDB/$v dperm:0775 fperm:0664
 .PP
 The possible options and their meanings are:
 .PP
@@ -221,9 +217,9 @@ root_preexec_close
 a non\-zero return code from root_preexec closes the volume immediately, preventing clients to mount/see the volume in question\&.
 .RE
 .PP
-noupriv
+upriv
 .RS 4
-Don\'t use AFP3 unix privileges\&. See also:
+use AFP3 unix privileges\&. Become familiar with the new "unix privileges" AFP permissions concepts in MacOS X before using this option\&. See also:
 \fBperm|fperm|dperm\fR\&.
 .RE
 .PP
-- 
2.39.2