Merge lp:~stgraber/ubuntu/saucy/nfs-utils/debian-merge into lp:ubuntu/saucy/nfs-utils

[Stéphane Graber]

Merge for nfs-utils, confirmed to build properly on amd64.

=== modified file '.gitignore'
--- .gitignore	2012-06-22 15:04:56 +0000
+++ .gitignore	2013-05-24 21:28:27 +0000
@@ -3,7 +3,6 @@
 autom4te.cache
 compile
 config.guess
-config.log
 config.sub
 configure
 depcomp
@@ -20,6 +19,8 @@
 aclocal/lt~obsolete.m4
 # files generated by configure
 confdefs.h
+config.cache
+config.log
 config.status
 conftest
 conftest.c
@@ -34,6 +35,7 @@
 *.o
 .libs
 lib*.a
+test-driver
 tools/rpcgen/rpcgen
 tools/rpcdebug/rpcdebug
 utils/blkmapd/blkmapd
@@ -49,7 +51,7 @@
 utils/rquotad/rquota.h
 utils/rquotad/rquota_xdr.c
 utils/showmount/showmount
-utils/nfsdcld/nfsdcld
+utils/nfsdcltrack/nfsdcltrack
 utils/statd/statd
 tools/locktest/testlk
 tools/getiversion/getiversion

=== modified file '.pc/01-sm-notify-in-sbin.patch/utils/statd/statd.c'
--- .pc/01-sm-notify-in-sbin.patch/utils/statd/statd.c	2010-04-06 16:11:22 +0000
+++ .pc/01-sm-notify-in-sbin.patch/utils/statd/statd.c	2013-05-24 21:28:27 +0000
@@ -99,7 +99,8 @@
 killer (int sig)
 {
 	statd_unregister ();
-	xlog_err ("Caught signal %d, un-registering and exiting", sig);
+	xlog(D_GENERAL, "Caught signal %d, un-registering and exiting", sig);
+	exit(0);
 }
 
 static void

=== modified file '.pc/02-524255-manpages.patch/utils/nfsd/nfsd.man'
--- .pc/02-524255-manpages.patch/utils/nfsd/nfsd.man	2012-05-25 20:41:58 +0000
+++ .pc/02-524255-manpages.patch/utils/nfsd/nfsd.man	2013-05-24 21:28:27 +0000
@@ -47,7 +47,7 @@
 .B rpc.nfsd
 does not offer certain versions of NFS. The current version of
 .B rpc.nfsd
-can support both NFS version 2,3 and the newer version 4.
+can support NFS versions 2,3,4 and the newer version 4.1.
 .TP
 .B \-s " or " \-\-syslog
 By default,
@@ -67,6 +67,13 @@
 .B rpc.nfsd
 from accepting UDP connections from clients.
 .TP
+.B \-V " or " \-\-nfs-version vers
+This option can be used to request that 
+.B rpc.nfsd
+offer certain versions of NFS. The current version of
+.B rpc.nfsd
+can support NFS versions 2,3,4 and the newer version 4.1.
+.TP
 .I nproc
 specify the number of NFS server threads. By default, just one
 thread is started. However, for optimum performance several threads

=== modified file '.pc/11-532048-reduce-verbosity.patch/utils/gssd/gss_util.c'
--- .pc/11-532048-reduce-verbosity.patch/utils/gssd/gss_util.c	2011-07-09 16:28:32 +0000
+++ .pc/11-532048-reduce-verbosity.patch/utils/gssd/gss_util.c	2013-05-24 21:28:27 +0000
@@ -95,7 +95,7 @@
 /* Global gssd_credentials handle */
 gss_cred_id_t gssd_creds;
 
-gss_OID g_mechOid = GSS_C_NULL_OID;;
+gss_OID g_mechOid = GSS_C_NULL_OID;
 
 #if 0
 static void

=== modified file '.pc/11-532048-reduce-verbosity.patch/utils/gssd/gssd_proc.c'
--- .pc/11-532048-reduce-verbosity.patch/utils/gssd/gssd_proc.c	2012-05-25 20:41:58 +0000
+++ .pc/11-532048-reduce-verbosity.patch/utils/gssd/gssd_proc.c	2013-05-24 21:28:27 +0000
@@ -52,6 +52,7 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <sys/fsuid.h>
+#include <sys/resource.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -66,6 +67,7 @@
 #include <errno.h>
 #include <gssapi/gssapi.h>
 #include <netdb.h>
+#include <ctype.h>
 
 #include "gssd.h"
 #include "err_util.h"
@@ -104,7 +106,10 @@
 
 struct pollfd * pollarray;
 
-int pollsize;  /* the size of pollaray (in pollfd's) */
+unsigned long pollsize;  /* the size of pollaray (in pollfd's) */
+
+/* Avoid DNS reverse lookups on server names */
+int avoid_dns = 1;
 
 /*
  * convert a presentation address string to a sockaddr_storage struct. Returns
@@ -164,12 +169,31 @@
  * convert a sockaddr to a hostname
  */
 static char *
-sockaddr_to_hostname(const struct sockaddr *sa, const char *addr)
+get_servername(const char *name, const struct sockaddr *sa, const char *addr)
 {
 	socklen_t		addrlen;
 	int			err;
-	char 			*hostname;
+	char			*hostname;
 	char			hbuf[NI_MAXHOST];
+	unsigned char		buf[sizeof(struct in6_addr)];
+	int			servername = 0;
+
+	if (avoid_dns) {
+		/*
+		 * Determine if this is a server name, or an IP address.
+		 * If it is an IP address, do the DNS lookup otherwise
+		 * skip the DNS lookup.
+		 */
+		servername = 0;
+		if (strchr(name, '.') && inet_pton(AF_INET, name, buf) == 1)
+			servername = 1; /* IPv4 */
+		else if (strchr(name, ':') && inet_pton(AF_INET6, name, buf) == 1)
+			servername = 1; /* or IPv6 */
+
+		if (servername) {
+			return strdup(name);
+		}
+	}
 
 	switch (sa->sa_family) {
 	case AF_INET:
@@ -207,7 +231,7 @@
 		  struct sockaddr *addr) {
 #define INFOBUFLEN 256
 	char		buf[INFOBUFLEN + 1];
-	static char	dummy[128];
+	static char	server[128];
 	int		nbytes;
 	static char	service[128];
 	static char	address[128];
@@ -235,7 +259,7 @@
 		   "service: %127s %15s version %15s\n"
 		   "address: %127s\n"
 		   "protocol: %15s\n",
-		   dummy,
+		   server,
 		   service, program, version,
 		   address,
 		   protoname);
@@ -250,25 +274,14 @@
 	if ((p = strstr(buf, "port")) != NULL)
 		sscanf(p, "port: %127s\n", port);
 
-	/* check service, program, and version */
-	if (memcmp(service, "nfs", 3) != 0)
-		return -1;
+	/* get program, and version numbers */
 	*prog = atoi(program + 1); /* skip open paren */
 	*vers = atoi(version);
 
-	if (strlen(service) == 3 ) {
-		if ((*prog != 100003) || ((*vers != 2) && (*vers != 3) &&
-		    (*vers != 4)))
-			goto fail;
-	} else if (memcmp(service, "nfs4_cb", 7) == 0) {
-		if (*vers != 1)
-			goto fail;
-	}
-
 	if (!addrstr_to_sockaddr(addr, address, port))
 		goto fail;
 
-	*servername = sockaddr_to_hostname(addr, address);
+	*servername = get_servername(server, addr, address);
 	if (*servername == NULL)
 		goto fail;
 
@@ -340,6 +353,25 @@
 	char	gname[PATH_MAX];
 	char	info_file_name[PATH_MAX];
 
+	if (clp->gssd_close_me) {
+		printerr(2, "Closing 'gssd' pipe for %s\n", clp->dirname);
+		close(clp->gssd_fd);
+		memset(&pollarray[clp->gssd_poll_index], 0,
+			sizeof(struct pollfd));
+		clp->gssd_fd = -1;
+		clp->gssd_poll_index = -1;
+		clp->gssd_close_me = 0;
+	}
+	if (clp->krb5_close_me) {
+		printerr(2, "Closing 'krb5' pipe for %s\n", clp->dirname);
+		close(clp->krb5_fd);
+		memset(&pollarray[clp->krb5_poll_index], 0,
+			sizeof(struct pollfd));
+		clp->krb5_fd = -1;
+		clp->krb5_poll_index = -1;
+		clp->krb5_close_me = 0;
+	}
+
 	if (clp->gssd_fd == -1) {
 		snprintf(gname, sizeof(gname), "%s/gssd", clp->dirname);
 		clp->gssd_fd = open(gname, O_RDWR);
@@ -379,10 +411,10 @@
 static int
 get_poll_index(int *ind)
 {
-	int i;
+	unsigned int i;
 
 	*ind = -1;
-	for (i=0; i<FD_ALLOC_BLOCK; i++) {
+	for (i=0; i<pollsize; i++) {
 		if (pollarray[i].events == 0) {
 			*ind = i;
 			break;
@@ -464,9 +496,13 @@
 void
 init_client_list(void)
 {
+	struct rlimit rlim;
 	TAILQ_INIT(&clnt_list);
 	/* Eventually plan to grow/shrink poll array: */
 	pollsize = FD_ALLOC_BLOCK;
+	if (getrlimit(RLIMIT_NOFILE, &rlim) == 0 &&
+	    rlim.rlim_cur != RLIM_INFINITY)
+		pollsize = rlim.rlim_cur;
 	pollarray = calloc(pollsize, sizeof(struct pollfd));
 }
 
@@ -548,9 +584,8 @@
 
 	update_old_clients(namelist, j, pipe_name);
 	for (i=0; i < j; i++) {
-		if (i < FD_ALLOC_BLOCK
-				&& !strncmp(namelist[i]->d_name, "clnt", 4)
-				&& !find_client(namelist[i]->d_name, pipe_name))
+		if (!strncmp(namelist[i]->d_name, "clnt", 4)
+		    && !find_client(namelist[i]->d_name, pipe_name))
 			process_clnt_dir(namelist[i]->d_name, pipe_name);
 		free(namelist[i]);
 	}
@@ -640,19 +675,22 @@
 
 static int
 do_downcall(int k5_fd, uid_t uid, struct authgss_private_data *pd,
-	    gss_buffer_desc *context_token)
+	    gss_buffer_desc *context_token, OM_uint32 lifetime_rec)
 {
 	char    *buf = NULL, *p = NULL, *end = NULL;
 	unsigned int timeout = context_timeout;
 	unsigned int buf_size = 0;
 
-	printerr(1, "doing downcall\n");
+	printerr(1, "doing downcall lifetime_rec %u\n", lifetime_rec);
 	buf_size = sizeof(uid) + sizeof(timeout) + sizeof(pd->pd_seq_win) +
 		sizeof(pd->pd_ctx_hndl.length) + pd->pd_ctx_hndl.length +
 		sizeof(context_token->length) + context_token->length;
 	p = buf = malloc(buf_size);
 	end = buf + buf_size;
 
+	/* context_timeout set by -t option overrides context lifetime */
+	if (timeout == 0)
+		timeout = lifetime_rec;
 	if (WRITE_BYTES(&p, end, uid)) goto out_err;
 	if (WRITE_BYTES(&p, end, timeout)) goto out_err;
 	if (WRITE_BYTES(&p, end, pd->pd_seq_win)) goto out_err;
@@ -693,7 +731,7 @@
 
 /*
  * If the port isn't already set, do an rpcbind query to the remote server
- * using the program and version and get the port. 
+ * using the program and version and get the port.
  *
  * Newer kernels send the value of the port= mount option in the "info"
  * file for the upcall or '0' for NFSv2/3. For NFSv4 it sends the value
@@ -780,11 +818,13 @@
  * Create an RPC connection and establish an authenticated
  * gss context with a server.
  */
-int create_auth_rpc_client(struct clnt_info *clp,
-			   CLIENT **clnt_return,
-			   AUTH **auth_return,
-			   uid_t uid,
-			   int authtype)
+static int
+create_auth_rpc_client(struct clnt_info *clp,
+		       CLIENT **clnt_return,
+		       AUTH **auth_return,
+		       uid_t uid,
+		       int authtype,
+		       gss_cred_id_t cred)
 {
 	CLIENT			*rpc_clnt = NULL;
 	struct rpc_gss_sec	sec;
@@ -810,7 +850,7 @@
 
 	sec.qop = GSS_C_QOP_DEFAULT;
 	sec.svc = RPCSEC_GSS_SVC_NONE;
-	sec.cred = GSS_C_NO_CREDENTIAL;
+	sec.cred = cred;
 	sec.req_flags = 0;
 	if (authtype == AUTHTYPE_KRB5) {
 		sec.mech = (gss_OID)&krb5oid;
@@ -918,23 +958,6 @@
 	goto out;
 }
 
-static char *
-user_cachedir(char *dirname, uid_t uid)
-{
-	struct passwd *pw;
-	char *ptr;
-
-	if ((pw = getpwuid(uid)) == NULL) {
-		printerr(0, "user_cachedir: Failed to find '%d' uid"
-			    " for cache directory\n");
-		return NULL;
-	}
-	ptr = malloc(strlen(dirname)+strlen(pw->pw_name)+2);
-	if (ptr)
-		sprintf(ptr, "%s/%s", dirname, pw->pw_name);
-
-	return ptr;
-}
 /*
  * this code uses the userland rpcsec gss library to create a krb5
  * context on behalf of the kernel
@@ -949,18 +972,14 @@
 	gss_buffer_desc		token;
 	char			**credlist = NULL;
 	char			**ccname;
-	char			**dirname, *dir, *userdir;
+	char			**dirname;
 	int			create_resp = -1;
 	int			err, downcall_err = -EACCES;
+	gss_cred_id_t		gss_cred;
+	OM_uint32		maj_stat, min_stat, lifetime_rec;
 
 	printerr(1, "handling krb5 upcall (%s)\n", clp->dirname);
 
-	if (tgtname) {
-		if (clp->servicename) {
-			free(clp->servicename);
-			clp->servicename = strdup(tgtname);
-		}
-	}
 	token.length = 0;
 	token.value = NULL;
 	memset(&pd, 0, sizeof(struct authgss_private_data));
@@ -991,30 +1010,20 @@
 	if (uid != 0 || (uid == 0 && root_uses_machine_creds == 0 &&
 				service == NULL)) {
 		/* Tell krb5 gss which credentials cache to use */
-		for (dirname = ccachesearch; *dirname != NULL; dirname++) {
-			/* See if the user name is needed */
-			if (strncmp(*dirname, GSSD_USER_CRED_DIR, 
-					strlen(GSSD_USER_CRED_DIR)) == 0) {
-				userdir = user_cachedir(*dirname, uid);
-				if (userdir == NULL) 
-					continue;
-				dir = userdir;
-			} else
-				dir = *dirname;
-
-			err = gssd_setup_krb5_user_gss_ccache(uid, clp->servername, dir);
-
-			if (userdir) {
-				free(userdir);
-				userdir = NULL;
-			}
+		/* Try first to acquire credentials directly via GSSAPI */
+		err = gssd_acquire_user_cred(uid, &gss_cred);
+		if (!err)
+			create_resp = create_auth_rpc_client(clp, &rpc_clnt, &auth, uid,
+							     AUTHTYPE_KRB5, gss_cred);
+		/* if create_auth_rplc_client fails try the traditional method of
+		 * trolling for credentials */
+		for (dirname = ccachesearch; create_resp != 0 && *dirname != NULL; dirname++) {
+			err = gssd_setup_krb5_user_gss_ccache(uid, clp->servername, *dirname);
 			if (err == -EKEYEXPIRED)
 				downcall_err = -EKEYEXPIRED;
 			else if (!err)
 				create_resp = create_auth_rpc_client(clp, &rpc_clnt, &auth, uid,
-							     AUTHTYPE_KRB5);
-			if (create_resp == 0)
-				break;
+							     AUTHTYPE_KRB5, GSS_C_NO_CREDENTIAL);
 		}
 	}
 	if (create_resp != 0) {
@@ -1024,7 +1033,8 @@
 			int success = 0;
 			do {
 				gssd_refresh_krb5_machine_credential(clp->servername,
-								     NULL, service);
+								     NULL, service,
+								     tgtname);
 				/*
 				 * Get a list of credential cache names and try each
 				 * of them until one works or we've tried them all
@@ -1033,22 +1043,23 @@
 					printerr(0, "ERROR: No credentials found "
 						 "for connection to server %s\n",
 						 clp->servername);
-						goto out_return_error;
+					goto out_return_error;
 				}
 				for (ccname = credlist; ccname && *ccname; ccname++) {
 					gssd_setup_krb5_machine_gss_ccache(*ccname);
 					if ((create_auth_rpc_client(clp, &rpc_clnt,
 								    &auth, uid,
-								    AUTHTYPE_KRB5)) == 0) {
+								    AUTHTYPE_KRB5,
+								    GSS_C_NO_CREDENTIAL)) == 0) {
 						/* Success! */
 						success++;
 						break;
-					} 
+					}
 					printerr(2, "WARNING: Failed to create machine krb5 context "
 						 "with credentials cache %s for server %s\n",
 						 *ccname, clp->servername);
 				}
-				gssd_free_krb5_machine_cred_list(credlist);			
+				gssd_free_krb5_machine_cred_list(credlist);
 				if (!success) {
 					if(nocache == 0) {
 						nocache++;
@@ -1077,20 +1088,29 @@
 		goto out_return_error;
 	}
 
-	if (serialize_context_for_kernel(pd.pd_ctx, &token, &krb5oid, NULL)) {
+	/* Grab the context lifetime to pass to the kernel. lifetime_rec
+	 * is set to zero on error */
+	maj_stat = gss_inquire_context(&min_stat, pd.pd_ctx, NULL, NULL,
+				       &lifetime_rec, NULL, NULL, NULL, NULL);
+
+	if (maj_stat)
+		printerr(1, "WARNING: Failed to inquire context for lifetme "
+			    "maj_stat %u\n", maj_stat);
+
+	if (serialize_context_for_kernel(&pd.pd_ctx, &token, &krb5oid, NULL)) {
 		printerr(0, "WARNING: Failed to serialize krb5 context for "
 			    "user with uid %d for server %s\n",
 			 uid, clp->servername);
 		goto out_return_error;
 	}
 
-	do_downcall(fd, uid, &pd, &token);
+	do_downcall(fd, uid, &pd, &token, lifetime_rec);
 
 out:
 	if (token.value)
 		free(token.value);
-#ifndef HAVE_LIBTIRPC
-	if (pd.pd_ctx_hndl.length != 0)
+#ifdef HAVE_AUTHGSS_FREE_PRIVATE_DATA
+	if (pd.pd_ctx_hndl.length != 0 || pd.pd_ctx != 0)
 		authgss_free_private_data(&pd);
 #endif
 	if (auth)
@@ -1115,7 +1135,7 @@
 		return;
 	}
 
-	return process_krb5_upcall(clp, uid, clp->krb5_fd, NULL, NULL);
+	process_krb5_upcall(clp, uid, clp->krb5_fd, NULL, NULL);
 }
 
 void
@@ -1236,6 +1256,6 @@
 	free(enctypes);
 	free(target);
 	free(service);
-	return;	
+	return;
 }
 

=== modified file '.pc/17-multiarch-kerberos-paths.patch/aclocal/kerberos5.m4'
--- .pc/17-multiarch-kerberos-paths.patch/aclocal/kerberos5.m4	2012-05-25 20:41:58 +0000
+++ .pc/17-multiarch-kerberos-paths.patch/aclocal/kerberos5.m4	2013-05-24 21:28:27 +0000
@@ -32,6 +32,8 @@
     if test "$K5CONFIG" != ""; then
       KRBCFLAGS=`$K5CONFIG --cflags`
       KRBLIBS=`$K5CONFIG --libs`
+      GSSKRB_CFLAGS=`$K5CONFIG --cflags gssapi`
+      GSSKRB_LIBS=`$K5CONFIG --libs gssapi`
       K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
       AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
       if test -f $dir/include/gssapi/gssapi_krb5.h -a \
@@ -92,6 +94,8 @@
     AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS)
   AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name,
     AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS)
+  AC_CHECK_LIB($gssapi_lib, gss_krb5_free_lucid_sec_context,
+    AC_DEFINE(HAVE_GSS_KRB5_FREE_LUCID_SEC_CONTEXT, 1, [Define this if the Kerberos GSS library supports gss_krb5_free_lucid_sec_context]), ,$KRBLIBS)
 
   dnl Check for newer error message facility
   AC_CHECK_LIB($gssapi_lib, krb5_get_error_message,
@@ -111,5 +115,7 @@
   AC_SUBST([KRBCFLAGS])
   AC_SUBST([KRBLDFLAGS])
   AC_SUBST([K5VERS])
+  AC_SUBST([GSSKRB_CFLAGS])
+  AC_SUBST([GSSKRB_LIBS])
 
 ])

