fix for VOLOPT_MAX being 11 instead of 9 without FORCE_UIDGID

(thanks to Axel Bringenberg <A.Bringenberg@srz-berlin.de>)

diff --git a/ChangeLog b/ChangeLog
index f055d368f0af6d668e8514bb52d0d489a76cbdbd..9878a64a1c585246f1de55222fd9dab20bf2fb62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-($Id: ChangeLog,v 1.16 2001-03-07 15:19:20 rufustfirefly Exp $)
+($Id: ChangeLog,v 1.17 2001-03-07 15:36:54 rufustfirefly Exp $)
+
+2001-03-07 10:34 EST  jeff b  <jeff@univrel.pr.uconn.edu>  
+
+       * etc/afpd/volume.c: changed VOLOPT_MAX to be 9 if FORCE_UIDGID is not
+       defined (thanks to Axel Bringenberg <A.Bringenberg@srz-berlin.de>)
 
 2001-03-07 10:14 EST  jeff b  <jeff@univrel.pr.uconn.edu>  
 

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index 5da659af887eae22077ef810ff4511affa633451..107867bd200dd68ae778592d444b4f4701e37894 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.5 2001-02-28 16:53:24 rufustfirefly Exp $
+ * $Id: volume.c,v 1.6 2001-03-07 15:36:54 rufustfirefly Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -83,9 +83,11 @@ static struct extmap *extmap = NULL, *defextmap = NULL;
 #ifdef FORCE_UIDGID
 #define VOLOPT_FORCEUID  10  /* force uid for username x */
 #define VOLOPT_FORCEGID  11  /* force gid for group x */
-#endif FORCE_UIDGID
-
 #define VOLOPT_MAX        11
+#else /* normally, there are only 9 possible options */
+#define VOLOPT_MAX        9
+#endif /* FORCE_UIDGID */
+
 #define VOLOPT_NUM        (VOLOPT_MAX + 1)
 
 #define VOLPASSLEN  8