From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 14 Jul 2010 01:32:49 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1%1.0.8+1.0.9pre1-1~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=f8d5dd05dd28fe122832b229c5298d254eb4b581;hp=-c

Merge branch 'upstream'

Conflicts:
	configure
	debian/changelog
	debian/control
	debian/etc.exports
	debian/nfs-common.default
	debian/nfs-common.dirs
	debian/nfs-common.init
	debian/nfs-common.install
	debian/nfs-common.postinst
	debian/nfs-common.postrm
	debian/nfs-common.prerm
	debian/nfs-kernel-server.default
	debian/nfs-kernel-server.dirs
	debian/nfs-kernel-server.init
	debian/nfs-kernel-server.postinst
	debian/nfs-kernel-server.postrm
	debian/nfs-kernel-server.prerm
	debian/rules
	support/nfs/exports.c
	utils/mountd/mountd.c
	utils/mountd/mountd.man
---

f8d5dd05dd28fe122832b229c5298d254eb4b581
diff --combined support/nfs/exports.c
index c103b90,18ce2c5..e6de71a
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@@ -89,8 -89,8 +89,8 @@@ getexportent(int fromkernel, int fromex
  		ee.e_flags &= ~NFSEXP_GATHERED_WRITES;
  	}
  	ee.e_maptype = CLE_MAP_IDENT;
 -	ee.e_anonuid = -2;
 -	ee.e_anongid = -2;
 +	ee.e_anonuid = 65534;
 +	ee.e_anongid = 65534;
  	ee.e_squids = NULL;
  	ee.e_sqgids = NULL;
  	ee.e_mountpoint = NULL;
@@@ -167,7 -167,7 +167,7 @@@ putexportent(struct exportent *ep
  
  	fp = efp->x_fp;
  	for (i=0; esc[i]; i++)
- 	        if (iscntrl(esc[i]) || esc[i] == '"' || esc[i] == '\\'|| isspace(esc[i]) || isspace(esc[i]))
+ 	        if (iscntrl(esc[i]) || esc[i] == '"' || esc[i] == '\\' || esc[i] == '#' || isspace(esc[i]))
  			fprintf(fp, "\\%03o", esc[i]);
  		else
  			fprintf(fp, "%c", esc[i]);
@@@ -271,8 -271,8 +271,8 @@@ mkexportent(char *hname, char *path, ch
  
  	ee.e_flags = EXPORT_DEFAULT_FLAGS;
  	ee.e_maptype = CLE_MAP_IDENT;
 -	ee.e_anonuid = -2;
 -	ee.e_anongid = -2;
 +	ee.e_anonuid = 65534;
 +	ee.e_anongid = 65534;
  	ee.e_squids = NULL;
  	ee.e_sqgids = NULL;
  	ee.e_mountpoint = NULL;
diff --combined utils/gssd/Makefile.in
index 4410fd7,3c425bf..c62bc22
--- a/utils/gssd/Makefile.in
+++ b/utils/gssd/Makefile.in
@@@ -124,6 -124,8 +124,8 @@@ CFLAGS = @CFLAGS
  CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  CONFIG_GSS_FALSE = @CONFIG_GSS_FALSE@
  CONFIG_GSS_TRUE = @CONFIG_GSS_TRUE@
+ CONFIG_MOUNT_FALSE = @CONFIG_MOUNT_FALSE@
+ CONFIG_MOUNT_TRUE = @CONFIG_MOUNT_TRUE@
  CONFIG_NFSV4_FALSE = @CONFIG_NFSV4_FALSE@
  CONFIG_NFSV4_TRUE = @CONFIG_NFSV4_TRUE@
  CONFIG_RQUOTAD_FALSE = @CONFIG_RQUOTAD_FALSE@
@@@ -283,7 -285,7 +285,7 @@@ gssd_SOURCES = 
  	write_bytes.h
  
  gssd_LDADD = $(RPCSECGSS_LIBS) $(KRBLIBS)
 -gssd_LDFLAGS = -Wl,-rpath=$(KRBDIR)/lib
 +gssd_LDFLAGS = 
  gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
  	      $(RPCSECGSS_CFLAGS) $(KRBCFLAGS)