=== removed directory '.pc/18-osd_login-sbindir.patch'
=== removed directory '.pc/18-osd_login-sbindir.patch/utils'
=== removed directory '.pc/18-osd_login-sbindir.patch/utils/osd_login'
=== removed file '.pc/18-osd_login-sbindir.patch/utils/osd_login/Makefile.am'
--- .pc/18-osd_login-sbindir.patch/utils/osd_login/Makefile.am	2012-06-22 15:04:56 +0000
+++ .pc/18-osd_login-sbindir.patch/utils/osd_login/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-OSD_LOGIN_FILES= osd_login
-
-EXTRA_DIST= $(OSD_LOGIN_FILES)
-
-all-local: $(OSD_LOGIN_FILES)
-
-install-data-hook:
-	$(INSTALL) --mode 755 osd_login $(DESTDIR)/sbin/osd_login
-
-MAINTAINERCLEANFILES = Makefile.in

=== added directory '.pc/20-remove-autogenerated-man.patch'
=== added directory '.pc/20-remove-autogenerated-man.patch/utils'
=== added directory '.pc/20-remove-autogenerated-man.patch/utils/nfsdcltrack'
=== added file '.pc/20-remove-autogenerated-man.patch/utils/nfsdcltrack/nfsdcltrack.man'
--- .pc/20-remove-autogenerated-man.patch/utils/nfsdcltrack/nfsdcltrack.man	1970-01-01 00:00:00 +0000
+++ .pc/20-remove-autogenerated-man.patch/utils/nfsdcltrack/nfsdcltrack.man	2013-05-24 21:28:27 +0000
@@ -0,0 +1,211 @@
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.el \{\
+.    de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "NFSDCLTRACK 8"
+.TH NFSDCLTRACK 8 "2012-10-24" "" ""
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+nfsdcltrack \- NFSv4 Client Tracking Callout Program
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+nfsdcltrack [\-d] [\-f] [\-s stable storage dir] <command> <args...>
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+nfsdcltack is the NFSv4 client tracking callout program. It is not necessary
+to install this daemon on machines that are not acting as NFSv4 servers.
+.PP
+When a network partition is combined with a server reboot, there are
+edge conditions that can cause the server to grant lock reclaims when
+other clients have taken conflicting locks in the interim. A more detailed
+explanation of this issue is described in \s-1RFC\s0 3530, section 8.6.3.
+.PP
+In order to prevent these problems, the server must track a small amount
+of per-client information on stable storage. This program provides the
+userspace piece of that functionality. When the kernel needs to manipulate
+the database that stores this info, it will execute this program to handle
+it.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-d\fR, \fB\-\-debug\fR" 4
+.IX Item "-d, --debug"
+Enable debug level logging.
+.IP "\fB\-f\fR, \fB\-\-foreground\fR" 4
+.IX Item "-f, --foreground"
+Log to stderr instead of syslog.
+.IP "\fB\-s\fR \fIstoragedir\fR, \fB\-\-storagedir\fR=\fIstorage_dir\fR" 4
+.IX Item "-s storagedir, --storagedir=storage_dir"
+Directory where stable storage information should be kept. The default
+value is \fI/var/lib/nfs/nfsdcltrack\fR.
+.SH "COMMANDS"
+.IX Header "COMMANDS"
+nfsdcltrack requires a command for each invocation. Supported commands
+are:
+.IP "\fBinit\fR" 4
+.IX Item "init"
+Initialize the database. This command requires no argument.
+.IP "\fBcreate\fR" 4
+.IX Item "create"
+Create a new client record (or update the timestamp on an existing one). This command requires a hex-encoded nfs_client_id4 as an argument.
+.IP "\fBremove\fR" 4
+.IX Item "remove"
+Remove a client record from the database. This command requires a hex-encoded nfs_client_id4 as an argument.
+.IP "\fBcheck\fR" 4
+.IX Item "check"
+Check to see if a nfs_client_id4 is allowed to reclaim. This command requires a hex-encoded nfs_client_id4 as an argument.
+.IP "\fBgracedone\fR" 4
+.IX Item "gracedone"
+Remove any unreclaimed client records from the database. This command requires a epoch boot time as an argument.
+.SH "LEGACY TRANSITION MECHANISM"
+.IX Header "LEGACY TRANSITION MECHANISM"
+The Linux kernel NFSv4 server has historically tracked this information
+on stable storage by manipulating information on the filesystem
+directly, in the directory to which \fI/proc/fs/nfsd/nfsv4recoverydir\fR
+points. If the kernel passes the correct information, then nfsdcltrack
+can use it to allow a seamless transition from the old client tracking
+scheme to the new one.
+.PP
+On a \fBcheck\fR operation, if there is no record of the client in the
+database, nfsdcltrack will look to see if the \fB\s-1NFSDCLTRACK_LEGACY_RECDIR\s0\fR
+environment variable is set. If it is, then it will fetch that value and
+see if a directory exists by that name. If it does, then the check
+operation will succeed and the directory will be removed.
+.PP
+On a \fBgracedone\fR operation, nfsdcltrack will look to see if the
+\&\fB\s-1NFSDCLTRACK_LEGACY_TOPDIR\s0\fR environment variable is set. If it is, then
+it will attempt to clean out that directory prior to exiting.
+.PP
+Note that this transition is one-way. If the machine subsequently reboots
+back into an older kernel that does not support the nfsdcltrack upcall
+then the clients will not be able to recover their state.
+.SH "NOTES"
+.IX Header "NOTES"
+This program requires a kernel that supports the nfsdcltrack usermodehelper
+upcall. This support was first added to mainline kernels in 3.8.
+.SH "AUTHORS"
+.IX Header "AUTHORS"
+nfsdcltrack was developed by Jeff Layton <[e-mail]>.

=== modified file '.pc/20-ticket-expired-error.patch/utils/gssd/gssd.c'
--- .pc/20-ticket-expired-error.patch/utils/gssd/gssd.c	2012-09-28 21:58:43 +0000
+++ .pc/20-ticket-expired-error.patch/utils/gssd/gssd.c	2013-05-24 21:28:27 +0000
@@ -71,7 +71,7 @@
 	if (root_uses_machine_creds)
 		gssd_destroy_krb5_machine_creds();
 	printerr(1, "exiting on signal %d\n", signal);
-	exit(1);
+	exit(0);
 }
 
 void
@@ -85,7 +85,7 @@
 static void
 usage(char *progname)
 {
-	fprintf(stderr, "usage: %s [-f] [-l] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout] [-R preferred realm]\n",
+	fprintf(stderr, "usage: %s [-f] [-l] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout] [-R preferred realm] [-D]\n",
 		progname);
 	exit(1);
 }
@@ -102,7 +102,7 @@
 	char *progname;
 
 	memset(ccachesearch, 0, sizeof(ccachesearch));
-	while ((opt = getopt(argc, argv, "fvrlmnMp:k:d:t:R")) != -1) {
+	while ((opt = getopt(argc, argv, "DfvrlmnMp:k:d:t:R:")) != -1) {
 		switch (opt) {
 			case 'f':
 				fg = 1;
@@ -147,9 +147,12 @@
 #ifdef HAVE_SET_ALLOWABLE_ENCTYPES
 				limit_to_legacy_enctypes = 1;
 #else 
-				errx(1, "Setting encryption type not support by Kerberos libraries.");
+				errx(1, "Encryption type limits not supported by Kerberos libraries.");
 #endif
 				break;
+			case 'D':
+				avoid_dns = 0;
+				break;
 			default:
 				usage(argv[0]);
 				break;

=== modified file '.pc/20-ticket-expired-error.patch/utils/gssd/gssd.h'
--- .pc/20-ticket-expired-error.patch/utils/gssd/gssd.h	2012-09-28 21:58:43 +0000
+++ .pc/20-ticket-expired-error.patch/utils/gssd/gssd.h	2013-05-24 21:28:27 +0000
@@ -45,8 +45,8 @@
 #define DNOTIFY_SIGNAL		(SIGRTMIN + 3)
 
 #define GSSD_DEFAULT_CRED_DIR			"/tmp"
-#define GSSD_USER_CRED_DIR			"/run/user"
-#define GSSD_DEFAULT_CRED_PREFIX		"krb5cc_"
+#define GSSD_USER_CRED_DIR			"/run/user/%U"
+#define GSSD_DEFAULT_CRED_PREFIX		"krb5cc"
 #define GSSD_DEFAULT_MACHINE_CRED_SUFFIX	"machine"
 #define GSSD_DEFAULT_KEYTAB_FILE		"/etc/krb5.keytab"
 #define GSSD_SERVICE_NAME			"nfs"
@@ -81,8 +81,10 @@
 	char			*protocol;
 	int			krb5_fd;
 	int			krb5_poll_index;
+	int			krb5_close_me;
 	int                     gssd_fd;
 	int                     gssd_poll_index;
+	int			gssd_close_me;
 	struct sockaddr_storage addr;
 };
 

=== modified file '.pc/20-ticket-expired-error.patch/utils/gssd/gssd.man'
--- .pc/20-ticket-expired-error.patch/utils/gssd/gssd.man	2012-09-28 21:58:43 +0000
+++ .pc/20-ticket-expired-error.patch/utils/gssd/gssd.man	2013-05-24 21:28:27 +0000
@@ -2,136 +2,281 @@
 .\" rpc.gssd(8)
 .\"
 .\" Copyright (C) 2003 J. Bruce Fields <[e-mail]>
-.TH rpc.gssd 8 "14 Mar 2007"
+.\"
+.TH rpc.gssd 8 "20 Feb 2013"
 .SH NAME
-rpc.gssd \- rpcsec_gss daemon
+rpc.gssd \- RPCSEC_GSS daemon
 .SH SYNOPSIS
-.B "rpc.gssd [-f] [-n] [-k keytab] [-l] [-p pipefsdir] [-v] [-r] [-d ccachedir]"
+.B rpc.gssd
+.RB [ \-DfMnlvr ]
+.RB [ \-k
+.IR keytab ]
+.RB [ \-p
+.IR pipefsdir ]
+.RB [ \-d
+.IR ccachedir ]
+.RB [ \-t
+.IR timeout ]
+.RB [ \-R
+.IR realm ]
+.SH INTRODUCTION
+The RPCSEC_GSS protocol, defined in RFC 5403, is used to provide
+strong security for RPC-based protocols such as NFS.
+.P
+Before exchanging RPC requests using RPCSEC_GSS, an RPC client must
+establish a GSS
+.IR "security context" .
+A security context is shared state on each
+end of a network transport that enables GSS-API security services.
+.P
+Security contexts are established using
+.IR "security credentials" .
+A credential grants temporary access to a secure network service,
+much as a railway ticket grants temporary access to use a rail service.
+.P
+A user typically obtains a credential by providing a password to the
+.BR kinit (1)
+command, or via a PAM library at login time.
+A credential acquired with a
+.I user principal
+is known as a
+.I user credential
+(see
+.BR kerberos (1)
+for more on principals).
+.P
+For certain operations, a credential is required
+which represents no user,
+is otherwise unprivileged,
+and is always available.
+This is referred to as a
+.IR "machine credential" .
+.P
+Machine credentials are typically established using a
+.IR "service principal" ,
+whose encrypted password, called its
+.IR key ,
+is stored in a file, called a
+.IR keytab ,
+to avoid requiring a user prompt.
+A machine credential effectively does not expire because the system
+can renew it as needed without user intervention.
+.P
+Once obtained, credentials are typically stored in local temporary files
+with well-known pathnames.
 .SH DESCRIPTION
-The rpcsec_gss protocol gives a means of using the gss-api generic security
-api to provide security for protocols using rpc (in particular, nfs).  Before
-exchanging any rpc requests using rpcsec_gss, the rpc client must first
-establish a security context.  The linux kernel's implementation of rpcsec_gss
-depends on the userspace daemon
-.B rpc.gssd
-to establish security contexts.  The
-.B rpc.gssd
-daemon uses files in the rpc_pipefs filesystem to communicate with the kernel.
-
+To establish GSS security contexts using these credential files,
+the Linux kernel RPC client depends on a userspace daemon called
+.BR rpc.gssd .
+The
+.B rpc.gssd
+daemon uses the rpc_pipefs filesystem to communicate with the kernel.
+.SS User Credentials
+When a user authenticates using a command such as
+.BR kinit (1),
+the resulting credential is stored in a file with a well-known name
+constructed using the user's UID.
+.P
+To interact with an NFS server
+on behalf of a particular Kerberos-authenticated user,
+the Linux kernel RPC client requests that
+.B rpc.gssd
+initialize a security context with the credential
+in that user's credential file.
+.P
+Typically, credential files are placed in
+.IR /tmp .
+However,
+.B rpc.gssd
+can search for credential files in more than one directory.
+See the description of the
+.B -d
+option for details.
+.SS Machine Credentials
+A user credential is established by a user and
+is then shared with the kernel and
+.BR rpc.gssd .
+A machine credential is established by
+.B rpc.gssd
+for the kernel when there is no user.
+Therefore
+.B rpc.gssd
+must already have the materials on hand to establish this credential
+without requiring user intervention.
+.P
+.B rpc.gssd
+searches the local system's keytab for a principal and key to use
+to establish the machine credential.
+By default,
+.B rpc.gssd
+assumes the file
+.I /etc/krb5.keytab
+contains principals and keys that can be used to obtain machine credentials.
+.P
+.B rpc.gssd
+searches in the following order for a principal to use.
+The first matching credential is used.
+For the search, <hostname> and <REALM> are replaced with the local
+system's hostname and Kerberos realm.
+.sp
+   <HOSTNAME>$@<REALM>
+.br
+   root/<hostname>@<REALM>
+.br
+   nfs/<hostname>@<REALM>
+.br
+   host/<hostname>@<REALM>
+.br
+   root/<anyname>@<REALM>
+.br
+   nfs/<anyname>@<REALM>
+.br
+   host/<anyname>@<REALM>
+.sp
+The <anyname> entries match on the service name and realm, but ignore the hostname.
+These can be used if a principal matching the local host's name is not found.
+.P
+Note that the first principal in the search order is a user principal
+that enables Kerberized NFS when the local system is joined
+to an Active Directory domain using Samba.
+A password for this principal must be provided in the local system's keytab.
+.P
+You can specify another keytab by using the
+.B -k
+option if
+.I /etc/krb5.keytab
+does not exist or does not provide one of these principals.
+.SS Credentials for UID 0
+UID 0 is a special case.
+By default
+.B rpc.gssd
+uses the system's machine credentials for UID 0 accesses
+that require GSS authentication.
+This limits the privileges of the root user
+when accessing network resources that require authentication.
+.P
+Specify the
+.B -n
+option when starting
+.B rpc.gssd
+if you'd like to force the root user to obtain a user credential
+rather than use the local system's machine credential.
+.P
+When
+.B -n
+is specified,
+the kernel continues to request a GSS context established
+with a machine credential for NFSv4 operations,
+such as SETCLIENTID or RENEW, that manage state.
+If
+.B rpc.gssd
+cannot obtain a machine credential (say, the local system has
+no keytab), NFSv4 operations that require machine credentials will fail.
+.SS Encryption types
+A realm administrator can choose to add keys encoded in a number of different
+encryption types to the local system's keytab.
+For instance, a host/ principal might have keys for the
+.BR aes256-cts-hmac-sha1-96 ,
+.BR aes128-cts-hmac-sha1-96 ,
+.BR des3-cbc-sha1 ", and"
+.BR arcfour-hmac " encryption types."
+This permits
+.B rpc.gssd
+to choose an appropriate encryption type that the target NFS server
+supports.
+.P
+These encryption types are stronger than legacy single-DES encryption types.
+To interoperate in environments where servers support
+only weak encryption types,
+you can restrict your client to use only single-DES encryption types
+by specifying the
+.B -l
+option when starting
+.BR rpc.gssd .
 .SH OPTIONS
 .TP
+.B -D
+DNS Reverse lookups are not used for determining the
+server names pass to GSSAPI. This option will reverses that and forces 
+the use of DNS Reverse resolution of the server's IP address to 
+retrieve the server name to use in GSAPI authentication.
+.TP
 .B -f
 Runs
 .B rpc.gssd
 in the foreground and sends output to stderr (as opposed to syslogd)
 .TP
 .B -n
-By default,
-.B rpc.gssd
-treats accesses by the user with UID 0 specially, and uses
-"machine credentials" for all accesses by that user which
-require Kerberos authentication.
-With the \-n option, "machine credentials" will not be used
-for accesses by UID 0.  Instead, credentials must be obtained
-manually like all other users.  Use of this option means that
-"root" must manually obtain Kerberos credentials before
-attempting to mount an nfs filesystem requiring Kerberos
-authentication.
+When specified, UID 0 is forced to obtain user credentials
+which are used instead of the local system's machine credentials.
 .TP
-.B -k keytab
+.BI "-k " keytab
 Tells
 .B rpc.gssd
 to use the keys found in
 .I keytab
-to obtain "machine credentials".
-The default value is "/etc/krb5.keytab".
-.IP
-Previous versions of
-.B rpc.gssd
-used only "nfs/*" keys found within the keytab.
-To be more consistent with other implementations, we now look for
-specific keytab entries.  The search order for keytabs to be used
-for "machine credentials" is now:
-.br
-  <HOSTNAME>$@<REALM>
-.br
-  root/<hostname>@<REALM>
-.br
-  nfs/<hostname>@<REALM>
-.br
-  host/<hostname>@<REALM>
-.br
-  root/<anyname>@<REALM>
-.br
-  nfs/<anyname>@<REALM>
-.br
-  host/<anyname>@<REALM>
-.IP
-If this search order does not use the correct key then provide a
-keytab file that contains only correct keys.
+to obtain machine credentials.
+The default value is
+.IR /etc/krb5.keytab .
 .TP
 .B -l
-Tells
+When specified, restricts
 .B rpc.gssd
-to limit session keys to Single DES even if the kernel supports stronger
-encryption types. Service ticket encryption is still governed by what
-the KDC believes the target server supports. This way the client can
-access a server that has strong keys in its keytab for ticket decryption
-but whose kernel only supports Single DES.
-.IP
-The alternative is to put only Single DES keys in the server's keytab
-and limit encryption types for its principal to Single DES on the KDC
-which will cause service tickets for this server to be encrypted using
-only Single DES and (as a side-effect) contain only Single DES session
-keys.
-.IP
-This legacy behaviour is only required for older servers
-(pre nfs-utils-1.2.4). If the server has a recent kernel, Kerberos
-implementation and nfs-utils it will work just fine with stronger
-encryption.
-.IP
-.B Note:
-This option is only available with Kerberos libraries that 
-support setable encryption types.
+to sessions to weak encryption types such as
+.BR des-cbc-crc .
+This option is available only when the local system's Kerberos library
+supports settable encryption types.
 .TP
-.B -p path
+.BI "-p " path
 Tells
 .B rpc.gssd
 where to look for the rpc_pipefs filesystem.  The default value is
-"/var/lib/nfs/rpc_pipefs".
-.TP
-.B -d directory
-Tells
-.B rpc.gssd
-where to look for Kerberos credential files.  The default value is "/tmp".
-This can also be a colon separated list of directories to be searched
-for Kerberos credential files.  Note that if machine credentials are being
-stored in files, then the first directory on this list is where the
-machine credentials are stored.
+.IR /var/lib/nfs/rpc_pipefs .
+.TP
+.BI "-d " search-path
+This option specifies a colon separated list of directories that
+.B rpc.gssd
+searches for credential files.  The default value is
+.IR /tmp:/run/user/%U .
+The literal sequence "%U" can be specified to substitue the UID
+of the user for whom credentials are being searched.
+.TP
+.B -M
+By default, machine credentials are stored in files in the first
+directory in the credential directory search path (see the
+.B -d
+option).  When
+.B -M
+is set,
+.B rpc.gssd
+stores machine credentials in memory instead.
 .TP
 .B -v
 Increases the verbosity of the output (can be specified multiple times).
 .TP
 .B -r
-If the rpcsec_gss library supports setting debug level,
+If the RPCSEC_GSS library supports setting debug level,
 increases the verbosity of the output (can be specified multiple times).
 .TP
-.B -R realm
+.BI "-R " realm
 Kerberos tickets from this
 .I realm
 will be preferred when scanning available credentials cache files to be
 used to create a context.  By default, the default realm, as configured
 in the Kerberos configuration file, is preferred.
 .TP
-.B -t timeout
-Timeout, in seconds, for kernel gss contexts. This option allows you to force 
+.BI "-t " timeout
+Timeout, in seconds, for kernel GSS contexts. This option allows you to force 
 new kernel contexts to be negotiated after
 .I timeout
 seconds, which allows changing Kerberos tickets and identities frequently.
 The default is no explicit timeout, which means the kernel context will live
 the lifetime of the Kerberos service ticket used in its creation.
 .SH SEE ALSO
-.BR rpc.svcgssd(8)
+.BR rpc.svcgssd (8),
+.BR kerberos (1),
+.BR kinit (1),
+.BR krb5.conf (5)
 .SH AUTHORS
 .br
 Dug Song <[e-mail]>

=== modified file '.pc/20-ticket-expired-error.patch/utils/gssd/gssd_proc.c'
--- .pc/20-ticket-expired-error.patch/utils/gssd/gssd_proc.c	2012-09-28 21:58:43 +0000
+++ .pc/20-ticket-expired-error.patch/utils/gssd/gssd_proc.c	2013-05-24 21:28:27 +0000
@@ -52,6 +52,7 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <sys/fsuid.h>
+#include <sys/resource.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -66,6 +67,7 @@
 #include <errno.h>
 #include <gssapi/gssapi.h>
 #include <netdb.h>
+#include <ctype.h>
 
 #include "gssd.h"
 #include "err_util.h"
@@ -104,7 +106,10 @@
 
 struct pollfd * pollarray;
 
-int pollsize;  /* the size of pollaray (in pollfd's) */
+unsigned long pollsize;  /* the size of pollaray (in pollfd's) */
+
+/* Avoid DNS reverse lookups on server names */
+int avoid_dns = 1;
 
 /*
  * convert a presentation address string to a sockaddr_storage struct. Returns
@@ -164,12 +169,31 @@
  * convert a sockaddr to a hostname
  */
 static char *
-sockaddr_to_hostname(const struct sockaddr *sa, const char *addr)
+get_servername(const char *name, const struct sockaddr *sa, const char *addr)
 {
 	socklen_t		addrlen;
 	int			err;
-	char 			*hostname;
+	char			*hostname;
 	char			hbuf[NI_MAXHOST];
+	unsigned char		buf[sizeof(struct in6_addr)];
+	int			servername = 0;
+
+	if (avoid_dns) {
+		/*
+		 * Determine if this is a server name, or an IP address.
+		 * If it is an IP address, do the DNS lookup otherwise
+		 * skip the DNS lookup.
+		 */
+		servername = 0;
+		if (strchr(name, '.') && inet_pton(AF_INET, name, buf) == 1)
+			servername = 1; /* IPv4 */
+		else if (strchr(name, ':') && inet_pton(AF_INET6, name, buf) == 1)
+			servername = 1; /* or IPv6 */
+
+		if (servername) {
+			return strdup(name);
+		}
+	}
 
 	switch (sa->sa_family) {
 	case AF_INET:
@@ -207,7 +231,7 @@
 		  struct sockaddr *addr) {
 #define INFOBUFLEN 256
 	char		buf[INFOBUFLEN + 1];
-	static char	dummy[128];
+	static char	server[128];
 	int		nbytes;
 	static char	service[128];
 	static char	address[128];
@@ -235,7 +259,7 @@
 		   "service: %127s %15s version %15s\n"
 		   "address: %127s\n"
 		   "protocol: %15s\n",
-		   dummy,
+		   server,
 		   service, program, version,
 		   address,
 		   protoname);
@@ -250,25 +274,14 @@
 	if ((p = strstr(buf, "port")) != NULL)
 		sscanf(p, "port: %127s\n", port);
 
-	/* check service, program, and version */
-	if (memcmp(service, "nfs", 3) != 0)
-		return -1;
+	/* get program, and version numbers */
 	*prog = atoi(program + 1); /* skip open paren */
 	*vers = atoi(version);
 
-	if (strlen(service) == 3 ) {
-		if ((*prog != 100003) || ((*vers != 2) && (*vers != 3) &&
-		    (*vers != 4)))
-			goto fail;
-	} else if (memcmp(service, "nfs4_cb", 7) == 0) {
-		if (*vers != 1)
-			goto fail;
-	}
-
 	if (!addrstr_to_sockaddr(addr, address, port))
 		goto fail;
 
-	*servername = sockaddr_to_hostname(addr, address);
+	*servername = get_servername(server, addr, address);
 	if (*servername == NULL)
 		goto fail;
 
@@ -340,6 +353,25 @@
 	char	gname[PATH_MAX];
 	char	info_file_name[PATH_MAX];
 
+	if (clp->gssd_close_me) {
+		printerr(2, "Closing 'gssd' pipe for %s\n", clp->dirname);
+		close(clp->gssd_fd);
+		memset(&pollarray[clp->gssd_poll_index], 0,
+			sizeof(struct pollfd));
+		clp->gssd_fd = -1;
+		clp->gssd_poll_index = -1;
+		clp->gssd_close_me = 0;
+	}
+	if (clp->krb5_close_me) {
+		printerr(2, "Closing 'krb5' pipe for %s\n", clp->dirname);
+		close(clp->krb5_fd);
+		memset(&pollarray[clp->krb5_poll_index], 0,
+			sizeof(struct pollfd));
+		clp->krb5_fd = -1;
+		clp->krb5_poll_index = -1;
+		clp->krb5_close_me = 0;
+	}
+
 	if (clp->gssd_fd == -1) {
 		snprintf(gname, sizeof(gname), "%s/gssd", clp->dirname);
 		clp->gssd_fd = open(gname, O_RDWR);
@@ -379,10 +411,10 @@
 static int
 get_poll_index(int *ind)
 {
-	int i;
+	unsigned int i;
 
 	*ind = -1;
-	for (i=0; i<FD_ALLOC_BLOCK; i++) {
+	for (i=0; i<pollsize; i++) {
 		if (pollarray[i].events == 0) {
 			*ind = i;
 			break;
@@ -464,9 +496,13 @@
 void
 init_client_list(void)
 {
+	struct rlimit rlim;
 	TAILQ_INIT(&clnt_list);
 	/* Eventually plan to grow/shrink poll array: */
 	pollsize = FD_ALLOC_BLOCK;
+	if (getrlimit(RLIMIT_NOFILE, &rlim) == 0 &&
+	    rlim.rlim_cur != RLIM_INFINITY)
+		pollsize = rlim.rlim_cur;
 	pollarray = calloc(pollsize, sizeof(struct pollfd));
 }
 
@@ -548,9 +584,8 @@
 
 	update_old_clients(namelist, j, pipe_name);
 	for (i=0; i < j; i++) {
-		if (i < FD_ALLOC_BLOCK
-				&& !strncmp(namelist[i]->d_name, "clnt", 4)
-				&& !find_client(namelist[i]->d_name, pipe_name))
+		if (!strncmp(namelist[i]->d_name, "clnt", 4)
+		    && !find_client(namelist[i]->d_name, pipe_name))
 			process_clnt_dir(namelist[i]->d_name, pipe_name);
 		free(namelist[i]);
 	}
@@ -640,19 +675,22 @@
 
 static int
 do_downcall(int k5_fd, uid_t uid, struct authgss_private_data *pd,
-	    gss_buffer_desc *context_token)
+	    gss_buffer_desc *context_token, OM_uint32 lifetime_rec)
 {
 	char    *buf = NULL, *p = NULL, *end = NULL;
 	unsigned int timeout = context_timeout;
 	unsigned int buf_size = 0;
 
-	printerr(1, "doing downcall\n");
+	printerr(1, "doing downcall lifetime_rec %u\n", lifetime_rec);
 	buf_size = sizeof(uid) + sizeof(timeout) + sizeof(pd->pd_seq_win) +
 		sizeof(pd->pd_ctx_hndl.length) + pd->pd_ctx_hndl.length +
 		sizeof(context_token->length) + context_token->length;
 	p = buf = malloc(buf_size);
 	end = buf + buf_size;
 
+	/* context_timeout set by -t option overrides context lifetime */
+	if (timeout == 0)
+		timeout = lifetime_rec;
 	if (WRITE_BYTES(&p, end, uid)) goto out_err;
 	if (WRITE_BYTES(&p, end, timeout)) goto out_err;
 	if (WRITE_BYTES(&p, end, pd->pd_seq_win)) goto out_err;
@@ -693,7 +731,7 @@
 
 /*
  * If the port isn't already set, do an rpcbind query to the remote server
- * using the program and version and get the port. 
+ * using the program and version and get the port.
  *
  * Newer kernels send the value of the port= mount option in the "info"
  * file for the upcall or '0' for NFSv2/3. For NFSv4 it sends the value
@@ -780,11 +818,13 @@
  * Create an RPC connection and establish an authenticated
  * gss context with a server.
  */
-int create_auth_rpc_client(struct clnt_info *clp,
-			   CLIENT **clnt_return,
-			   AUTH **auth_return,
-			   uid_t uid,
-			   int authtype)
+static int
+create_auth_rpc_client(struct clnt_info *clp,
+		       CLIENT **clnt_return,
+		       AUTH **auth_return,
+		       uid_t uid,
+		       int authtype,
+		       gss_cred_id_t cred)
 {
 	CLIENT			*rpc_clnt = NULL;
 	struct rpc_gss_sec	sec;
@@ -810,7 +850,7 @@
 
 	sec.qop = GSS_C_QOP_DEFAULT;
 	sec.svc = RPCSEC_GSS_SVC_NONE;
-	sec.cred = GSS_C_NO_CREDENTIAL;
+	sec.cred = cred;
 	sec.req_flags = 0;
 	if (authtype == AUTHTYPE_KRB5) {
 		sec.mech = (gss_OID)&krb5oid;
@@ -918,23 +958,6 @@
 	goto out;
 }
 
-static char *
-user_cachedir(char *dirname, uid_t uid)
-{
-	struct passwd *pw;
-	char *ptr;
-
-	if ((pw = getpwuid(uid)) == NULL) {
-		printerr(0, "user_cachedir: Failed to find '%d' uid"
-			    " for cache directory\n");
-		return NULL;
-	}
-	ptr = malloc(strlen(dirname)+strlen(pw->pw_name)+2);
-	if (ptr)
-		sprintf(ptr, "%s/%s", dirname, pw->pw_name);
-
-	return ptr;
-}
 /*
  * this code uses the userland rpcsec gss library to create a krb5
  * context on behalf of the kernel
@@ -949,18 +972,14 @@
 	gss_buffer_desc		token;
 	char			**credlist = NULL;
 	char			**ccname;
-	char			**dirname, *dir, *userdir;
+	char			**dirname;
 	int			create_resp = -1;
 	int			err, downcall_err = -EACCES;
+	gss_cred_id_t		gss_cred;
+	OM_uint32		maj_stat, min_stat, lifetime_rec;
 
 	printerr(2, "handling krb5 upcall (%s)\n", clp->dirname);
 
-	if (tgtname) {
-		if (clp->servicename) {
-			free(clp->servicename);
-			clp->servicename = strdup(tgtname);
-		}
-	}
 	token.length = 0;
 	token.value = NULL;
 	memset(&pd, 0, sizeof(struct authgss_private_data));
@@ -991,30 +1010,20 @@
 	if (uid != 0 || (uid == 0 && root_uses_machine_creds == 0 &&
 				service == NULL)) {
 		/* Tell krb5 gss which credentials cache to use */
-		for (dirname = ccachesearch; *dirname != NULL; dirname++) {
-			/* See if the user name is needed */
-			if (strncmp(*dirname, GSSD_USER_CRED_DIR, 
-					strlen(GSSD_USER_CRED_DIR)) == 0) {
-				userdir = user_cachedir(*dirname, uid);
-				if (userdir == NULL) 
-					continue;
-				dir = userdir;
-			} else
-				dir = *dirname;
-
-			err = gssd_setup_krb5_user_gss_ccache(uid, clp->servername, dir);
-
-			if (userdir) {
-				free(userdir);
-				userdir = NULL;
-			}
+		/* Try first to acquire credentials directly via GSSAPI */
+		err = gssd_acquire_user_cred(uid, &gss_cred);
+		if (!err)
+			create_resp = create_auth_rpc_client(clp, &rpc_clnt, &auth, uid,
+							     AUTHTYPE_KRB5, gss_cred);
+		/* if create_auth_rplc_client fails try the traditional method of
+		 * trolling for credentials */
+		for (dirname = ccachesearch; create_resp != 0 && *dirname != NULL; dirname++) {
+			err = gssd_setup_krb5_user_gss_ccache(uid, clp->servername, *dirname);
 			if (err == -EKEYEXPIRED)
 				downcall_err = -EKEYEXPIRED;
 			else if (!err)
 				create_resp = create_auth_rpc_client(clp, &rpc_clnt, &auth, uid,
-							     AUTHTYPE_KRB5);
-			if (create_resp == 0)
-				break;
+							     AUTHTYPE_KRB5, GSS_C_NO_CREDENTIAL);
 		}
 	}
 	if (create_resp != 0) {
@@ -1024,7 +1033,8 @@
 			int success = 0;
 			do {
 				gssd_refresh_krb5_machine_credential(clp->servername,
-								     NULL, service);
+								     NULL, service,
+								     tgtname);
 				/*
 				 * Get a list of credential cache names and try each
 				 * of them until one works or we've tried them all
@@ -1033,22 +1043,23 @@
 					printerr(0, "ERROR: No credentials found "
 						 "for connection to server %s\n",
 						 clp->servername);
-						goto out_return_error;
+					goto out_return_error;
 				}
 				for (ccname = credlist; ccname && *ccname; ccname++) {
 					gssd_setup_krb5_machine_gss_ccache(*ccname);
 					if ((create_auth_rpc_client(clp, &rpc_clnt,
 								    &auth, uid,
-								    AUTHTYPE_KRB5)) == 0) {
+								    AUTHTYPE_KRB5,
+								    GSS_C_NO_CREDENTIAL)) == 0) {
 						/* Success! */
 						success++;
 						break;
-					} 
+					}
 					printerr(2, "WARNING: Failed to create machine krb5 context "
 						 "with credentials cache %s for server %s\n",
 						 *ccname, clp->servername);
 				}
-				gssd_free_krb5_machine_cred_list(credlist);			
+				gssd_free_krb5_machine_cred_list(credlist);
 				if (!success) {
 					if(nocache == 0) {
 						nocache++;
@@ -1077,20 +1088,29 @@
 		goto out_return_error;
 	}
 
-	if (serialize_context_for_kernel(pd.pd_ctx, &token, &krb5oid, NULL)) {
+	/* Grab the context lifetime to pass to the kernel. lifetime_rec
+	 * is set to zero on error */
+	maj_stat = gss_inquire_context(&min_stat, pd.pd_ctx, NULL, NULL,
+				       &lifetime_rec, NULL, NULL, NULL, NULL);
+
+	if (maj_stat)
+		printerr(1, "WARNING: Failed to inquire context for lifetme "
+			    "maj_stat %u\n", maj_stat);
+
+	if (serialize_context_for_kernel(&pd.pd_ctx, &token, &krb5oid, NULL)) {
 		printerr(0, "WARNING: Failed to serialize krb5 context for "
 			    "user with uid %d for server %s\n",
 			 uid, clp->servername);
 		goto out_return_error;
 	}
 
-	do_downcall(fd, uid, &pd, &token);
+	do_downcall(fd, uid, &pd, &token, lifetime_rec);
 
 out:
 	if (token.value)
 		free(token.value);
-#ifndef HAVE_LIBTIRPC
-	if (pd.pd_ctx_hndl.length != 0)
+#ifdef HAVE_AUTHGSS_FREE_PRIVATE_DATA
+	if (pd.pd_ctx_hndl.length != 0 || pd.pd_ctx != 0)
 		authgss_free_private_data(&pd);
 #endif
 	if (auth)
@@ -1115,7 +1135,7 @@
 		return;
 	}
 
-	return process_krb5_upcall(clp, uid, clp->krb5_fd, NULL, NULL);
+	process_krb5_upcall(clp, uid, clp->krb5_fd, NULL, NULL);
 }
 
 void
@@ -1236,6 +1256,6 @@
 	free(enctypes);
 	free(target);
 	free(service);
-	return;	
+	return;
 }
 

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-09-28 21:58:43 +0000
+++ .pc/applied-patches	2013-05-24 21:28:27 +0000
@@ -4,6 +4,6 @@
 11-532048-reduce-verbosity.patch
 16-mount.nfs.man-update-distinction-between-fstype.patch
 17-multiarch-kerberos-paths.patch
-18-osd_login-sbindir.patch
 19-iscsiadm-path.patch
 20-ticket-expired-error.patch
+20-remove-autogenerated-man.patch

=== removed file 'ChangeLog'
--- ChangeLog	2011-07-09 16:28:32 +0000
+++ ChangeLog	1970-01-01 00:00:00 +0000
@@ -1,1527 +0,0 @@
-commit 684cf4a5e0e84a1367690d7ecf4882cbdf4f3228
-Author: Prem Karat <[e-mail]>
-Date:   Thu Jun 30 07:29:20 2011 -0400
-
-    mount.nfs: Fix for the bug in v1.2.4 that breaks mount.nfs
-    
-    commit 30ebf047 failed to include these changes that breaks mount.nfs.
-    mount.nfs will continue to work fine with these changes
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 057d2add27d1e05fed3ae7206ee043b6c1fda45a
-Author: NeilBrown <[e-mail]>
-Date:   Tue Jun 28 13:24:33 2011 -0400
-
-    Do not compile unnecessary files when the libmount code is enable
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 30ebf04700654deddbf5f57d95e84ec69cea8610
-Author: Prem Karat <[e-mail]>
-Date:   Tue Jun 28 11:53:40 2011 -0400
-
-    mount.nfs: Don't hard code source and destination
-    
-    Currently souce and destination parameters should be passed as first and
-    second paramter while using mount.nfs. This patch allows them to be passed
-    anywhere while mounting.
-    
-    Current functionality is
-    	mount.nfs source destn -o <options>
-    This patch will allow to do this
-    	mount.nfs -o <options> source destn
-    		or
-    	mount.nfs -o <options> source -o <options> destn
-    
-    Signed-off-by: Prem Karat <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit b3e190c4adfc9ec47567c968bd000d282d07b05e
-Author: NeilBrown <[e-mail]>
-Date:   Tue Jun 28 11:36:31 2011 -0400
-
-    mount: improve signal management when locking mtab
-    
-    As mount.nfs can run setuid it must be careful about how the user can
-    interact with in.  In particular it needs to ensure it does not
-    respond badly to any signals that the user might be able to generate.
-    
-    This is particularly an issue while updating /etc/mtab (when that is
-    not linked to /proc/mounts).  If the user can generate a signal which
-    kills mount.nfs while /etc/mtab is locked, then it will leave the file
-    locked, and could possibly corrupt mtab (particularly if 'ulimit 1'
-    was previously issued).
-    
-    Currently lock_mtab does set some handlers for signals, but not
-    enough.  It arranges for every signal up to (but not including)
-    SIGCHLD to cause mount.nfs to unlock mdadm promptly exit ... even if
-    the default behaviour would be to ignore the signal.  SIGALRM is
-    handled specially, and signals after SIGCHLD are left with their
-    default behaviour.  This includes for example SIGXFSZ which can be
-    generated by the user running "ulimit 1".
-    
-    So: change this so that some signals are left unchanged, SIGALRM is
-    handled as required, and all signals that the user can generate are
-    explicitly ignored.
-    
-    The remainder still cause mount.nfs to print a message, unlock mtab, and
-    exit.
-    
-    Signed-off-by: NeilBrown <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit a99b7846e2abec5e26ab6b764b921d79559e0a0f
-Author: J. Bruce Fields <[e-mail]>
-Date:   Mon Jun 27 12:31:07 2011 -0400
-
-    mountd: move fsidtype-specific code to helpers
-    
-    Now we can move these big switch statements into helper functions.
-    
-    Signed-off-by: J. Bruce Fields <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit e6559fd0b7b63f5d152d33d598dc74d78df30ecb
-Author: J. Bruce Fields <[e-mail]>
-Date:   Mon Jun 27 12:30:36 2011 -0400
-
-    mountd: gather fsid information into one struct
-    
-    A large part of nfsd_fh() is concerned with extracting
-    fsid-type-specific information from the fsid, then matching that
-    information with information from the export list and the filesystem.
-    
-    Moving all that information into one struct will allow some further
-    simplifications.
-    
-    Signed-off-by: J. Bruce Fields <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 13a0a61d037f2cc09e7997a96ce5822b9317883b
-Author: J. Bruce Fields <[e-mail]>
-Date:   Mon Jun 27 12:29:51 2011 -0400
-
-    mountd: prefer explicit subexports over crossmnt parents
-    
-    If a parent is exported with crossmnt, and if a child is also explicitly
-    exported, then both exports could potentially produce matches in this
-    loop; that isn't a bug.
-    
-    Instead of warning and ignoring the second match we find, we should
-    instead prefer whichever export is deeper in the tree, so that
-    children's options can override those of their parents.
-    
-    Reported-by: Olga Kornievskaia <[e-mail]>
-    Signed-off-by: J. Bruce Fields <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit f8d26c1db9a260597828685c7f62e1b29e78285f
-Author: Jeff Layton <[e-mail]>
-Date:   Wed Jun 22 15:52:55 2011 -0400
-
-    manpage: add section on character class matches to exports(5)
-    
-    Signed-off-by: Jeff Layton <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit cb6676aea5bcfcbeaf868e53177eff51f4efe9a8
-Author: James Pearson <[e-mail]>
-Date:   Wed Jun 22 15:51:47 2011 -0400
-
-    nfs-utils: remove possibly false statement from exports.man
-    
-    A very minor change suggested by J. Bruce Fields <[e-mail]>
-    to remove the statement that exporting to a single host or IP address is
-    the "most common format" - as it probably isn't.
-    
-    Signed-off-by: James Pearson <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 7d71ff8e3825a7f8c2d5c9b5b9344e95e7aa1392
-Author: Jeff Layton <[e-mail]>
-Date:   Wed Jun 22 15:51:02 2011 -0400
-
-    manpage: add info about IPv6 configuration to exports(5)
-    
-    The parts of the exports(5) manpage that discuss IP addressing neglect
-    IPv6 configuration. Update to include info on how to export to IPv6
-    subnets and addresses, and add a line demonstrating that to the EXAMPLE
-    section.
-    
-    Signed-off-by: Jeff Layton <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 545ea1098089d6396d5a70111ec231c4de967faa
-Author: Benny Halevy <[e-mail]>
-Date:   Wed Jun 22 15:44:17 2011 -0400
-
-    nfsstat: reorder nfs4 stats for 2.6.39
-    
-    Signed-off-by: Benny Halevy <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit c7ce7a4674ad446bee4dd3baf90155ce6b216816
-Author: Mi Jinlong <[e-mail]>
-Date:   Wed Jun 22 15:41:27 2011 -0400
-
-    libexport.a: fix using bad index for loop at cltsetup()
-    
-    In cltsetup(), when checking the address, use clp's naddr for index,
-    instead of  cltarg's naddr, which it's always zero there.
-    
-    Signed-off-by: Mi Jinlong <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit b50ad13298b3e9519a9bdecb8c146c9ecf39cef8
-Author: Jeff Layton <[e-mail]>
-Date:   Wed Jun 22 14:51:38 2011 -0400
-
-    nfs: fix host_reliable_addrinfo
-    
-    According to Neil Brown:
-    
-        The point of the word 'reliable' is to check that the name we get
-        really does belong to the host in question - ie that both the
-        forward and reverse maps agree.
-    
-        But the new code doesn't do that check at all.  Rather it simply
-        maps the address to a name, then discards the address and maps the
-        name back to a list of addresses and uses that list of addresses as
-        "where the request came from" for permission checking.
-    
-    This bug is exploitable via the following scenario and could allow an
-    attacker access to data that they shouldn't be able to access.
-    
-        Suppose you export a filesystem to some subnet or FQDN and also to a
-        wildcard or netgroup, and I know the details of this (maybe
-        showmount -e tells me) Suppose further that I can get IP packets to
-        your server..
-    
-        Then I create a reverse mapping for my ipaddress to a domain that I
-        own, say "black.hat.org", and a forward mapping from that domain to
-        my IP address, and one of your IP addresses.
-    
-        Then I try to mount your filesystem.  The IP address gets correctly
-        mapped to "black.hat.org" and then mapped to both my IP address and
-        your IP address.
-    
-        Then you search through all of your exports and find that one of the
-        addresses: yours - is allowed to access the filesystem.
-    
-        So you create an export based on the addrinfo you have which allows
-        my IP address the same access as your IP address.
-    
-    Fix this by instead using the forward lookup of the hostname just to
-    verify that the original address is in the list. Then do a numeric
-    lookup using the address and stick the hostname in the ai_canonname.
-    
-    Reviewed-by: NeilBrown <[e-mail]>
-    Signed-off-by: Jeff Layton <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 7235a2164aabfd8dba1f7e1577047bda45053db0
-Author: James Pearson <[e-mail]>
-Date:   Tue Jun 7 16:25:13 2011 -0400
-
-    exports: Clearly Defining Exports Priorities
-    
-    Added some verbiage to the exports(5) man page
-    that clearly explains the precedence around
-    how exports will work with regard to netgroups.
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit a36f2437caffb23c68fdc0900544d59198bd52b6
-Author: Neil Brown <[e-mail]>
-Date:   Tue Jun 7 13:18:55 2011 -0400
-
-    Document "-n" for svcgssd
-    
-    The svcgssd man page doesn't mention the "-n" flag.
-    
-    Signed-off-by: NeilBrown <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 40aed2c3fb5164195a9975ae7f15ebd4b992839d
-Author: Pavel Shilovsky <[e-mail]>
-Date:   Tue Jun 7 13:18:13 2011 -0400
-
-    mountd: Fix missing varialble assignment in auth_unix_gid
-    
-    When we get into auth_unix_gid at the second time, groups_len
-    is not 0 and ngroups variable leave as 0. Then we use ngroups
-    in getgrouplist that fails in this case. This patch fixes it.
-    
-    Signed-off-by: Pavel Shilovsky <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 8935933dedcd820c2fb3dddff8b79fd5841dc217
-Author: Benny Halevy <[e-mail]>
-Date:   Mon May 23 08:37:17 2011 -0400
-
-    nfsstat: reorder nfs4 stats for 2.6.38 and up
-    
-    match order in 2.6.38, 2.6.39 (-rc3) and development tree
-    while at it, get rid of obsolete ds_write and ds_commit
-    
-    Signed-off-by: Benny Halevy <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 27dcd8a775024160e741cce53e4a402eaac3501d
-Author: NeilBrown <[e-mail]>
-Date:   Mon May 23 08:23:51 2011 -0400
-
-    supress socket error when address family is not supported
-    
-    From: Suresh Jayaraman <[e-mail]>
-    
-    It was observed that when ipv6 module was not loaded and cannot be auto-loaded,
-    when starting NFS server, the following error occurs:
-    	"rpc.nfsd: unable to create inet6 TCP socket: errno 97 (Address
-    	family not supported by protocol)"
-    
-    This is obviously a true message, but does not represent an "error" when ipv6
-    is not enabled.  Rather, it is an expected condition.  As such, it can be
-    confusing / misleading / distracting to display it in this scenario.
-    
-    This patch instead of throwing error when a socket call fails with
-    EAFNOSUPPORT, makes it as a NOTICE.
-    
-    Signed-off-by: Suresh Jayaraman <[e-mail]>
-    Signed-off-by: Neil Brown <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 7a802337bfc92d0b30fe94dbd0fa231990a26161
-Author: NeilBrown <[e-mail]>
-Date:   Mon May 23 08:19:57 2011 -0400
-
-    Remove risk of nfs_addmntent corrupting mtab
-    
-    nfs_addmntent is used to append directly to /etc/mtab.
-    If the write partially fail, e.g. due to RLIMIT_FSIZE,
-    truncate back to original size and return an error.
-    
-    See also https://bugzilla.redhat.com/show_bug.cgi?id=697975
-    (CVE-2011-1749) CVE-2011-1749 nfs-utils: mount.nfs fails to anticipate RLIMIT_FSIZE
-    
-    Signed-off-by: NeilBrown <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 56f537535190d034039570bafd9a0de71b79b8f1
-Author: Ben Myers <[e-mail]>
-Date:   Mon May 23 08:07:00 2011 -0400
-
-    exportfs: getexportent interprets -test-client- as	default options
-    
-    With commit 1374c3861abdc66f3a1410e26cc85f86760b51dd Neil added a
-    -test-client- export to test the exportability of filesystems when exportfs
-    is run.  When using the old cache controls (i.e. /proc/fs/nfsd is not
-    mounted) exportfs will read /proc/fs/nfs/exports to process existing
-    exports and find these test client entries.  The dash at the beginning of
-    -test-client- will be cause getexportent to look for default options in the
-    rest of the string, which test-client- will not match:
-    
-    exportfs: /proc/fs/nfs/exports:1: unknown keyword "test-client-(rw"
-    
-    This patch resolves that problem (as Steve suggested) by not processing any
-    default options if we are reading the list of existing exports from the
-    kernel.  Default options are converted to individual exports by exportfs so
-    the kernel won't have any regardless.
-    
-    Signed-off-by: Ben Myers <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit c8e802c036a3f0fcd4481dae8b3ec09fb71f4118
-Author: Jim Rees <[e-mail]>
-Date:   Wed May 18 12:42:02 2011 -0400
-
-    Removed compilation warnings from mountd/cache.c
-    
-    Commit 5604b35a6 introduced a number of missing initializer
-    warnings that were missed. This patch removes those warnings.
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 68f7938c85258a8c54b13169dcdeae61cc1bf286
-Author: Steve Dickson <[e-mail]>
-Date:   Tue Apr 26 13:32:35 2011 -0400
-
-    nfsstat: Output headings mislabled
-    
-    The badclnt and badauth headers were reversed
-    when the server side rpc stats (-s -o rpc) were
-    displayed.
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 2e4a7e9b50a641dc8640a5dd911ee4a2f0b2c073
-Author: Steve Dickson <[e-mail]>
-Date:   Tue Apr 19 12:31:30 2011 -0400
-
-    rpc.svcgssd: Segmentation fault on error
-    
-    Commit 544ed73d introduced a regression that caused
-    rpc.svcgssd to seg fault on "Wrong principal in request"
-    errors in gss_accept_sec_context()
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 5604b35a61e22930873ffc4e9971002f578e7978
-Author: Sean Finney <[e-mail]>
-Date:   Tue Apr 19 11:04:35 2011 -0400
-
-    nfs-utils: Increase the stdio file buffer size for procfs files
-    
-    Previously, when writing to /proc/net/rpc/*/channel, if a cache line
-    were larger than the default buffer size (likely 1024 bytes), mountd
-    and svcgssd would split writes into a number of buffer-sized writes.
-    Each of these writes would get an EINVAL error back from the kernel
-    procfs handle (it expects line-oriented input and does not account for
-    multiple/split writes), and no cache update would occur.
-    
-    When such behavior occurs, NFS clients depending on mountd to finish
-    the cache operation would block/hang, or receive EPERM, depending on
-    the context of the operation.  This is likely to happen if a user is a
-    member of a large (~100-200) number of groups.
-    
-    Instead, every fopen() on the procfs files in question is followed by
-    a call to setvbuf(), using a per-file dedicated buffer of
-    RPC_CHAN_BUF_SIZE length.
-    
-    Really, mountd should not be using stdio-style buffered file operations
-    on files in /proc to begin with.  A better solution would be to use
-    internally managed buffers and calls to write() instead of these stdio
-    calls, but that would be a more extensive change; so this is proposed
-    as a quick and not-so-dirty fix in the meantime.
-    
-    Signed-off-by: Sean Finney <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 9274e94db85bac04e170414cb8e0f4be271cde90
-Author: Sean Finney <[e-mail]>
-Date:   Tue Apr 19 11:05:47 2011 -0400
-
-    mountd: Use a dynamic buffer for storing lists of gid's
-    
-    Previously, in auth_unix_gid, group lists were stored in an array of
-    hard-coded length 100, and in the situation that the group lists for a
-    particular call were too large, the array was swapped with a dynamically
-    allocated/freed buffer.  For environments where users are commonly in
-    a large number of groups, this isn't an ideal approach.
-    
-    Instead, use malloc/realloc to grow the list on an as-needed basis.
-    
-    Signed-off-by: Sean Finney <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit a99269230a0e77e7bed4fa31c9547f0d61c7f206
-Author: Karel Zak <[e-mail]>
-Date:   Wed Apr 6 12:39:21 2011 -0400
-
-    mount: add --enable-libmount-mount
-    
-    This patch allows to link mount.nfs with libmount from util-linux >=
-    v2.19. The new libmount based code is enabled by CONFIG_LIBMOUNT and
-    is stored in mount_libmount.c. The old code is not affected by this
-    change.
-    
-    The libmount does not have officially stable API yet, so the
-    --enable-libmount-mount is marked as experimental in the configure
-    help output.
-    
-    The ./configure option is the same as we use in util-linux to enable
-    support for libmount in mount(8).
-    
-    The addr= (and some other options necessary for remount/umount) are
-    stored to /etc/mtab or to /dev/.mount/utab. The utab file is *private*
-    libmount file. It's possible that some mount options (for example
-    user=) will be moved to kernel, so the utab will not be necessary.
-    
-    About libmount:
-    
-      * supports systems without and with regular /etc/mtab
-      * does not store VFS and FS mount options in userspace
-      * manages user= option and evaluate permissions
-      * parses VFS mount options and generate MS_* flags
-      * parses /etc/{fstab,mtab}, /proc/mounts or /proc/self/mountinfo
-      * long-term goal is to use the same code in all mount.<type> helpers
-    
-    Note, use
-    
-       LIBMOUNT_DEBUG=0xffff mount.nfs foo:/path /path
-    
-    to debug the library.
-    
-    On systems with util-linux v2.19 the findmnt(8) command uses libmount
-    to list all/selected mount points:
-    
-       $ findmnt /path
-       $ findmnt --mtab /path
-    
-    the --mtab appends userspace mount options (e.g. user=) to the output.
-    
-    CC: Chuck Lever <[e-mail]>
-    Signed-off-by: Karel Zak <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit c01e5ca6179b8f5b041605d9bbd75a0f76812d54
-Author: Karel Zak <[e-mail]>
-Date:   Wed Apr 6 11:36:40 2011 -0400
-
-    mount: move generic functions to utils.c and network.c
-    
-    Move generic code that could be shared between standard mount.nfs and
-    libmount version to utils.c and network.c.
-    
-    CC: Chuck Lever <[e-mail]>
-    Signed-off-by: Karel Zak <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit d6c1b35c6b40243bfd6fba2591c9f8f2653078c0
-Author: Kevin Coffman <[e-mail]>
-Date:   Wed Apr 6 11:25:03 2011 -0400
-
-    nfs-utils: Add support to svcgssd to limit the negotiated enctypes
-    
-    Recent versions of Kerberos libraries negotiate and use
-    an "acceptor subkey".  This negotiation does not consider
-    that a service may have limited the encryption keys in its
-    keytab.  A patch (http://src.mit.edu/fisheye/changelog/krb5/?cs=24603)
-    has been added to the MIT Kerberos code to allow an application
-    to indicate that it wants to limit the encryption types negotiated.
-    (This functionality has been available on the client/initiator
-    side for a while.  The new patch adds this support to the
-    server/acceptor side.)
-    
-    This patch adds support to read a recently added nfsd
-    proc file to determine the encryption types supported by
-    the kernel and calls the function to limit encryption
-    types negotiated for the acceptor subkey.
-    
-    Signed-off-by: Kevin Coffman <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 73840ef610accf4cf667427bc64805377c0d8394
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Apr 6 10:53:57 2011 -0400
-
-    exports: add a configurable time-to-live for the kernel	cache entries
-    
-    From: Trond Myklebust <[e-mail]>
-    
-    The fedfs ldap server will specify a ttl for its entries.
-    
-    Signed-off-by: Trond Myklebust <[e-mail]>
-    
-    This is a refactoring change only.  There should be no change in
-    behavior.
-    
-    Original patch had updates to utils/mountd/junctions.c, which no
-    longer exists.  These are not included here.
-    
-    Create a macro for the default cache TTL, which is used in several
-    places besides the export cache.
-    
-    Make e_ttl unsigned.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 38e4c685410885a6d464ddd44eff4fd5e7f8459f
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Apr 6 10:49:52 2011 -0400
-
-    statd: Remove vestigial "-w" option from man page synopsis
-    
-    The synopsis of rpc.statd in its man page lists "-w" as a valid
-    option.  There is currently no support in the source code for a "-w"
-    option.
-    
-    BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=199
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit b57cd77c13831051ad974ae027d96cd88a8d0c59
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Apr 6 10:48:38 2011 -0400
-
-    mount.nfs: Don't leak socket in nfs_ca_sockname()
-    
-    Ensure the test socket is always closed before nfs_ca_sockname()
-    returns.  Otherwise it's orphaned.
-    
-    BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=197
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 502eef09d8050ffb87d394397c2780e1ef042d68
-Author: Steve Dickson <[e-mail]>
-Date:   Wed Apr 6 10:46:06 2011 -0400
-
-    Removed a warning from v4root.c
-    
-    v4root.c:176:9: warning: variable 'ret' set but not used
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit c2fa189a0467c25666f014cf9ff2576a9f54d682
-Author: Steve Dickson <[e-mail]>
-Date:   Wed Apr 6 10:39:10 2011 -0400
-
-    Removed a warning from exportfs.c
-    
-    exportfs.c:280:29: warning: 'exp' may be used uninitialized in this function
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit b98ae9df8c4904289c9390288325058b24caa423
-Author: Steve Dickson <[e-mail]>
-Date:   Wed Apr 6 10:36:30 2011 -0400
-
-    Removed a warning from conffile.c
-    
-    conffile.c:258:19: warning: 'j' may be used uninitialized in this function
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 012e1a4bf2a002e8cd4d5be3478bfa20a91cbfed
-Author: Masatake YAMATO <[e-mail]>
-Date:   Mon Mar 7 08:36:19 2011 -0500
-
-    Update man pages for /etc/exports.d
-    
-    Man page updates for /etc/exports.d.
-    
-    Signed-off-by: Masatake YAMATO <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit c7427b57e2be8ef0d57ad0618d4590c062b130f5
-Author: Masatake YAMATO <[e-mail]>
-Date:   Mon Mar 7 08:18:51 2011 -0500
-
-    Read /etc/exports.d/*.export as extra export files
-    
-    This patch adding a capability to read /etc/exports.d/*.exports as
-    extra export files to exportfs.
-    
-    If one wants to add or remove an export entry in a script, currently
-    one may have to use sed or something tool for adding or removing the
-    line for the entry in /etc/exports file.
-    
-    With the patch, adding and removing an entry from a script is much
-    easier.
-    cat<<EOF... or mv can be used for adding. rm can be used for removing.
-    
-    Signed-off-by: Masatake YAMATO <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit edb9b7f2ab9806afb9af31eabeb505fe454c51df
-Author: Steve Dickson <[e-mail]>
-Date:   Sat Mar 5 16:17:01 2011 -0500
-
-    Cleaned up a warning in rpcdispatch.c
-    
-    rpcdispatch.c:40:20: warning: comparison between signed and unsigned
-    integer expressions
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 930323817b61877d61fb8ef57229013daa2e6091
-Author: Steve Dickson <[e-mail]>
-Date:   Sat Mar 5 16:13:01 2011 -0500
-
-    mount: Remove MOUNT_CONFIG warnings
-    
-    The following changes are needed to remove compile warnings when
-    MOUNT_CONFIG is not defined
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 3ef3dc8f1e87ba7a6eaa3c2a6965aff6c80ba414
-Author: Chuck Lever <[e-mail]>
-Date:   Thu Mar 3 17:26:33 2011 -0500
-
-    mount: Recognize zero as a valid value for the port= option
-    
-    While zero is not a valid IP port number, zero does represent a valid
-    value for "port=".  It means "query rpcbind to discover the actual
-    non-zero port number to use".  So the parsing functions that handle
-    "port=" should not flag zero as an invalid value.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit b3a4dbfb61dad59829f5191d727267b2ea45937a
-Author: Mi Jinlong <[e-mail]>
-Date:   Wed Feb 9 11:29:42 2011 -0500
-
-    Gssd: modify wrong err message at handle_gssd_upcall
-    
-    Modify wrong err message at handle_gssd_upcall when
-    sscanf encryption types fail.
-    
-    Signed-off-by: Mi Jinlong <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 45e4597bd570ed40221f51887cde7d7f096f55e7
-Author: Jason Gunthorpe <[e-mail]>
-Date:   Wed Feb 9 11:27:19 2011 -0500
-
-    Support AD style kerberos automatically in rpc.gss
-    
-    An Active Directory KDC will only grant a TGT for UPNs, getting
-    a TGT for SPNs is not possible:
-    
-    $ kinit -k host/[e-mail]
-    kinit: Client not found in Kerberos database while getting initial
-    credentials
-    
-    The correct thing to do for machine credentials is to get a TGT
-    for the computer UPN <HOSTNAME>$@REALM:
-    $ kinit -k IB5\$
-    $ klist
-    12/22/10 11:43:47  12/22/10 21:43:47  krbtgt/[e-mail]
-    
-    Samba automatically creates /etc/krb5.keytab entry for the computer UPN,
-    this patch makes gssd_refresh_krb5_machine_credential prefer it above
-    the SPNs if it is present.
-    
-    The net result is that nfs client works automatically out of the box
-    if samba has been used to setup kerberos via 'net ads join' 'net ads
-    keytab create'
-    
-    Tested using Windows Server 2003 R2 as the AD server.
-    
-    Signed-off-by: Jason Gunthorpe <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 730f6986f86873513fa021a450eb55ccd0f2fbff
-Author: Steve Dickson <[e-mail]>
-Date:   Wed Jan 26 07:49:19 2011 -0500
-
-    Fixed segfault in rpc.mountd
-    
-    A unallocated piece of memory, instead of a NULL point, was being
-    used to initialize a ->next point in the mount link list which
-    caused a segfault after a few remote accesses via the showmount
-    command.
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 544ed73d5ab27c1390833d5cf93b9585c151667d
-Author: Steve Dickson <[e-mail]>
-Date:   Fri Jan 14 10:12:28 2011 -0500
-
-    Improve debugging in svcgssd
-    
-    Added in gss_display_error() which translates the GSS error into the
-    actual GSS macro name. Currently only the translation of these errors
-    are logged. Since those translations are buried deep in the kerberos
-    library code, having the actual GSS macro name makes it easier to
-    follow the code.
-    
-    Moved the nfs4_init_name_mapping() call into main() so if debug is
-    enabled the DNS name and realms will be logged during start up.
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 57be18b9ab08148a1cc9d5af588119885720be8b
-Author: Mi Jinlong <[e-mail]>
-Date:   Tue Jan 4 11:16:45 2011 -0500
-
-    libnsm.a: modify return value to false from 0 at nsm_drop_privileges()
-    
-    At nsm_drop_privileges(), for improving readability, unify
-    the return value.
-    
-    Signed-off-by: Mi Jinlong <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 5c498280fd9353ded3ea169841079bdae23418e2
-Author: Chuck Lever <[e-mail]>
-Date:   Mon Dec 13 14:50:45 2010 -0500
-
-    libnsm.a: sm-notify sometimes ignores monitored hosts
-    
-    Monitored host information is stored in files under /var/lib/nfs.
-    When visiting entries in the monitored hosts directory, libnsm.a
-    examines the value of dirent.d_type to determine if an entry is a
-    regular file.
-    
-    According to readdir(3), the d_type field is not supported by all
-    file system types.  My root file system happens to be one where d_type
-    isn't supported.  Typical installations that use an ext-derived root
-    file system are not exposed to this issue, but those who use xfs, for
-    instance, are.
-    
-    On such file systems, not only are remote peers not notified of
-    reboots, but the NSM state number is never incremented.  A statd warm
-    restart would not re-monitor any hosts that were monitored before
-    the restart.
-    
-    When writing support/nsm/file.c, I copied the use of d_type from the
-    original statd code, so this has likely been an issue for some time.
-    
-    Replace the use of d_type in support/nsm/file.c with a call to
-    lstat(2).  It's extra code, but is guaranteed to work on all file
-    system types.
-    
-    Note there is a usage of d_type in gssd.  I'll let gssd and rpcpipefs
-    experts decide whether that's worth changing.
-    
-    Fix for:
-    
-      https://bugzilla.linux-nfs.org/show_bug.cgi?id=193
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 089df7c754d9ebab0a7b804f396626ac95fee2e6
-Author: Chuck Lever <[e-mail]>
-Date:   Mon Dec 13 14:47:42 2010 -0500
-
-    libnsm.a: Replace __attribute_noinline__
-    
-    Replace the __attribute_noinline__ form with
-    
-      __attribute__((__noinline__)).
-    
-    Even though the compiler didn't complain about __attribute_malloc__,
-    also replace those in order to maintain consistent style throughout the
-    source file.
-    
-    Fix for:
-    
-      https://bugzilla.linux-nfs.org/show_bug.cgi?id=194
-    
-    Reported-by: "Gabor Z. Papp" <[e-mail]>
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 7869a76207d3f4b3bd4ab57b4a7a8807ac2ff0c6
-Author: Chuck Lever <[e-mail]>
-Date:   Mon Dec 13 14:36:15 2010 -0500
-
-    sm-notify: Make use of AI_NUMERICSERV conditional
-    
-    Gabor Papp reports nfs-utils-1.2.3 doesn't build on his system that
-    uses glibc-2.2.5:
-    
-    make[3]: Entering directory
-    `/home/gzp/src/nfs-utils-1.2.3/utils/statd'
-    gcc -DHAVE_CONFIG_H -I. -I../../support/include   -D_GNU_SOURCE -Wall
-    	-Wextra -Wstrict-prototypes  -pipe -g -O2 -MT sm-notify.o -MD
-    	-MP -MF .deps/sm-notify.Tpo -c -o sm-notify.o sm-notify.c
-    	sm-notify.c: In function 'smn_bind_address':
-    sm-notify.c:247: error: 'AI_NUMERICSERV' undeclared (first use in this
-    function)
-    sm-notify.c:247: error: (Each undeclared identifier is reported only
-    once
-    sm-notify.c:247: error: for each function it appears in.)
-    make[3]: *** [sm-notify.o] Error 1
-    
-    According to the getaddrinfo(3) man page, AI_NUMERICSERV is available
-    only since glibc 2.3.4.  getaddrinfo(3) seems to convert strings
-    containing a number to the right port value without the use of
-    AI_NUMERICSERV, so I think we can survive on older glibc's without it.
-    It will allow admins to specify service names as well as port numbers
-    on those versions.
-    
-    There are uses of AI_NUMERICSERV in gssd and in nfs_svc_create().  The
-    one in nfs_svc_create() is behind HAVE_LIBTIRPC, and the other is a
-    issue only for those who want to deploy Kerberos -- likely in both
-    cases, a more modern glibc will be present.  I'm going to leave those
-    two.
-    
-    Fix for:
-    
-      https://bugzilla.linux-nfs.org/show_bug.cgi?id=195
-    
-    Reported-by: "Gabor Z. Papp" <[e-mail]>
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit e8dbaddc8465dcd07b53f8e80a537703dd0248ca
-Author: Sid Moore <[e-mail]>
-Date:   Fri Dec 3 09:19:06 2010 -0500
-
-    rpc.mountd: Checking RPC Procedure ID before process it
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 3c6973c595d62dc6452967d50ae8abe69f9f8bad
-Author: Mi Jinlong <[e-mail]>
-Date:   Mon Nov 29 10:59:10 2010 -0500
-
-    libnfs.a: fix a bug when parse section's arg
-    
-    When parsing section's arg at configure file, the pointer
-    should stop when fetch ']', and give the warning message.
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 86f7be64cafd17d4a3f164603484eaedb4757431
-Author: Harshula Jayasuriya <[e-mail]>
-Date:   Mon Nov 22 11:22:31 2010 -0500
-
-    nfs-utils: nfsstat: has_stats() does not function correctly for NFSv4 client stats
-    
-    The NFSv4 client procs/ops in "struct rpc_procinfo nfs4_procedures" is
-    used to generate the NFS client stats interface:
-    ------------------------------------------------------------
-    net 0 0 0 0
-    rpc 15 0 0
-    proc2 18 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-    proc3 22 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 2 1 0
-    proc4 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0
-    0 0 0
-    0 0 0 0 0 0 0
-    ------------------------------------------------------------
-    Note, for proc4, the number 42. That is the number of stats that follow
-    on the same line. Currently nfsstat's has_stats() relies on this number
-    to be equal to CLTPROC4_SZ. Unfortunately this is not the case. I have
-    changed has_stats() not to rely on these two values being equal. This
-    should also allow nfsstat to work with different kernel versions that
-    expose a different number of NFS client ops.
-    
-    * Fix has_stats()
-    * Stop print_clnt_list() printing server stats!
-    * Describe the option -3 and -4 completely in the nfsstat manpage.
-    
-    Signed-off-by: Harshula Jayasuriya <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 0868dcccb9a3bf3d022a32ff31311fe371484e77
-Author: Steve Dickson <[e-mail]>
-Date:   Sat Nov 20 15:01:21 2010 -0500
-
-    Enable nfsidmap to compile
-    
-    Only enable the compilation of nfsidmap when libnfsidmap support it.
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 6f07548141e710767d425e119d9823691293771d
-Author: Bryan Schumaker <[e-mail]>
-Date:   Fri Nov 19 12:01:10 2010 -0500
-
-    Add the new nfsidmap program
-    
-    This patch adds the nfsidmap program to nfs-utils.  This program is
-    called by the nfs idmapper through request-keys to map between
-    uid / user name and gid / group name.
-    
-    Signed-off-by: Bryan Schumaker <[e-mail]>
-    Signed-off-by: Trond Myklebust <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 409487978593de13ae36be0ee56d8111ad6b3319
-Author: Steve Dickson <[e-mail]>
-Date:   Mon Nov 22 11:33:37 2010 -0500
-
-    Removed a couple warnings from utils/mount/stropts.c
-    
-    stropts.c:740:6: warning: 'ret' may be used uninitialized in this function
-    stropts.c:653:6: warning: 'ret' may be used uninitialized in this function
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit f4968a724c1d4162a8e2b9f6a19c460cc56c95f7
-Author: Chuck Lever <[e-mail]>
-Date:   Fri Oct 29 12:56:21 2010 -0400
-
-    nfs(5): Document remount behavior
-    
-    It appears that, for a long while, NFS "remount" mounts have
-    completely wiped the existing mount options in /etc/mtab for a given
-    mount point.  This is a problem for umount.nfs, since it reads its
-    options out of /etc/mtab to find out how to do the unmount.
-    
-    The mount(8) command provides the NFS mount subcommand with the mount
-    options to perform the remount.  There are four cases to consider:
-    
-      1. Both the device and mount directory are specified on the
-         command line, and the target mount point is in /etc/fstab
-    
-      2. Only one of the device and mount directory is specified on
-         the command line, and the target mount point is in
-         /etc/fstab
-    
-      3. Both the device and mount directory are specified on the
-         command line, and the target mount point is not in /etc/fstab
-    
-      4. Only one of the device and mount directory is specified on
-         the command line, and the target mount point is not in
-         /etc/fstab
-    
-    Currently only case 4 works correctly.  In that case, mount(8)
-    provides the correct set of mount options to the mount.nfs
-    subcommand and it can update /etc/mtab correctly.
-    
-    Cases 1 and 3 replace all mount options in /etc/mtab with the options
-    provided on the command line during a remount.  Case 2 replaces the
-    mount options in /etc/mtab with a mix of options from /etc/fstab and
-    /etc/mtab.
-    
-    Cases 1 and 3 are historical behavior.  Basically this is a formal
-    interface to allow administrators to replace the mount options in
-    /etc/mtab completely, instead of merging in new ones.  The present
-    patch documents that behavior in nfs(5), and provides best practice
-    for remounting NFS mount points.
-    
-    There are near-term plans to address case 2 by fixing mount(8)
-    (provided by utils-linux-ng in most distributions).
-    
-    This is a partial fix for:
-    
-      https://bugzilla.linux-nfs.org/show_bug.cgi?id=188
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 6d1a82b005994f759f2c847c0354413a24643da5
-Author: Chuck Lever <[e-mail]>
-Date:   Thu Oct 28 13:15:22 2010 -0400
-
-    nfs(5): Grammar and style fixes
-    
-    Clean up grammar and style issues introduced by recent updates.  Also,
-    I'm not certain inappropriate options are always ignored.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit ab2cdb859f738a25e2567a2ec674cfa78a0a175d
-Author: Chuck Lever <[e-mail]>
-Date:   Thu Oct 28 13:13:19 2010 -0400
-
-    mount.nfs: mnt_freq and mnt_pass are always zero
-    
-    Clean up.
-    
-    No need to pass constant zeros to add_mtab() from its only call site.
-    Ensure that initialization of a struct mntent is consistent in both
-    places that it is done.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit bc4a0c42570d5620cc1bb32428e16b9c9b5f3863
-Author: Chuck Lever <[e-mail]>
-Date:   Thu Oct 28 13:10:48 2010 -0400
-
-    mount.nfs: Fix memory leak in nfs_sys_mount()
-    
-    This appears to have been left behind by last year's adjustments to
-    how the extra_opts string is constructed.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 1f237ac72e6f563908b350e11fd2bb866c003028
-Author: Chuck Lever <[e-mail]>
-Date:   Thu Oct 28 13:09:38 2010 -0400
-
-    mount: Fix compiler warning in nfs_parse_retry_option()
-    
-    stropts.c: In function nfs_parse_retry_option:
-    stropts.c:131: warning: conversion to unsigned int from long int may
-    alter its value
-    
-    Make it more clear what the second argument is for, and flag the
-    switch fallthrough case.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 1ea2c3be33f2eb4630c5cdb78edf2bb670b294ab
-Author: Chuck Lever <[e-mail]>
-Date:   Thu Oct 28 12:12:12 2010 -0400
-
-    nfs-utils: Remove all uses of AI_ADDRCONFIG
-    
-    It was reported that, if only "lo" is up,
-    
-      mount.nfs 127.0.0.1:/export /mount
-    
-    fails with "Name or service not known".
-    
-    "man 3 getaddrinfo" says this:
-    
-      If hints.ai_flags includes the AI_ADDRCONFIG flag, then IPv4
-      addresses are returned in the list pointed to by res only if the
-      local system has at least one IPv4 address configured, and IPv6
-      addresses are only returned if the local system has at least
-      one IPv6 address configured.
-    
-    The man page oversimplifies here.  A review of glibc shows that
-    getaddrinfo(3) explicitly ignores loopback addresses when deciding
-    whether an IPv4 or IPv6 address is configured.
-    
-    This behavior around loopback is a problem not just for mount.nfs,
-    but also for RPC daemons that have to start up before a system's
-    networking is fully configured and started.  Given the history of
-    other problems with AI_ADDRCONFIG and the unpredictable behavior it
-    introduces, let's just remove it everywhere in nfs-utils.
-    
-    This fix addresses:
-    
-      https://bugzilla.linux-nfs.org/show_bug.cgi?id=191
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit f8e315543b7f1db7f37a4bfe8ede3020cef62868
-Author: Jeff Layton <[e-mail]>
-Date:   Thu Oct 28 09:18:33 2010 -0400
-
-    nfs-utils: fix default value for --enable-tirpc
-    
-    We need $enable_tirpc to be a tristate. 'yes' means that someone
-    explicitly requested building with tirpc. 'no' means that it was
-    explicitly disabled. Anything else means that no one specified a value.
-    
-    Fix it by setting the value to a blank string so that the default is
-    properly undefined.
-    
-    Reported-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Jeff Layton <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit c62d756402509ca5d07c1fd4d2e5a9d78dc4171b
-Author: Steve Dickson <[e-mail]>
-Date:   Tue Oct 19 15:54:35 2010 -0400
-
-    Updated rpc.mountd man page
-    
-    Updated the rpc.mountd man page to no longer reference
-    v3 as the "newer" version and also mentioned v4 as
-    a supported version.
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 79e9079e9af4e5c2aa1d77815df1147b26876eb8
-Author: Steve Dickson <[e-mail]>
-Date:   Tue Oct 19 15:54:04 2010 -0400
-
-    Cleared up the sync option in exportfs man page
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 6f228ea26be06572de245aed5496aaa122cca5a8
-Author: Steve Dickson <[e-mail]>
-Date:   Fri Oct 15 17:20:28 2010 -0400
-
-    Removed duplicate entries in export man page
-    
-    The man page's paragraphs about "refer=" and "replicas="
-    each appear twice.
-    
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 849b7072a04975bb5da09245fbcacb0cb754a909
-Author: Chuck Lever <[e-mail]>
-Date:   Thu Oct 14 10:33:25 2010 -0400
-
-    mountd: Clear mountd registrations at start up
-    
-    Clear stale MNT registrations before mountd tries to create fresh
-    listeners, to ensure that mountd starts.  This is also what statd does.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 93dcf64cc4a9e67f693aea35c8193428015f4a30
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 13:57:52 2010 -0400
-
-    behavior as file systems that use the monolithic /sbin/mount command.
-    See the MS_NOMTAB macro in utils-linux-ng/mount/mount.c.
-    
-    Note that mount(8) has MS_USERS and MS_USER in the "nomtab" category
-    as well, but mount.nfs needs to record those values so that unmounting
-    a user-mounted NFS file system can work.
-    
-    While we're here, fix some white space damage in fix_opts_string().
-    
-    This is a partial fix for:
-    
-      https://bugzilla.linux-nfs.org/show_bug.cgi?id=188
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit dc08c702a6c7f824f317af561f491635ee898a71
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 13:55:10 2010 -0400
-
-    umount.nfs: Distinguish between nfs4 and nfs mounts
-    
-    Neil Brown reports that umount.nfs is still confused by "-t nfs -o
-    vers=4" mounts.
-    
-    /etc/mtab can be confused.  /proc/mounts is authoritative on the
-    fstype of a mount.  Have umount.nfs consult it to determine which
-    mechanism to use for unmounting.  The code to read /proc/mounts was
-    lifted from the nfsstat command.
-    
-    The code introduced by this patch may look like belt-n-suspenders, but
-    we have two use cases to consider:
-    
-      1.  Old kernels don't support the "vers=4" mount option, so
-          umount.nfs must look for the "nfs4" fstype
-      2.  Upcoming kernels may eliminate support the "nfs4" fstype, so
-          umount.nfs must look for the "vers=4" mount option
-    
-    Thus this logic checks for "nfs4" first then looks for the NFS version
-    setting.
-    
-    Note that we could handle unmounting entirely in the kernel, but that
-    won't help older kernels that have this issue.
-    
-    See:
-      https://bugzilla.linux-nfs.org/show_bug.cgi?id=189
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 17962b82afb68ca8e6b0d3f432d36c6c7c4980ea
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 13:01:51 2010 -0400
-
-    mount.nfs: mountproto does not support RDMA
-    
-    Clean up.  Our client does not support the MNT protocol on RDMA.
-    
-    nfs_mount_protocol() isn't invoked for RDMA mounts (they are shunted
-    off before nfs_options2pmap() is invoked).  But in case it ever is,
-    it should return the expected response.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 73c61fa5cd114fa6eae0e095724ed63aa66a4a6b
-Author: NeilBrown <[e-mail]>
-Date:   Wed Oct 13 12:08:41 2010 -0400
-
-    gcc complained:
-    
-    client.c: In function 'init_netmask6':
-    client.c:181:1: warning: no return statement in function returning
-    non-void
-    
-    and Suse' build system complained
-    
-    I: Program returns random data in a function
-    E: nfs-utils no-return-in-nonvoid-function client.c:181
-    
-    when I built without --enable-ipv6
-    
-    Reviewed-by: Chuck Lever <[e-mail]>
-    Signed-off-by: NeilBrown <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 7e90281b88c05b01c61152b54a0cf2faec45b09c
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 12:02:32 2010 -0400
-
-    mount.nfs: Eliminate compiler warnings in utils/mount/network.c
-    
-    Clean up.
-    
-    network.c: In function get_socket:
-    network.c:431: warning: dereferencing type-punned pointer might break
-        strict-aliasing rules
-    
-    network.c: In function probe_bothports:
-    network.c:759: warning: dereferencing type-punned pointer might break
-        strict-aliasing rules
-    network.c:762: warning: dereferencing type-punned pointer might break
-        strict-aliasing rules
-    
-    network.c: In function nfs_probe_statd:
-    network.c:775: warning: dereferencing type-punned pointer might break
-        strict-aliasing rules
-    
-    network.c: In function nfs_call_umount:
-    network.c:904: warning: dereferencing type-punned pointer might break
-        strict-aliasing rules
-    
-    network.c: In function nfs_ca_sockname:
-    network.c:1106: warning: dereferencing type-punned pointer might break
-        strict-aliasing rules
-    network.c:1112: warning: dereferencing type-punned pointer might break
-        strict-aliasing rules
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 57385cf87790c0cbdfddfccdde66bd2c8da45923
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 11:59:30 2010 -0400
-
-    mount.nfs: Eliminate compiler warning in utils/mount/parse_opt.c
-    
-    parse_opt.c: In function po_rightmost:
-    parse_opt.c:517: warning: conversion to int from unsigned int may
-        change the sign of the result
-    
-    "i" contains the function's result value, so it should be defined as
-    the same type as the function's return type.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 1ee10ef034cbca86da4df271ac4097a948e7ab59
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 11:58:27 2010 -0400
-
-    mount.nfs: Eliminate compiler warning in utils/mount/nfsumount.c
-    
-    Clean up.
-    
-    nfsumount.c:374: warning: ISO C forbids omitting the middle term of
-       a ?: expression
-    
-    This is also probably harmless, but let's make the code unambiguous.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit e9c97e4f7075e563d7a442ca8298ac56bafba0d5
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 11:56:58 2010 -0400
-
-    mount.nfs: Eliminate compiler warning in utils/mount/nfsumount.c
-    
-    Clean up.
-    
-    nfsumount.c:265: warning: no previous prototype for nfsumount
-    
-    It's also a good idea if the compiler can ensure that the prototype
-    in nfsmount.h matches the actual function defined in nfsumount.c.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit e2b6d9cbaf20df26dd371a715fce3ae158f37126
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 11:54:49 2010 -0400
-
-    mount.nfs: Eliminate compiler warnings in utils/mount/mount.c
-    
-    Clean up.
-    
-    mount.c: In function parse_opt:
-    mount.c:354: warning: conversion to size_t from int may change the
-        sign of the result
-    mount.c:354: warning: conversion to int from size_t may change the
-        sign of the result
-    mount.c:359: warning: conversion to size_t from int may change the
-        sign of the result
-    mount.c:359: warning: conversion to int from size_t may change the
-        sign of the result
-    mount.c: In function parse_opts:
-    mount.c:374: warning: conversion to int from size_t may change the
-        sign of the result
-    mount.c:377: warning: conversion to size_t from int may change the
-        sign of the result
-    
-    Character string lengths are usually size_t anyway.  We can easily
-    avoid the implicit type cast here.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 013e8ec9ffb9f28f97e58299719023faf846a029
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 11:53:44 2010 -0400
-
-    mount.nfs: Eliminate compiler warning in utils/mount/mount.c
-    
-    Clean up.
-    
-    mount.c: At top level:
-    mount.c:324: warning: no previous prototype for ?mount_usage?
-    
-    mount_usage() has no callers outside of utils/mount/mount.c and no
-    prototype is provided in a header file.  Make it static.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 47480475c99335c1203e81662f815b62573c19e8
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 11:50:57 2010 -0400
-
-    mount.nfs: Eliminate compiler warnings in utils/mount/version.h
-    
-    Clean up.
-    
-    In file included from mount.c:50:
-    version.h: In function linux_version_code:
-    version.h:48: warning: conversion to unsigned int from int may
-        change the sign of the result
-    version.h:48: warning: conversion to unsigned int from int may
-        change the sign of the result
-    version.h:48: warning: conversion to unsigned int from int may
-        change the sign of the result
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 00885013dccbe00f5cc4e19223cf18e85a8e616a
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 11:44:23 2010 -0400
-
-    mount.nfs: Eliminate compiler warning in utils/mount/mount.c
-    
-    Clean up.
-    
-    In file included from mount.c:41:
-    mount_config.h:35: warning: no previous prototype for mount_config_opts
-    
-    Functions defined in include files are usually declared as "static
-    inline," eliminating the need for a forward declaration.
-    
-    While I was there, I also fixed the macro that prevents including
-    mount_config.h multiple times, and fixed some white space damage.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit ffa577350b03ddd421d455a8cd4cff86e3718264
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 11:38:22 2010 -0400
-
-    mount.nfs: Eliminate compiler warnings
-    
-    Clean up.
-    
-    fstab.c: In function ?lock_mtab?:
-    fstab.c:385: warning: declaration of ?errsv? shadows a previous local
-    fstab.c:367: warning: shadowed declaration is here
-    fstab.c:407: warning: declaration of ?errsv? shadows a previous local
-    fstab.c:367: warning: shadowed declaration is here
-    fstab.c:417: warning: declaration of ?tries? shadows a previous local
-    fstab.c:325: warning: shadowed declaration is here
-    fstab.c:422: warning: declaration of ?errsv? shadows a previous local
-    fstab.c:367: warning: shadowed declaration is here
-    
-    These are probably harmless.  Reusing a variable name, however, is a
-    little confusing to follow when reading the code.
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 5fe118b838254023d83424c5010ae73a91ec267d
-Author: Trond Myklebust <[e-mail]>
-Date:   Wed Oct 13 11:27:21 2010 -0400
-
-    export: Ensure that we free struct exportent->e_uuid
-    
-    Currently, the exportent->e_uuid is initialised in
-    support/nfs/exports.c:parseopts(), but it is never freed.
-    
-    Also ensure that exportent->e_uuid is duplicated correctly in
-    dupexportent().
-    
-    Adjusted to account for the new export_free() helper.
-    
-    Also, e_uuid points to memory that is always allocated with strdup(3),
-    not with xstrdup().  Thus it must be freed via free(3) and not via
-    xfree().
-    
-    Signed-off-by: Trond Myklebust <[e-mail]>
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 656028f9925f5817c5a37565d27159973db84ec3
-Author: Chuck Lever <[e-mail]>
-Date:   Wed Oct 13 11:22:07 2010 -0400
-
-    libnfs.a: Allow multiple RPC listeners to share	listener port number
-    
-    Normally, when "-p" is not specified on the mountd command line, the
-    TI-RPC library chooses random port numbers for each listener.  If a
-    port number _is_ specified on the command line, all the listeners
-    will get the same port number, so SO_REUSEADDR needs to be set on
-    each socket.
-    
-    Thus we can't let TI-RPC create the listener sockets for us in this
-    case; we must create them ourselves and then set SO_REUSEADDR (and
-    other socket options) by hand.
-    
-    Different versions of the same RPC program have to share the same
-    listener and SVCXPRT, so we have to cache xprts we create, and re-use
-    them when additional requests for registration come from the
-    application.
-    
-    Though it doesn't look like it, this fix was "copied" from the legacy
-    rpc_init() function.  It's more complicated for TI-RPC, of course,
-    since a TI-RPC application can set up listeners with a nearly
-    arbitrary number of address families and socket types, not just the
-    two listeners that legacy RPC applications can set up (one for AF_INET
-    UDP and one for AF_INET TCP).
-    
-    See:
-      https://bugzilla.linux-nfs.org/show_bug.cgi?id=190
-    
-    Signed-off-by: Chuck Lever <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 1296be71ebae4c0d7da61cc1077d97562d3bc549
-Author: Steve Dickson <[e-mail]>
-Date:   Wed Oct 13 10:17:58 2010 -0400
-
-    nfs-utils: Fixed typo in NFS man page
-    
-    Chuck pointed out there was a grammar typo in addition to the spelling
-    typo.  Here is a revised version of the patch.
-    
-    Signed-off-by: Jim Rees <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 9afbdbad4436df6f7a5a501c6e4db04c3a5bbb08
-Author: Steve Dickson <[e-mail]>
-Date:   Wed Oct 13 10:15:12 2010 -0400
-
-    Fix style nits in atomicio.c
-    
-    Signed-off-by: Jim Rees <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit c117b7a1f29db65d139824ba5bab2a58bf5609e2
-Author: Steve Dickson <[e-mail]>
-Date:   Wed Oct 13 10:09:53 2010 -0400
-
-    nfs-utils: Move common code into support
-    
-    There are several source files and headers present in the ./utils/idmapd
-    directory which are also usable in a doimapd daemon. Because of this we
-    move that support into the support directory such that it can be shared by
-    both daemons.
-    
-    Signed-off-by: Jim Rees <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 8c217b9623c8304608196aeb2f7360abfdf987c8
-Author: Suresh Jayaraman <[e-mail]>
-Date:   Wed Sep 29 07:14:14 2010 -0400
-
-    The kernel 2.6.37 has a add new mount option: local_lock.
-    Document the new option in the nfs(5) man page.
-    
-    Signed-off-by: Suresh Jayaraman <[e-mail]>
-    Signed-off-by: Steve Dickson <[e-mail]>
-
-commit 554df6bc8456c6971c1c597f70d3b9131e4e5e11
-Author: Steve Dickson <[e-mail]>
-Date:   Tue Sep 28 08:24:16 2010 -0400
-
-    Revert "nfs-iostat.py: don't wait for an extra interval when given a count"
-    
-    This reverts commit 837796686ad8f9178c7b6855ada728a53ae511e3.

=== modified file 'Makefile.in'
--- Makefile.in	2012-06-22 15:04:56 +0000
+++ Makefile.in	2013-05-24 21:28:27 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,9 +51,9 @@
 host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure COPYING \
-	ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
-	install-sh ltmain.sh missing
+	$(srcdir)/Makefile.in $(top_srcdir)/configure COPYING INSTALL \
+	NEWS compile config.guess config.sub install-sh ltmain.sh \
+	missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/aclocal/bsdsignals.m4 \
 	$(top_srcdir)/aclocal/ipv6.m4 \
@@ -50,6 +66,11 @@
 	$(top_srcdir)/aclocal/librpcsecgss.m4 \
 	$(top_srcdir)/aclocal/libsqlite3.m4 \
 	$(top_srcdir)/aclocal/libtirpc.m4 \
+	$(top_srcdir)/aclocal/libtool.m4 \
+	$(top_srcdir)/aclocal/ltoptions.m4 \
+	$(top_srcdir)/aclocal/ltsugar.m4 \
+	$(top_srcdir)/aclocal/ltversion.m4 \
+	$(top_srcdir)/aclocal/lt~obsolete.m4 \
 	$(top_srcdir)/aclocal/nfs-utils.m4 \
 	$(top_srcdir)/aclocal/rpcsec_vers.m4 \
 	$(top_srcdir)/aclocal/tcp-wrappers.m4 \
@@ -71,21 +92,30 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+	cscope distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -113,7 +143,10 @@
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = -I aclocal
@@ -152,9 +185,13 @@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
+GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSD = @GSSD@
 GSSGLUE_CFLAGS = @GSSGLUE_CFLAGS@
 GSSGLUE_LIBS = @GSSGLUE_LIBS@
+GSSKRB_CFLAGS = @GSSKRB_CFLAGS@
+GSSKRB_LIBS = @GSSKRB_LIBS@
 HAVE_LIBWRAP = @HAVE_LIBWRAP@
 HAVE_TCP_WRAPPER = @HAVE_TCP_WRAPPER@
 IDMAPD = @IDMAPD@
@@ -334,7 +371,7 @@
 all: all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -379,12 +416,12 @@
 	-rm -f libtool config.lt
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -394,7 +431,11 @@
 	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -408,37 +449,6 @@
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
@@ -447,6 +457,10 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
+cscopelist-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -510,8 +524,32 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+
+clean-cscope:
+	-rm -f cscope.files
+
+cscope.files: clean-cscope cscopelist-recursive cscopelist
+
+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -547,13 +585,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -582,36 +617,36 @@
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -622,8 +657,8 @@
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -633,7 +668,7 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
@@ -643,6 +678,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -666,13 +702,21 @@
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -703,10 +747,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -791,26 +840,27 @@
 uninstall-am:
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-data-am install-strip tags-recursive \
-	uninstall-am
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
+	cscopelist-recursive ctags-recursive install-am \
+	install-data-am install-strip tags-recursive uninstall-am
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-hook install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-hook
+	all all-am am--refresh check check-am clean clean-cscope \
+	clean-generic clean-libtool cscope cscopelist \
+	cscopelist-recursive ctags ctags-recursive dist dist-all \
+	dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-hook
 
 
 install-data-hook:

=== modified file 'README'
--- README	2012-05-25 20:41:58 +0000
+++ README	2013-05-24 21:28:27 +0000
@@ -1,4 +1,4 @@
-This is version 1.1.0 of nfs-utils, the Linux NFS utility package.
+This is nfs-utils, the Linux NFS userland utility package.
 
 
 0. PROJECT RESOURCES
@@ -108,31 +108,12 @@
        the lock.
        rpc.statd is only needed for NFSv2 and NFSv3 support.
 
-   E/ nfsdcld
-       This daemon is only needed on kernels that support the nfsdcld
-       upcall, and only if the legacy client ID tracking isn't used. It
-       is also not needed if the server does not support NFSv4.
-
-       To determine whether you need this or not, do the following:
-
-           # cat /proc/fs/nfsd/versions
-
-       That should yield a list of NFS versions that this kernel supports,
-       if "4" or later is not in that list, or they are prefixed with a "-"
-       then you don't need to run this daemon. Next:
-
-           # cat /proc/fs/nfsd/nfsv4recoverydir
-
-       If that file is not present, or the directory that the above command
-       outputs is not present, then this daemon is required in order to
-       support lock recovery by the clients when the server reboots.
-
-   F/ rpc.nfsd
+   E/ rpc.nfsd
        Starting nfsd will automatically start lockd.  The nfs server
        will now be fully active and respond to any requests from
        clients.
        
-   G/ sm-notify
+   F/ sm-notify
        This will notify any client which might have locks from before
        a reboot to try to reclaim their locks.  This should start
        immediately after rpc.nfsd is started so that clients have a

=== modified file 'aclocal.m4'
--- aclocal.m4	2012-06-22 15:04:56 +0000
+++ aclocal.m4	2013-05-24 21:28:27 +0000
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# generated automatically by aclocal 1.12.2 -*- Autoconf -*-
+
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,8442 +13,11 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <[e-mail]>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_REPLACE_SHELLFNS
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
-    ])
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-  lt_aix_libpath_sed='[
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }]'
-  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi],[])
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-  fi
-  ])
-  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
-
-case "$ECHO" in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([${with_sysroot}])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;