Merge lp:~logan/ubuntu/quantal/nfs-utils/debian-merge into lp:ubuntu/quantal/nfs-utils

[Logan Rosen]

[Luke Yelavich (themuso)]

Thanks for your work.

review: Approve

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-08-05 05:01:18 +0000
@@ -0,0 +1,1 @@
+debian/patches
 
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2012-08-05 05:01:18 +0000
@@ -0,0 +1,1 @@
+series
 
=== removed directory '.pc/01-sm-notify-in-sbin.patch'
=== removed directory '.pc/01-sm-notify-in-sbin.patch/utils'
=== removed directory '.pc/01-sm-notify-in-sbin.patch/utils/statd'
=== removed 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	1970-01-01 00:00:00 +0000
@@ -1,493 +0,0 @@
-/* 
- * Copyright (C) 1995, 1997-1999 Jeffrey A. Uphoff
- * Modified by Olaf Kirch, Oct. 1996.
- * Modified by H.J. Lu, 1998.
- * Modified by L. Hohberger of Mission Critical Linux, 2000.
- *
- * NSM for Linux.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sys/stat.h>
-#include <limits.h>
-#include <signal.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <getopt.h>
-#include <rpc/rpc.h>
-#include <rpc/pmap_clnt.h>
-#include <rpcmisc.h>
-#include <sys/resource.h>
-#include <sys/wait.h>
-#include <grp.h>
-
-#include "statd.h"
-#include "nfslib.h"
-#include "nsm.h"
-
-/* Socket operations */
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int	run_mode = 0;		/* foreground logging mode */
-
-/* LH - I had these local to main, but it seemed silly to have 
- * two copies of each - one in main(), one static in log.c... 
- * It also eliminates the 256-char static in log.c */
-static char *name_p = NULL;
-
-/* PRC: a high-availability callout program can be specified with -H
- * When this is done, the program will receive callouts whenever clients
- * are added or deleted to the notify list */
-char *ha_callout_prog = NULL;
-
-static struct option longopts[] =
-{
-	{ "foreground", 0, 0, 'F' },
-	{ "no-syslog", 0, 0, 'd' },
-	{ "help", 0, 0, 'h' },
-	{ "version", 0, 0, 'v' },
-	{ "outgoing-port", 1, 0, 'o' },
-	{ "port", 1, 0, 'p' },
-	{ "name", 1, 0, 'n' },
-	{ "state-directory-path", 1, 0, 'P' },
-	{ "notify-mode", 0, 0, 'N' },
-	{ "ha-callout", 1, 0, 'H' },
-	{ "no-notify", 0, 0, 'L' },
-	{ NULL, 0, 0, 0 }
-};
-
-extern void sm_prog_1 (struct svc_req *, register SVCXPRT *);
-
-#ifdef SIMULATIONS
-extern void simulator (int, char **);
-#endif
-
-
-#ifdef HAVE_TCP_WRAPPER 
-#include "tcpwrapper.h"
-
-static void 
-sm_prog_1_wrapper (struct svc_req *rqstp, register SVCXPRT *transp)
-{
-	/* remote host authorization check */
-	if (!check_default("statd", nfs_getrpccaller(transp), SM_PROG)) {
-		svcerr_auth (transp, AUTH_FAILED);
-		return;
-	}
-
-	sm_prog_1 (rqstp, transp);
-}
-
-#define sm_prog_1 sm_prog_1_wrapper
-#endif
-
-static void
-statd_unregister(void) {
-	nfs_svc_unregister(SM_PROG, SM_VERS);
-}
-
-/*
- * Signal handler.
- */
-static void 
-killer (int sig)
-{
-	statd_unregister ();
-	xlog_err ("Caught signal %d, un-registering and exiting", sig);
-}
-
-static void
-sigusr (int sig)
-{
-	extern void my_svc_exit (void);
-	xlog(D_GENERAL, "Caught signal %d, re-notifying (state %d)", sig,
-								MY_STATE);
-	my_svc_exit();
-}
-
-/*
- * Startup information.
- */
-static void log_modes(void)
-{
-	char buf[128];		/* watch stack size... */
-
-	/* No flags = no message */
-	if (!run_mode) return;
-
-	memset(buf,0,128);
-	sprintf(buf,"Flags: ");
-	if (run_mode & MODE_NODAEMON)
-		strcat(buf,"No-Daemon ");
-	if (run_mode & MODE_LOG_STDERR)
-		strcat(buf,"Log-STDERR ");
-#ifdef HAVE_LIBTIRPC
-	strcat(buf, "TI-RPC ");
-#endif
-
-	xlog_warn(buf);
-}
-
-/*
- * Since we do more than standard statd stuff, we might need to
- * help the occasional admin. 
- */
-static void 
-usage(void)
-{
-	fprintf(stderr,"usage: %s [options]\n", name_p);
-	fprintf(stderr,"      -h, -?, --help       Print this help screen.\n");
-	fprintf(stderr,"      -F, --foreground     Foreground (no-daemon mode)\n");
-	fprintf(stderr,"      -d, --no-syslog      Verbose logging to stderr.  Foreground mode only.\n");
-	fprintf(stderr,"      -p, --port           Port to listen on\n");
-	fprintf(stderr,"      -o, --outgoing-port  Port for outgoing connections\n");
-	fprintf(stderr,"      -V, -v, --version    Display version information and exit.\n");
-	fprintf(stderr,"      -n, --name           Specify a local hostname.\n");
-	fprintf(stderr,"      -P                   State directory path.\n");
-	fprintf(stderr,"      -N                   Run in notify only mode.\n");
-	fprintf(stderr,"      -L, --no-notify      Do not perform any notification.\n");
-	fprintf(stderr,"      -H                   Specify a high-availability callout program.\n");
-}
-
-static const char *pidfile = "/var/run/rpc.statd.pid";
-
-int pidfd = -1;
-static void create_pidfile(void)
-{
-	FILE *fp;
-
-	unlink(pidfile);
-	fp = fopen(pidfile, "w");
-	if (!fp)
-		xlog_err("Opening %s failed: %m\n", pidfile);
-	fprintf(fp, "%d\n", getpid());
-	pidfd = dup(fileno(fp));
-	if (fclose(fp) < 0) {
-		xlog_warn("Flushing pid file failed: errno %d (%m)\n",
-			errno);
-	}
-}
-
-static void truncate_pidfile(void)
-{
-	if (pidfd >= 0) {
-		if (ftruncate(pidfd, 0) < 0) {
-			xlog_warn("truncating pid file failed: errno %d (%m)\n",
-				errno);
-		}
-	}
-}
-
-static void run_sm_notify(int outport)
-{
-	char op[20];
-	char *av[6];
-	int ac = 0;
-
-	av[ac++] = "/usr/sbin/sm-notify";
-	if (run_mode & MODE_NODAEMON)
-		av[ac++] = "-d";
-	if (outport) {
-		sprintf(op, "-p%d", outport);
-		av[ac++] = op;
-	}
-	if (run_mode & STATIC_HOSTNAME) {
-		av[ac++] = "-v";
-		av[ac++] = MY_NAME;
-	}
-	av[ac] = NULL;
-	execv(av[0], av);
-	fprintf(stderr, "%s: failed to run %s\n", name_p, av[0]);
-	exit(2);
-
-}
-/* 
- * Entry routine/main loop.
- */
-int main (int argc, char **argv)
-{
-	extern char *optarg;
-	int pid;
-	int arg;
-	int port = 0, out_port = 0;
-	struct rlimit rlim;
-
-	int pipefds[2] = { -1, -1};
-	char status;
-
-	/* Default: daemon mode, no other options */
-	run_mode = 0;
-	xlog_stderr(0);
-	xlog_syslog(1);
-
-	/* Set the basename */
-	if ((name_p = strrchr(argv[0],'/')) != NULL) {
-		name_p ++;
-	} else {
-		name_p = argv[0];
-	}
-
-	/* Set hostname */
-	MY_NAME = NULL;
-
-	/* Process command line switches */
-	while ((arg = getopt_long(argc, argv, "h?vVFNH:dn:p:o:P:L", longopts, NULL)) != EOF) {
-		switch (arg) {
-		case 'V':	/* Version */
-		case 'v':
-			printf("%s version " VERSION "\n",name_p);
-			exit(0);
-		case 'F':	/* Foreground/nodaemon mode */
-			run_mode |= MODE_NODAEMON;
-			break;
-		case 'N':
-			run_mode |= MODE_NOTIFY_ONLY;
-			break;
-		case 'L': /* Listen only */
-			run_mode |= MODE_NO_NOTIFY;
-			break;
-		case 'd':	/* No daemon only - log to stderr */
-			run_mode |= MODE_LOG_STDERR;
-			break;
-		case 'o':
-			out_port = atoi(optarg);
-			if (out_port < 1 || out_port > 65535) {
-				fprintf(stderr, "%s: bad port number: %s\n",
-					argv[0], optarg);
-				usage();
-				exit(1);
-			}
-			break;
-		case 'p':
-			port = atoi(optarg);
-			if (port < 1 || port > 65535) {
-				fprintf(stderr, "%s: bad port number: %s\n",
-					argv[0], optarg);
-				usage();
-				exit(1);
-			}
-			break;
-		case 'n':	/* Specify local hostname */
-			run_mode |= STATIC_HOSTNAME;
-			MY_NAME = xstrdup(optarg);
-			break;
-		case 'P':
-			if (!nsm_setup_pathnames(argv[0], optarg))
-				exit(1);
-			break;
-		case 'H': /* PRC: specify the ha-callout program */
-			if ((ha_callout_prog = xstrdup(optarg)) == NULL) {
-				fprintf(stderr, "%s: xstrdup(%s) failed!\n",
-					argv[0], optarg);
-				exit(1);
-			}
-			break;
-		case '?':	/* heeeeeelllllllpppp? heh */
-		case 'h':
-			usage();
-			exit (0);
-		default:	/* oh dear ... heh */
-			usage();
-			exit(-1);
-		}
-	}
-
-	if (port == out_port && port != 0) {
-		fprintf(stderr, "Listening and outgoing ports cannot be the same!\n");
-		exit(-1);
-	}
-
-	if (run_mode & MODE_NOTIFY_ONLY) {
-		fprintf(stderr, "%s: -N deprecated, consider using /usr/sbin/sm-notify directly\n",
-			name_p);
-		run_sm_notify(out_port);
-	}
-
-	if (!(run_mode & MODE_NODAEMON)) {
-		run_mode &= ~MODE_LOG_STDERR;	/* Never log to console in
-						   daemon mode. */
-	}
-
-	if (getrlimit (RLIMIT_NOFILE, &rlim) != 0)
-		fprintf(stderr, "%s: getrlimit (RLIMIT_NOFILE) failed: %s\n",
-				argv [0], strerror(errno));
-	else {
-		/* glibc sunrpc code dies if getdtablesize > FD_SETSIZE */
-		if (rlim.rlim_cur > FD_SETSIZE) {
-			rlim.rlim_cur = FD_SETSIZE;
-
-			if (setrlimit (RLIMIT_NOFILE, &rlim) != 0) {
-				fprintf(stderr, "%s: setrlimit (RLIMIT_NOFILE) failed: %s\n",
-					argv [0], strerror(errno));
-			}
-		}
-	}
-
-#ifdef SIMULATIONS
-	if (argc > 1)
-		/* LH - I _really_ need to update simulator... */
-		simulator (--argc, ++argv);	/* simulator() does exit() */
-#endif
-	
-	if (!(run_mode & MODE_NODAEMON)) {
-		int tempfd;
-
-		if (pipe(pipefds)<0) {
-			perror("statd: unable to create pipe");
-			exit(1);
-		}
-		if ((pid = fork ()) < 0) {
-			perror ("statd: Could not fork");
-			exit (1);
-		} else if (pid != 0) {
-			/* Parent.
-			 * Wait for status from child.
-			 */
-			close(pipefds[1]);
-			if (read(pipefds[0], &status, 1) != 1)
-				exit(1);
-			exit (0);
-		}
-		/* Child.	*/
-		close(pipefds[0]);
-		setsid ();
-
-		while (pipefds[1] <= 2) {
-			pipefds[1] = dup(pipefds[1]);
-			if (pipefds[1]<0) {
-				perror("statd: dup");
-				exit(1);
-			}
-		}
-		tempfd = open("/dev/null", O_RDWR);
-		dup2(tempfd, 0);
-		dup2(tempfd, 1);
-		dup2(tempfd, 2);
-		dup2(pipefds[1], 3);
-		pipefds[1] = 3;
-		closeall(4);
-	}
-
-	/* Child. */
-
-	if (run_mode & MODE_LOG_STDERR) {
-		xlog_syslog(0);
-		xlog_stderr(1);
-		xlog_config(D_ALL, 1);
-	}
-	xlog_open(name_p);
-	xlog(L_NOTICE, "Version " VERSION " starting");
-
-	log_modes();
-
-	signal (SIGHUP, killer);
-	signal (SIGINT, killer);
-	signal (SIGTERM, killer);
-	/* PRC: trap SIGUSR1 to re-read notify list from disk */
-	signal(SIGUSR1, sigusr);
-	/* WARNING: the following works on Linux and SysV, but not BSD! */
-	signal(SIGCHLD, SIG_IGN);
-	/*
-	 * Ignore SIGPIPE to avoid statd dying when peers close their
-	 * TCP connection while we're trying to reply to them.
-	 */
-	signal(SIGPIPE, SIG_IGN);
-
-	create_pidfile();
-	atexit(truncate_pidfile);
-
-	if (! (run_mode & MODE_NO_NOTIFY))
-		switch (pid = fork()) {
-		case 0:
-			run_sm_notify(out_port);
-			break;
-		case -1:
-			break;
-		default:
-			waitpid(pid, NULL, 0);
-		}
-
-	/* Make sure we have a privilege port for calling into the kernel */
-	if (statd_get_socket() < 0)
-		exit(1);
-
-	/* If sm-notify didn't take all the state files, load
-	 * state information into our notify-list so we can
-	 * pass on any SM_NOTIFY that arrives
-	 */
-	load_state();
-
-	MY_STATE = nsm_get_state(0);
-	if (MY_STATE == 0)
-		exit(1);
-	xlog(D_GENERAL, "Local NSM state number: %d", MY_STATE);
-	nsm_update_kernel_state(MY_STATE);
-
-	/*
-	 * ORDER
-	 * Clear old listeners while still root, to override any
-	 * permission checking done by rpcbind.
-	 */
-	statd_unregister();
-
-	/*
-	 * ORDER
-	 */
-	if (!nsm_drop_privileges(pidfd))
-		exit(1);
-
-	/*
-	 * ORDER
-	 * Create RPC listeners after dropping privileges.  This permits
-	 * statd to unregister its own listeners when it exits.
-	 */
-	if (nfs_svc_create("statd", SM_PROG, SM_VERS, sm_prog_1, port) == 0) {
-		xlog(L_ERROR, "failed to create RPC listeners, exiting");
-		exit(1);
-	}
-	atexit(statd_unregister);
-
-	/* If we got this far, we have successfully started, so notify parent */
-	if (pipefds[1] > 0) {
-		status = 0;
-		if (write(pipefds[1], &status, 1) != 1) {
-			xlog_warn("writing to parent pipe failed: errno %d (%s)\n",
-				errno, strerror(errno));
-		}
-		close(pipefds[1]);
-		pipefds[1] = -1;
-	}
-
-	for (;;) {
-		/*
-		 * Handle incoming requests:  SM_NOTIFY socket requests, as
-		 * well as callbacks from lockd.
-		 */
-		my_svc_run();	/* I rolled my own, Olaf made it better... */
-
-		/* Only get here when simulating a crash so we should probably
-		 * start sm-notify running again.  As we have already dropped
-		 * privileges, this might not work, but I don't think
-		 * responding to SM_SIMU_CRASH is an important use cases to
-		 * get perfect.
-		 */
-		if (! (run_mode & MODE_NO_NOTIFY))
-			switch (pid = fork()) {
-			case 0:
-				run_sm_notify(out_port);
-				break;
-			case -1:
-				break;
-			default:
-				waitpid(pid, NULL, 0);
-			}
-
-	}
-	return 0;
-}
 
=== removed directory '.pc/02-524255-manpages.patch'
=== removed directory '.pc/02-524255-manpages.patch/utils'
=== removed directory '.pc/02-524255-manpages.patch/utils/exportfs'
=== removed file '.pc/02-524255-manpages.patch/utils/exportfs/nfsd.man'
--- .pc/02-524255-manpages.patch/utils/exportfs/nfsd.man	2012-05-25 20:41:58 +0000
+++ .pc/02-524255-manpages.patch/utils/exportfs/nfsd.man	1970-01-01 00:00:00 +0000
@@ -1,206 +0,0 @@
-.\"
-.\" nfsd(7) - The nfsd filesystem
-.\"
-.\" Copyright (C) 2003 Neil Brown <[e-mail]>
-.\" Licensed for public use under the terms of the FSF
-.\" General Public License (GPL) version 2.
-.TH nfsd 7 "3 July 2003"
-.SH NAME
-nfsd \- special filesystem for controlling Linux NFS server
-.SH SYNPOSIS
-.B "mount -t nfsd nfsd /proc/fs/nfsd"
-.SH DESCRIPTION
-The
-.B nfsd
-filesystem is a special filesystem which provides access to the Linux
-NFS server.  The filesystem consists of a single directory which
-contains a number of files.  These files are actually gateways into
-the NFS server.  Writing to them can affect the server.  Reading from
-them can provide information about the server.
-.P
-This file system is only available in Linux 2.6 and later series
-kernels (and in the later parts of the 2.5 development series leading
-up to 2.6).  This man page does not apply to 2.4 and earlier.
-.P
-As well as this filesystem, there are a collection of files in the
-.B procfs
-filesystem (normally mounted at
-.BR /proc )
-which are used to control the NFS server.
-This manual page describes all of these files.
-.P
-The
-.I exportfs
-and
-.I mountd
-programs (part of the nfs-utils package) expect to find this
-filesystem mounted at
-.B /proc/fs/nfsd
-or
-.BR /proc/fs/nfs .
-If it is not mounted, they will fall-back on 2.4 style functionality.
-This involves accessing the NFS server via a systemcall.  This
-systemcall is scheduled to be removed after the 2.6 kernel series.
-.SH DETAILS
-The three files in the
-.B nfsd
-filesystem are:
-.TP
-.B exports
-This file contains a list of filesystems that are currently exported
-and clients that each filesystem is exported to, together with a list
-of export options for that client/filesystem pair.  This is similar
-to the
-.B /proc/fs/nfs/exports
-file in 2.4.
-One difference is that a client doesn't necessarily correspond to just
-one host.  It can respond to a large collection of hosts that are
-being treated identically.
-
-Each line of the file contains a path name, a client name, and a
-number of options in parentheses.  Any space, tab, newline or
-back-slash character in the path name or client name will be replaced
-by a backslash followed by the octal ASCII code for that character.
-
-.TP
-.B threads
-This file represents the number of
-.B nfsd
-thread currently running.  Reading it will show the number of
-threads.  Writing an ASCII decimal number will cause the number of
-threads to be changed (increased or decreased as necessary) to achieve
-that number.
-
-.TP
-.B filehandle
-This is a somewhat unusual file  in that what is read from it depends
-on what was just written to it.  It provides a transactional interface
-where a program can open the file, write a request, and read a
-response.  If two separate programs open, write, and read at the same
-time, their requests will not be mixed up.
-
-The request written to
-.B filehandle
-should be a client name, a path name, and a number of bytes.  This
-should be followed by a newline, with white-space separating the
-fields, and octal quoting of special characters.
-
-On writing this, the program will be able to read back a filehandle
-for that path as exported to the given client.  The filehandle's length
-will be at most the number of bytes given.
-
-The filehandle will be represented in hex with a leading '\ex'.
-.PP
-The directory
-.B /proc/net/rpc
-in the
-.B procfs
-filesystem contains a number of files and directories.
-The files contain statistics that can be display using the
-.I nfsstat
-program.
-The directories contain information about various caches that the NFS
-server maintains to keep track of access permissions that different
-clients have for different filesystems.
-The caches are:
-
-.TP
-.B auth.domain
-This cache maps the name of a client (or domain) to an internal data
-structure.  The only access that is possible is to flush the cache.
-
-.TP
-.B auth.unix.ip
-This cache contains a mapping from IP address to the name of the
-authentication domain that the ipaddress should be treated as part of.
-
-.TP
-.B nfsd.export
-This cache contains a mapping from directory and domain to export
-options.
-
-.TP
-.B nfsd.fh
-This cache contains a mapping from domain and a filesystem identifier
-to a directory.   The filesystem identifier is stored in the
-filehandles and consists of a number indicating the type of identifier
-and a number of hex bytes indicating the content of the identifier.
-
-.PP
-Each directory representing a cache can hold from 1 to 3 files.  They
-are:
-.TP
-.B flush
-When a number of seconds since epoch (1 Jan 1970) is written to this
-file, all entries in the cache that were last updated before that file
-become invalidated and will be flushed out.  Writing 1 will flush
-everything.  This is the only file that will always be present.
-
-.TP
-.B content
-This file, if present, contains a textual representation of ever entry
-in the cache, one per line.  If an entry is still in the cache
-(because it is actively being used) but has expired or is otherwise
-invalid, it will be presented as a comment (with a leading hash
-character).
-
-.TP
-.B channel
-This file, if present, acts a channel for request from the kernel-based
-nfs server to be passed to a user-space program for handling.
-
-When the kernel needs some information which isn't in the cache, it
-makes a line appear in the
-.B channel
-file giving the key for the information.  A user-space program should
-read this, find the answer, and write a line containing the key, an
-expiry time, and the content.
-For example the kernel might make
-.ti +5
-nfsd 127.0.0.1
-.br
-appear in the
-.B auth.unix.ip/content
-file.  The user-space program might then write
-.ti +5
-nfsd 127.0.0.1 1057206953 localhost
-.br
-to indicate that 127.0.0.1 should map to localhost, at least for now.
-
-If the program uses select(2) or poll(2) to discover if it can read
-from the
-.B channel
-then it will never see and end-of-file but when all requests have been
-answered, it will block until another request appears.
-
-.PP
-In the
-.B /proc
-filesystem there are 4 files that can be used to enabled extra tracing
-of nfsd and related code.  They are:
-.in +5
-.B /proc/sys/sunrpc/nfs_debug
-.br
-.B /proc/sys/sunrpc/nfsd_debug
-.br
-.B /proc/sys/sunrpc/nlm_debug
-.br
-.B /proc/sys/sunrpc/rpc_debug
-.br
-.in -5
-They control tracing for the NFS client, the NFS server, the Network
-Lock Manager (lockd) and the underlying RPC layer respectively.
-Decimal numbers can be read from or written to these files.  Each
-number represents a bit-pattern where bits that are set cause certain
-classes of tracing to be enabled.  Consult the kernel header files to
-find out what number correspond to what tracing.
-
-.SH SEE ALSO
-.BR rpc.nfsd (8),
-.BR exports (5),
-.BR nfsstat (8),
-.BR mountd (8)
-.BR exportfs (8).
-
-.SH AUTHOR
-NeilBrown
 
=== removed directory '.pc/02-524255-manpages.patch/utils/nfsd'
=== removed 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	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-.\"
-.\" nfsd(8)
-.\"
-.\" Copyright (C) 1999 Olaf Kirch <[e-mail]>
-.TH rpc.nfsd 8 "7 Aug 2006"
-.SH NAME
-rpc.nfsd \- NFS server process
-.SH SYNOPSIS
-.BI "/usr/sbin/rpc.nfsd [" options "]" " "nproc
-.SH DESCRIPTION
-The
-.B rpc.nfsd
-program implements the user level part of the NFS service. The
-main functionality is handled by the
-.B nfsd
-kernel module. The user space program merely specifies what sort of sockets
-the kernel service should listen on, what NFS versions it should support, and
-how many kernel threads it should use.
-.P
-The
-.B rpc.mountd
-server provides an ancillary service needed to satisfy mount requests
-by NFS clients.
-.SH OPTIONS
-.TP
-.B \-d " or " \-\-debug
-enable logging of debugging messages
-.TP
-.B \-H " or " \-\-host  hostname
-specify a particular hostname (or address) that NFS requests will
-be accepted on. By default,
-.B rpc.nfsd
-will accept NFS requests on all known network addresses.
-Note that
-.B lockd
-(which performs file locking services for NFS) may still accept
-request on all known network addresses.  This may change in future
-releases of the Linux Kernel.
-.TP
-.B \-p " or " \-\-port  port
-specify a different port to listen on for NFS requests. By default,
-.B rpc.nfsd
-will listen on port 2049.
-.TP
-.B \-N " or " \-\-no-nfs-version vers
-This option can be used to request that 
-.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.
-.TP
-.B \-s " or " \-\-syslog
-By default,
-.B rpc.nfsd
-logs error messages (and debug messages, if enabled) to stderr. This option makes 
-.B rpc.nfsd
-log these messages to syslog instead. Note that errors encountered during
-option processing will still be logged to stderr regardless of this option.
-.TP
-.B \-T " or " \-\-no-tcp
-Disable 
-.B rpc.nfsd 
-from accepting TCP connections from clients.
-.TP
-.B \-U " or " \-\-no-udp
-Disable
-.B rpc.nfsd
-from accepting UDP connections from clients.
-.TP
-.I nproc
-specify the number of NFS server threads. By default, just one
-thread is started. However, for optimum performance several threads
-should be used. The actual figure depends on the number of and the work
-load created by the NFS clients, but a useful starting point is
-8 threads. Effects of modifying that number can be checked using
-the
-.BR nfsstat (8)
-program.
-.P
-Note that if the NFS server is already running, then the options for
-specifying host, port, and protocol will be ignored.  The number of
-processes given will be the only option considered, and the number of
-active
-.B nfsd
-processes will be increased or decreased to match this number.
-In particular
-.B rpc.nfsd 0
-will stop all threads and thus close any open connections.
-
-.SH NOTES
-If the program is built with TI-RPC support, it will enable any protocol and
-address family combinations that are marked visible in the
-.B netconfig
-database.
-
-.SH SEE ALSO
-.BR rpc.mountd (8),
-.BR exports (5),
-.BR exportfs (8),
-.BR rpc.rquotad (8),
-.BR nfsstat (8),
-.BR netconfig(5).
-.SH AUTHOR
-Olaf Kirch, Bill Hawes, H. J. Lu, G. Allan Morris III,
-and a host of others.
 
=== removed directory '.pc/03-handle-mtab-symlink.patch'
=== removed directory '.pc/03-handle-mtab-symlink.patch/utils'
=== removed directory '.pc/03-handle-mtab-symlink.patch/utils/mount'
=== removed file '.pc/03-handle-mtab-symlink.patch/utils/mount/fstab.c'
--- .pc/03-handle-mtab-symlink.patch/utils/mount/fstab.c	2011-10-02 18:29:53 +0000
+++ .pc/03-handle-mtab-symlink.patch/utils/mount/fstab.c	1970-01-01 00:00:00 +0000
@@ -1,649 +0,0 @@
-/* 1999-02-22 Arkadiusz Miskiewicz <[e-mail]>
- * - added Native Language Support
- * Sun Mar 21 1999 - Arnaldo Carvalho de Melo <[e-mail]>
- * - fixed strerr(errno) in gettext calls
- *
- * 2006-06-08 Amit Gud <[e-mail]>
- * - Moved code to nfs-utils/support/nfs from util-linux/mount.
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <mntent.h>
-
-#include "fstab.h"
-#include "xcommon.h"
-#include "nfs_mntent.h"
-#include "nfs_paths.h"
-#include "nls.h"
-
-#define LOCK_TIMEOUT	10
-#define streq(s, t)	(strcmp ((s), (t)) == 0)
-#define PROC_MOUNTS		"/proc/mounts"
-
-extern char *progname;
-extern int verbose;
-
-/* Information about mtab. ------------------------------------*/
-static int have_mtab_info = 0;
-static int var_mtab_does_not_exist = 0;
-static int var_mtab_is_a_symlink = 0;
-
-static void
-get_mtab_info(void) {
-	struct stat mtab_stat;
-
-	if (!have_mtab_info) {
-		if (lstat(MOUNTED, &mtab_stat))
-			var_mtab_does_not_exist = 1;
-		else if (S_ISLNK(mtab_stat.st_mode))
-			var_mtab_is_a_symlink = 1;
-		have_mtab_info = 1;
-	}
-}
-
-void
-reset_mtab_info(void) {
-        have_mtab_info = 0;
-}
-
-int
-mtab_does_not_exist(void) {
-	get_mtab_info();
-	return var_mtab_does_not_exist;
-}
-
-static int
-mtab_is_a_symlink(void) {
-        get_mtab_info();
-        return var_mtab_is_a_symlink;
-}
-
-int
-mtab_is_writable() {
-	int fd;
-
-	/* Should we write to /etc/mtab upon an update?
-	   Probably not if it is a symlink to /proc/mounts, since that
-	   would create a file /proc/mounts in case the proc filesystem
-	   is not mounted. */
-	if (mtab_is_a_symlink())
-		return 0;
-
-	fd = open(MOUNTED, O_RDWR | O_CREAT, 0644);
-	if (fd >= 0) {
-		close(fd);
-		return 1;
-	} else
-		return 0;
-}
-
-/* Contents of mtab and fstab ---------------------------------*/
-
-struct mntentchn mounttable;
-static int got_mtab = 0;
-struct mntentchn procmounts;
-static int got_procmounts = 0;
-struct mntentchn fstab;
-static int got_fstab = 0;
-
-static void read_mounttable(void);
-static void read_procmounts(void);
-static void read_fstab(void);
-
-static struct mntentchn *
-mtab_head(void)
-{
-	if (!got_mtab)
-		read_mounttable();
-	return &mounttable;
-}
-
-static struct mntentchn *
-procmounts_head(void)
-{
-	if (!got_procmounts)
-		read_procmounts();
-	return &procmounts;
-}
-
-static struct mntentchn *
-fstab_head(void)
-{
-	if (!got_fstab)
-		read_fstab();
-	return &fstab;
-}
-
-#if 0
-static void
-my_free(const void *s) {
-	if (s)
-		free((void *) s);
-}
-
-static void
-discard_mntentchn(struct mntentchn *mc0) {
-	struct mntentchn *mc, *mc1;
-
-	for (mc = mc0->nxt; mc && mc != mc0; mc = mc1) {
-		mc1 = mc->nxt;
-		my_free(mc->m.mnt_fsname);
-		my_free(mc->m.mnt_dir);
-		my_free(mc->m.mnt_type);
-		my_free(mc->m.mnt_opts);
-		free(mc);
-	}
-}
-#endif
-
-static void
-read_mntentchn(mntFILE *mfp, const char *fnam, struct mntentchn *mc0) {
-	struct mntentchn *mc = mc0;
-	struct mntent *mnt;
-
-	while ((mnt = nfs_getmntent(mfp)) != NULL) {
-		if (!streq(mnt->mnt_type, MNTTYPE_IGNORE)) {
-			mc->nxt = (struct mntentchn *) xmalloc(sizeof(*mc));
-			mc->nxt->prev = mc;
-			mc = mc->nxt;
-			mc->m = *mnt;
-			mc->nxt = mc0;
-		}
-	}
-	mc0->prev = mc;
-	if (ferror(mfp->mntent_fp)) {
-		int errsv = errno;
-		nfs_error(_("warning: error reading %s: %s"),
-		      fnam, strerror (errsv));
-		mc0->nxt = mc0->prev = NULL;
-	}
-	nfs_endmntent(mfp);
-}
-
-/*
- * Read /etc/mtab.  If that fails, try /proc/mounts.
- * This produces a linked list. The list head mounttable is a dummy.
- * Return 0 on success.
- */
-static void
-read_mounttable() {
-        mntFILE *mfp;
-        const char *fnam;
-        struct mntentchn *mc = &mounttable;
-
-        got_mtab = 1;
-        mc->nxt = mc->prev = NULL;
-
-        fnam = MOUNTED;
-        mfp = nfs_setmntent (fnam, "r");
-        if (mfp == NULL || mfp->mntent_fp == NULL) {
-                int errsv = errno;
-                fnam = PROC_MOUNTS;
-                mfp = nfs_setmntent (fnam, "r");
-                if (mfp == NULL || mfp->mntent_fp == NULL) {
-                        nfs_error(_("warning: can't open %s: %s"),
-                              MOUNTED, strerror (errsv));
-                        return;
-                }
-                if (verbose)
-                        printf(_("%s: could not open %s; using %s instead\n"),
-				progname, MOUNTED, PROC_MOUNTS);
-        }
-        read_mntentchn(mfp, fnam, mc);
-}
-
-/*
- * Read /proc/mounts.
- * This produces a linked list. The list head procmounts is a dummy.
- * Return 0 on success.
- */
-static void
-read_procmounts() {
-        mntFILE *mfp;
-        const char *fnam;
-        struct mntentchn *mc = &procmounts;
-
-        got_procmounts = 1;
-        mc->nxt = mc->prev = NULL;
-
-        fnam = PROC_MOUNTS;
-        mfp = nfs_setmntent(fnam, "r");
-        if (mfp == NULL || mfp->mntent_fp == NULL) {
-                nfs_error(_("warning: can't open %s: %s"),
-                          PROC_MOUNTS, strerror (errno));
-                return;
-        }
-        read_mntentchn(mfp, fnam, mc);
-}
-
-static void
-read_fstab()
-{
-	mntFILE *mfp = NULL;
-	const char *fnam;
-	struct mntentchn *mc = &fstab;
-
-	got_fstab = 1;
-	mc->nxt = mc->prev = NULL;
-
-	fnam = _PATH_FSTAB;
-	mfp = nfs_setmntent (fnam, "r");
-	if (mfp == NULL || mfp->mntent_fp == NULL) {
-		int errsv = errno;
-		nfs_error(_("warning: can't open %s: %s"),
-			  _PATH_FSTAB, strerror (errsv));
-		return;
-	}
-	read_mntentchn(mfp, fnam, mc);
-}
-
-/*
- * Given the directory name NAME, and the place MCPREV we found it last time,
- * try to find more occurrences.
- */ 
-struct mntentchn *
-getmntdirbackward (const char *name, struct mntentchn *mcprev) {
-	struct mntentchn *mc, *mc0;
-
-	mc0 = mtab_head();
-	if (!mcprev)
-		mcprev = mc0;
-	for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
-		if (streq(mc->m.mnt_dir, name))
-			return mc;
-	return NULL;
-}
-
-/*
- * Given the directory name NAME, and the place MCPREV we found it last time,
- * try to find more occurrences.
- */
-struct mntentchn *
-getprocmntdirbackward (const char *name, struct mntentchn *mcprev) {
-	struct mntentchn *mc, *mc0;
-
-	mc0 = procmounts_head();
-	if (!mcprev)
-		mcprev = mc0;
-	for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
-		if (streq(mc->m.mnt_dir, name))
-			return mc;
-	return NULL;
-}
-
-/*
- * Given the device name NAME, and the place MCPREV we found it last time,
- * try to find more occurrences.
- */ 
-struct mntentchn *
-getmntdevbackward (const char *name, struct mntentchn *mcprev) {
-	struct mntentchn *mc, *mc0;
-
-	mc0 = mtab_head();
-	if (!mcprev)
-		mcprev = mc0;
-	for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
-		if (streq(mc->m.mnt_fsname, name))
-			return mc;
-	return NULL;
-}
-
-/* Find the dir FILE in fstab.  */
-struct mntentchn *
-getfsfile (const char *file)
-{
-	struct mntentchn *mc, *mc0;
-
-	mc0 = fstab_head();
-	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
-		if (streq(mc->m.mnt_dir, file))
-			return mc;
-	return NULL;
-}
-
-/* Find the device SPEC in fstab.  */
-struct mntentchn *
-getfsspec (const char *spec)
-{
-	struct mntentchn *mc, *mc0;
-
-	mc0 = fstab_head();
-	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt)
-		if (streq(mc->m.mnt_fsname, spec))
-			return mc;
-	return NULL;
-}
-
-/* Updating mtab ----------------------------------------------*/
-
-/* Flag for already existing lock file. */
-static int we_created_lockfile = 0;
-static int lockfile_fd = -1;
-
-/* Flag to indicate that signals have been set up. */
-static int signals_have_been_setup = 0;
-
-/* Ensure that the lock is released if we are interrupted.  */
-extern char *strsignal(int sig);	/* not always in <string.h> */
-
-static void
-handler (int sig) {
-     die(EX_USER, "%s", strsignal(sig));
-}
-
-static void
-setlkw_timeout (__attribute__((unused)) int sig) {
-     /* nothing, fcntl will fail anyway */
-}
-
-/* Remove lock file.  */
-void
-unlock_mtab (void) {
-	if (we_created_lockfile) {
-		close(lockfile_fd);
-		lockfile_fd = -1;
-		unlink (MOUNTED_LOCK);
-		we_created_lockfile = 0;
-	}
-}
-
-/* Create the lock file.
-   The lock file will be removed if we catch a signal or when we exit. */
-/* The old code here used flock on a lock file /etc/mtab~ and deleted
-   this lock file afterwards. However, as rgooch remarks, that has a
-   race: a second mount may be waiting on the lock and proceed as
-   soon as the lock file is deleted by the first mount, and immediately
-   afterwards a third mount comes, creates a new /etc/mtab~, applies
-   flock to that, and also proceeds, so that the second and third mount
-   now both are scribbling in /etc/mtab.
-   The new code uses a link() instead of a creat(), where we proceed
-   only if it was us that created the lock, and hence we always have
-   to delete the lock afterwards. Now the use of flock() is in principle
-   superfluous, but avoids an arbitrary sleep(). */
-
-/* Where does the link point to? Obvious choices are mtab and mtab~~.
-   HJLu points out that the latter leads to races. Right now we use
-   mtab~.<pid> instead. Use 20 as upper bound for the length of %d. */
-#define MOUNTLOCK_LINKTARGET		MOUNTED_LOCK "%d"
-#define MOUNTLOCK_LINKTARGET_LTH	(sizeof(MOUNTED_LOCK)+20)
-
-void
-lock_mtab (void) {
-	int tries = 100000, i;
-	char linktargetfile[MOUNTLOCK_LINKTARGET_LTH];
-
-	at_die = unlock_mtab;
-
-	if (!signals_have_been_setup) {
-		int sig = 0;
-		struct sigaction sa;
-
-		sa.sa_flags = 0;
-		sigfillset (&sa.sa_mask);
-  
-		while (sigismember (&sa.sa_mask, ++sig) != -1) {
-			switch(sig) {
-			case SIGCHLD:
-			case SIGKILL:
-			case SIGCONT:
-			case SIGSTOP:
-				/* The cannot be caught, or should not,
-				 * so don't even try.
-				 */
-				continue;
-			case SIGALRM:
-				sa.sa_handler = setlkw_timeout;
-				break;
-			case SIGHUP:
-			case SIGINT:
-			case SIGQUIT:
-			case SIGWINCH:
-			case SIGTSTP:
-			case SIGTTIN:
-			case SIGTTOU:
-			case SIGPIPE:
-			case SIGXFSZ:
-			case SIGXCPU:
-				/* non-priv user can cause these to be
-				 * generated, so ignore them.
-				 */
-				sa.sa_handler = SIG_IGN;
-				break;
-			default:
-				/* The rest should not be possible, so just
-				 * print a message and unlock mtab.
-				 */
-				sa.sa_handler = handler;
-			}
-			sigaction (sig, &sa, (struct sigaction *) 0);
-		}
-		signals_have_been_setup = 1;
-	}
-
-	sprintf(linktargetfile, MOUNTLOCK_LINKTARGET, getpid ());
-
-	i = open (linktargetfile, O_WRONLY|O_CREAT, 0);
-	if (i < 0) {
-		int errsv = errno;
-		/* linktargetfile does not exist (as a file)
-		   and we cannot create it. Read-only filesystem?
-		   Too many files open in the system?
-		   Filesystem full? */
-		die (EX_FILEIO, _("can't create lock file %s: %s "
-						  "(use -n flag to override)"),
-			 linktargetfile, strerror (errsv));
-	}
-	close(i);
-	
-	/* Repeat until it was us who made the link */
-	while (!we_created_lockfile) {
-		struct flock flock;
-		int j;
-
-		j = link(linktargetfile, MOUNTED_LOCK);
-
-		{
-			int errsv = errno;
-
-			if (j == 0)
-				we_created_lockfile = 1;
-
-			if (j < 0 && errsv != EEXIST) {
-				(void) unlink(linktargetfile);
-				die (EX_FILEIO, _("can't link lock file %s: %s "
-				     "(use -n flag to override)"),
-				     MOUNTED_LOCK, strerror (errsv));
-			}
-		}
-
-		lockfile_fd = open (MOUNTED_LOCK, O_WRONLY);
-
-		if (lockfile_fd < 0) {
-			int errsv = errno;
-			/* Strange... Maybe the file was just deleted? */
-			if (errno == ENOENT && tries-- > 0) {
-				if (tries % 200 == 0)
-					usleep(30);
-				continue;
-			}
-			(void) unlink(linktargetfile);
-			die (EX_FILEIO, _("can't open lock file %s: %s "
-			     "(use -n flag to override)"),
-			     MOUNTED_LOCK, strerror (errsv));
-		}
-
-		flock.l_type = F_WRLCK;
-		flock.l_whence = SEEK_SET;
-		flock.l_start = 0;
-		flock.l_len = 0;
-
-		if (j == 0) {
-			/* We made the link. Now claim the lock. */
-			if (fcntl (lockfile_fd, F_SETLK, &flock) == -1) {
-				if (verbose) {
-				    int errsv = errno;
-				    nfs_error(_("%s: Can't lock lock file "
-						"%s: %s"), progname,
-					   	MOUNTED_LOCK,
-						strerror (errsv));
-				}
-				/* proceed anyway */
-			}
-			(void) unlink(linktargetfile);
-		} else {
-			static int retries = 0;
-
-			/* Someone else made the link. Wait. */
-			alarm(LOCK_TIMEOUT);
-			if (fcntl (lockfile_fd, F_SETLKW, &flock) == -1) {
-				int errsv = errno;
-				(void) unlink(linktargetfile);
-				die (EX_FILEIO, _("can't lock lock file %s: %s"),
-				     MOUNTED_LOCK, (errno == EINTR) ?
-				     _("timed out") : strerror (errsv));
-			}
-			alarm(0);
-			/* Limit the number of iterations - maybe there
-			   still is some old /etc/mtab~ */
-			++retries;
-			if (retries % 200 == 0)
-			   usleep(30);
-			if (retries > 100000) {
-				(void) unlink(linktargetfile);
-				close(lockfile_fd);
-				die (EX_FILEIO, _("Cannot create link %s\n"
-						  "Perhaps there is a stale lock file?\n"),
-					 MOUNTED_LOCK);
- 			}
-			close(lockfile_fd);
-		}
-	}
-}
-
-/*
- * Update the mtab.
- *  Used by umount with null INSTEAD: remove the last DIR entry.
- *  Used by mount upon a remount: update option part,
- *   and complain if a wrong device or type was given.
- *   [Note that often a remount will be a rw remount of /
- *    where there was no entry before, and we'll have to believe
- *    the values given in INSTEAD.]
- */
-
-void
-update_mtab (const char *dir, struct mntent *instead)
-{
-	mntFILE *mfp, *mftmp;
-	const char *fnam = MOUNTED;
-	struct mntentchn mtabhead;	/* dummy */
-	struct mntentchn *mc, *mc0, *absent = NULL;
-
-	if (mtab_does_not_exist() || !mtab_is_writable())
-		return;
-
-	lock_mtab();
-
-	/* having locked mtab, read it again */
-	mc0 = mc = &mtabhead;
-	mc->nxt = mc->prev = NULL;
-
-	mfp = nfs_setmntent(fnam, "r");
-	if (mfp == NULL || mfp->mntent_fp == NULL) {
-		int errsv = errno;
-		nfs_error (_("cannot open %s (%s) - mtab not updated"),
-		       fnam, strerror (errsv));
-		goto leave;
-	}
-
-	read_mntentchn(mfp, fnam, mc);
-
-	/* find last occurrence of dir */
-	for (mc = mc0->prev; mc && mc != mc0; mc = mc->prev)
-		if (streq(mc->m.mnt_dir, dir))
-			break;
-	if (mc && mc != mc0) {
-		if (instead == NULL) {
-			/* An umount - remove entry */
-			if (mc && mc != mc0) {
-				mc->prev->nxt = mc->nxt;
-				mc->nxt->prev = mc->prev;
-				free(mc);
-			}
-		} else {
-			/* A remount */
-			mc->m.mnt_opts = instead->mnt_opts;
-		}
-	} else if (instead) {
-		/* not found, add a new entry */
-		absent = xmalloc(sizeof(*absent));
-		absent->m = *instead;
-		absent->nxt = mc0;
-		absent->prev = mc0->prev;
-		mc0->prev = absent;
-		if (mc0->nxt == NULL)
-			mc0->nxt = absent;
-	}
-
-	/* write chain to mtemp */
-	mftmp = nfs_setmntent (MOUNTED_TEMP, "w");
-	if (mftmp == NULL || mftmp->mntent_fp == NULL) {
-		int errsv = errno;
-		nfs_error (_("cannot open %s (%s) - mtab not updated"),
-		       MOUNTED_TEMP, strerror (errsv));
-		goto leave;
-	}
-
-	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) {
-		if (nfs_addmntent(mftmp, &(mc->m)) == 1) {
-			int errsv = errno;
-			die (EX_FILEIO, _("error writing %s: %s"),
-			     MOUNTED_TEMP, strerror (errsv));
-		}
-	}
-
-#if 0
-	/* the chain might have strings copied from 'instead',
-	 * so we cannot safely free it.
-	 * And there is no need anyway because we are going to exit
-	 * shortly.  So just don't call discard_mntentchn....
-	 */
-	discard_mntentchn(mc0);
-#endif
-	if (fchmod (fileno (mftmp->mntent_fp),
-		    S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) < 0) {
-		int errsv = errno;
-		nfs_error(_("%s: error changing mode of %s: %s"),
-				progname, MOUNTED_TEMP, strerror (errsv));
-	}
-	nfs_endmntent (mftmp);
-
-	{ /*
-	   * If mount is setuid and some non-root user mounts sth,
-	   * then mtab.tmp might get the group of this user. Copy uid/gid
-	   * from the present mtab before renaming.
-	   */
-	    struct stat sbuf;
-	    if (stat (MOUNTED, &sbuf) == 0) {
-			if (chown (MOUNTED_TEMP, sbuf.st_uid, sbuf.st_gid) < 0) {
-				nfs_error(_("%s: error changing owner of %s: %s"),
-					progname, MOUNTED_TEMP, strerror (errno));
-			}
-		}
-	}
-
-	/* rename mtemp to mtab */
-	if (rename (MOUNTED_TEMP, MOUNTED) < 0) {
-		int errsv = errno;
-		nfs_error(_("%s: can't rename %s to %s: %s\n"),
-				progname, MOUNTED_TEMP, MOUNTED,
-				strerror(errsv));
-	}
-
- leave:
-	unlock_mtab();
-}
 
=== removed file '.pc/03-handle-mtab-symlink.patch/utils/mount/fstab.h'
--- .pc/03-handle-mtab-symlink.patch/utils/mount/fstab.h	2011-10-02 18:29:53 +0000
+++ .pc/03-handle-mtab-symlink.patch/utils/mount/fstab.h	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-#ifndef _NFS_UTILS_MOUNT_FSTAB_H
-#define _NFS_UTILS_MOUNT_FSTAB_H
-
-#include "nfs_mntent.h"
-
-#ifndef _PATH_FSTAB
-#define _PATH_FSTAB "/etc/fstab"
-#endif
-
-int mtab_is_writable(void);
-int mtab_does_not_exist(void);
-void reset_mtab_info(void);
-
-struct mntentchn {
-	struct mntentchn *nxt, *prev;
-	struct mntent m;
-};
-
-struct mntentchn *getmntoptfile (const char *file);
-struct mntentchn *getmntdirbackward (const char *dir, struct mntentchn *mc);
-struct mntentchn *getprocmntdirbackward (const char *name, struct mntentchn *mc);
-struct mntentchn *getmntdevbackward (const char *dev, struct mntentchn *mc);
-
-struct mntentchn *getfsfile (const char *file);
-struct mntentchn *getfsspec (const char *spec);
-
-void lock_mtab (void);
-void unlock_mtab (void);
-void update_mtab (const char *special, struct mntent *with);
-
-#endif	/* _NFS_UTILS_MOUNT_FSTAB_H */
 
=== removed file '.pc/03-handle-mtab-symlink.patch/utils/mount/mount.c'
--- .pc/03-handle-mtab-symlink.patch/utils/mount/mount.c	2011-07-09 16:28:32 +0000
+++ .pc/03-handle-mtab-symlink.patch/utils/mount/mount.c	1970-01-01 00:00:00 +0000
@@ -1,550 +0,0 @@
-/*
- * mount.c -- Linux NFS mount
- *
- * Copyright (C) 2006 Amit Gud <[e-mail]>
- *
- * - Basic code and wrapper around mount and umount code of NFS.
- *   Based on util-linux/mount/mount.c.
- *
- * This program 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, or (at your option)
- * any later version.
- *
- * This program 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.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/mount.h>
-#include <getopt.h>
-#include <mntent.h>
-#include <pwd.h>
-
-#include "fstab.h"
-#include "xcommon.h"
-#include "nls.h"
-#include "mount_constants.h"
-#include "mount_config.h"
-#include "nfs_paths.h"
-#include "nfs_mntent.h"
-
-#include "nfs_mount.h"
-#include "nfs4_mount.h"
-#include "mount.h"
-#include "error.h"
-#include "stropts.h"
-#include "utils.h"
-
-char *progname;
-int nfs_mount_data_version;
-int nomtab;
-int verbose;
-int sloppy;
-int string;
-
-#define FOREGROUND	(0)
-#define BACKGROUND	(1)
-
-static struct option longopts[] = {
-  { "fake", 0, 0, 'f' },
-  { "help", 0, 0, 'h' },
-  { "no-mtab", 0, 0, 'n' },
-  { "read-only", 0, 0, 'r' },
-  { "ro", 0, 0, 'r' },
-  { "verbose", 0, 0, 'v' },
-  { "version", 0, 0, 'V' },
-  { "read-write", 0, 0, 'w' },
-  { "rw", 0, 0, 'w' },
-  { "options", 1, 0, 'o' },
-  { NULL, 0, 0, 0 }
-};
-
-/*
- * Map from -o and fstab option strings to the flag argument to mount(2).
- */
-struct opt_map {
-	const char *opt;	/* option name */
-	int skip;		/* skip in mtab option string */
-	int inv;		/* true if flag value should be inverted */
-	int mask;		/* flag mask value */
-};
-
-static const struct opt_map opt_map[] = {
-  { "defaults", 0, 0, 0         },      /* default options */
-  { "ro",       1, 0, MS_RDONLY },      /* read-only */
-  { "rw",       1, 1, MS_RDONLY },      /* read-write */
-  { "exec",     0, 1, MS_NOEXEC },      /* permit execution of binaries */
-  { "noexec",   0, 0, MS_NOEXEC },      /* don't execute binaries */
-  { "suid",     0, 1, MS_NOSUID },      /* honor suid executables */
-  { "nosuid",   0, 0, MS_NOSUID },      /* don't honor suid executables */
-  { "dev",      0, 1, MS_NODEV  },      /* interpret device files  */
-  { "nodev",    0, 0, MS_NODEV  },      /* don't interpret devices */
-  { "sync",     0, 0, MS_SYNCHRONOUS},  /* synchronous I/O */
-  { "async",    0, 1, MS_SYNCHRONOUS},  /* asynchronous I/O */
-  { "dirsync",  0, 0, MS_DIRSYNC},      /* synchronous directory modifications */
-  { "remount",  0, 0, MS_REMOUNT},      /* Alter flags of mounted FS */
-  { "bind",     0, 0, MS_BIND   },      /* Remount part of tree elsewhere */
-  { "rbind",    0, 0, MS_BIND|MS_REC }, /* Idem, plus mounted subtrees */
-  { "auto",     0, 0, MS_DUMMY },       /* Can be mounted using -a */
-  { "noauto",   0, 0, MS_DUMMY },       /* Can  only be mounted explicitly */
-  { "users",    1, 0, MS_USERS },	/* Allow ordinary user to mount */
-  { "nousers",  0, 1, MS_DUMMY  },      /* Forbid ordinary user to mount */
-  { "user",     1, 0, MS_USER  },	/* Allow ordinary user to mount */
-  { "nouser",   0, 1, MS_DUMMY   },     /* Forbid ordinary user to mount */
-  { "owner",    0, 0, MS_DUMMY  },      /* Let the owner of the device mount */
-  { "noowner",  0, 0, MS_DUMMY  },      /* Device owner has no special privs */
-  { "group",    0, 0, MS_DUMMY  },      /* Let the group of the device mount */
-  { "nogroup",  0, 0, MS_DUMMY  },      /* Device group has no special privs */
-  { "_netdev",  0, 0, MS_DUMMY},        /* Device requires network */
-  { "comment",  0, 0, MS_DUMMY},        /* fstab comment only (kudzu,_netdev)*/
-
-  /* add new options here */
-#ifdef MS_NOSUB
-  { "sub",      0, 1, MS_NOSUB  },      /* allow submounts */
-  { "nosub",    0, 0, MS_NOSUB  },      /* don't allow submounts */
-#endif
-#ifdef MS_SILENT
-  { "quiet",    0, 0, MS_SILENT    },   /* be quiet  */
-  { "loud",     0, 1, MS_SILENT    },   /* print out messages. */
-#endif
-#ifdef MS_MANDLOCK
-  { "mand",     0, 0, MS_MANDLOCK },    /* Allow mandatory locks on this FS */
-  { "nomand",   0, 1, MS_MANDLOCK },    /* Forbid mandatory locks on this FS */
-#endif
-  { "loop",     1, 0, MS_DUMMY   },      /* use a loop device */
-#ifdef MS_NOATIME
-  { "atime",    0, 1, MS_NOATIME },     /* Update access time */
-  { "noatime",  0, 0, MS_NOATIME },     /* Do not update access time */
-#endif
-#ifdef MS_NODIRATIME
-  { "diratime", 0, 1, MS_NODIRATIME },  /* Update dir access times */
-  { "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */
-#endif
-#ifdef MS_RELATIME
-  { "relatime", 0, 0, MS_RELATIME },   /* Update access times relative to
-                      mtime/ctime */
-  { "norelatime", 0, 1, MS_RELATIME }, /* Update access time without regard
-                      to mtime/ctime */
-#endif
-  { "noquota", 0, 0, MS_DUMMY },        /* Don't enforce quota */
-  { "quota", 0, 0, MS_DUMMY },          /* Enforce user quota */
-  { "usrquota", 0, 0, MS_DUMMY },       /* Enforce user quota */
-  { "grpquota", 0, 0, MS_DUMMY },       /* Enforce group quota */
-  { NULL,	0, 0, 0		}
-};
-
-static void parse_opts(const char *options, int *flags, char **extra_opts);
-
-/*
- * Build a canonical mount option string for /etc/mtab.
- */
-static char *fix_opts_string(int flags, const char *extra_opts)
-{
-	const struct opt_map *om;
-	char *new_opts;
-
-	new_opts = xstrdup((flags & MS_RDONLY) ? "ro" : "rw");
-	if (flags & MS_USER) {
-		/* record who mounted this so they can unmount */
-		struct passwd *pw = getpwuid(getuid());
-		if(pw)
-			new_opts = xstrconcat3(new_opts, ",user=", pw->pw_name);
-	}
-	if (flags & MS_USERS)
-		new_opts = xstrconcat3(new_opts, ",users", "");
-
-	for (om = opt_map; om->opt != NULL; om++) {
-		if (om->skip)
-			continue;
-		if (om->inv || !om->mask || (flags & om->mask) != om->mask)
-			continue;
-		new_opts = xstrconcat3(new_opts, ",", om->opt);
-		flags &= ~om->mask;
-	}
-	if (extra_opts && *extra_opts) {
-		new_opts = xstrconcat3(new_opts, ",", extra_opts);
-	}
-	return new_opts;
-}
-
-static void
-init_mntent(struct mntent *mnt, char *fsname, char *dir, char *type,
-		int flags, char *opts)
-{
-	mnt->mnt_fsname	= fsname;
-	mnt->mnt_dir	= dir;
-	mnt->mnt_type	= type;
-	mnt->mnt_opts	= fix_opts_string(flags & ~MS_NOMTAB, opts);
-
-	/* these are always zero for NFS */
-	mnt->mnt_freq	= 0;
-	mnt->mnt_passno	= 0;
-}
-
-/* Create mtab with a root entry.  */
-static void
-create_mtab (void) {
-	struct mntentchn *fstab;
-	struct mntent mnt;
-	int flags;
-	mntFILE *mfp;
-
-	lock_mtab();
-
-	mfp = nfs_setmntent (MOUNTED, "a+");
-	if (mfp == NULL || mfp->mntent_fp == NULL) {
-		int errsv = errno;
-		die (EX_FILEIO, _("mount: can't open %s for writing: %s"),
-		     MOUNTED, strerror (errsv));
-	}
-
-	/* Find the root entry by looking it up in fstab */
-	if ((fstab = getfsfile ("/")) || (fstab = getfsfile ("root"))) {
-		char *extra_opts;
-		parse_opts (fstab->m.mnt_opts, &flags, &extra_opts);
-		init_mntent(&mnt, xstrdup(fstab->m.mnt_fsname), "/",
-				fstab->m.mnt_type, flags, extra_opts);
-		free(extra_opts);
-
-		if (nfs_addmntent (mfp, &mnt) == 1) {
-			int errsv = errno;
-			die (EX_FILEIO, _("mount: error writing %s: %s"),
-			     _PATH_MOUNTED, strerror (errsv));
-		}
-	}
-	if (fchmod (fileno (mfp->mntent_fp), 0644) < 0)
-		if (errno != EROFS) {
-			int errsv = errno;
-			die (EX_FILEIO,
-			     _("mount: error changing mode of %s: %s"),
-			     _PATH_MOUNTED, strerror (errsv));
-		}
-	nfs_endmntent (mfp);
-
-	unlock_mtab();
-
-	reset_mtab_info();
-}
-
-static int add_mtab(char *spec, char *mount_point, char *fstype,
-			int flags, char *opts)
-{
-	struct mntent ment;
-	int result = EX_SUCCESS;
-
-	init_mntent(&ment, spec, mount_point, fstype, flags, opts);
-
-	if (!nomtab && mtab_does_not_exist()) {
-		if (verbose > 1)
-			printf(_("mount: no %s found - creating it..\n"),
-			       MOUNTED);
-		create_mtab ();
-	}
-
-	if (!nomtab && mtab_is_writable()) {
-		if (flags & MS_REMOUNT)
-			update_mtab(ment.mnt_dir, &ment);
-		else {
-			mntFILE *mtab;
-			
-			lock_mtab();
-			mtab = nfs_setmntent(MOUNTED, "a+");
-			if (mtab == NULL || mtab->mntent_fp == NULL) {
-				nfs_error(_("Can't open mtab: %s"),
-						strerror(errno));
-				result = EX_FILEIO;
-			} else {
-				if (nfs_addmntent(mtab, &ment) == 1) {
-					nfs_error(_("Can't write mount entry to mtab: %s"),
-							strerror(errno));
-					result = EX_FILEIO;
-				}
-			}
-			nfs_endmntent(mtab);
-			unlock_mtab();
-		}
-	}
-
-	free(ment.mnt_opts);
-
-	return result;
-}
-
-static void parse_opt(const char *opt, int *mask, char *extra_opts, size_t len)
-{
-	const struct opt_map *om;
-
-	for (om = opt_map; om->opt != NULL; om++) {
-		if (!strcmp (opt, om->opt)) {
-			if (om->inv)
-				*mask &= ~om->mask;
-			else
-				*mask |= om->mask;
-			return;
-		}
-	}
-
-	len -= strlen(extra_opts);
-
-	if (*extra_opts && --len > 0)
-		strcat(extra_opts, ",");
-
-	if ((len -= strlen(opt)) > 0)
-		strcat(extra_opts, opt);
-}
-
-/*
- * Convert the provided mount command-line options into the 4th &
- * 5th arguments to mount(2).  Output parameter "@flags" gets the
- * standard options (indicated by MS_ bits), and output parameter
- * "@extra_opts" gets all the filesystem-specific options.
- */
-static void parse_opts(const char *options, int *flags, char **extra_opts)
-{
-	if (options != NULL) {
-		char *opts = xstrdup(options);
-		char *opt, *p;
-		size_t len = strlen(opts) + 1;	/* include room for a null */
-		int open_quote = 0;
-
-		*extra_opts = xmalloc(len);
-		**extra_opts = '\0';
-
-		for (p = opts, opt = NULL; p && *p; p++) {
-			if (!opt)
-				opt = p;	/* begin of the option item */
-			if (*p == '"')
-				open_quote ^= 1; /* reverse the status */
-			if (open_quote)
-				continue;	/* still in a quoted block */
-			if (*p == ',')
-				*p = '\0';	/* terminate the option item */
-
-			/* end of option item or last item */
-			if (*p == '\0' || *(p + 1) == '\0') {
-				parse_opt(opt, flags, *extra_opts, len);
-				opt = NULL;
-			}
-		}
-		free(opts);
-	}
-}
-
-static int try_mount(char *spec, char *mount_point, int flags,
-			char *fs_type, char **extra_opts, char *mount_opts,
-			int fake, int bg)
-{
-	int ret;
-
-	if (string)
-		ret = nfsmount_string(spec, mount_point, fs_type, flags,
-					extra_opts, fake, bg);
-	else {
-		if (strcmp(fs_type, "nfs4") == 0)
-			ret = nfs4mount(spec, mount_point, flags,
-					extra_opts, fake, bg);
-		else
-			ret = nfsmount(spec, mount_point, flags,
-					extra_opts, fake, bg);
-	}
-
-	if (ret)
-		return ret;
-
-	if (!fake)
-		print_one(spec, mount_point, fs_type, mount_opts);
-
-	return add_mtab(spec, mount_point, fs_type, flags, *extra_opts);
-}
-
-int main(int argc, char *argv[])
-{
-	int c, flags = 0, mnt_err = 1, fake = 0;
-	char *spec = NULL, *mount_point = NULL, *fs_type = "nfs";
-	char *extra_opts = NULL, *mount_opts = NULL;
-	uid_t uid = getuid();
-
-	progname = basename(argv[0]);
-
-	nfs_mount_data_version = discover_nfs_mount_data_version(&string);
-
-	if(!strncmp(progname, "umount", strlen("umount")))
-		exit(nfsumount(argc, argv));
-
-	if ((argc < 3)) {
-		mount_usage();
-		exit(EX_USAGE);
-	}
-
-	mount_config_init(progname);
-
-	while ((c = getopt_long(argc, argv, "rvVwfno:hs",
-				longopts, NULL)) != -1) {
-		switch (c) {
-		case 'r':
-			flags |= MS_RDONLY;
-			break;
-		case 'v':
-			++verbose;
-			break;
-		case 'V':
-			printf("%s: ("PACKAGE_STRING")\n", progname);
-			exit(EX_SUCCESS);
-		case 'w':
-			flags &= ~MS_RDONLY;
-			break;
-		case 'f':
-			++fake;
-			break;
-		case 'n':
-			++nomtab;
-			break;
-		case 'o':              /* specify mount options */
-			if (mount_opts)
-				mount_opts = xstrconcat3(mount_opts, ",", optarg);
-			else
-				mount_opts = xstrdup(optarg);
-			break;
-		case 's':
-			++sloppy;
-			break;
-		case 'h':
-		default:
-			mount_usage();
-			goto out_usage;
-		}
-	}
-
-	/*
-	 * Extra non-option words at the end are bogus...
-	 */
-	if (optind != argc - 2) {
-		mount_usage();
-		goto out_usage;
-	} else {
-		while (optind < argc) {
-			if (!spec)
-				spec = argv[optind];
-			else
-				mount_point = argv[optind];
-			optind++;
-		}
-	}
-
-	if (strcmp(progname, "mount.nfs4") == 0)
-		fs_type = "nfs4";
-
-	/*
-	 * If a non-root user is attempting to mount, make sure the
-	 * user's requested options match the options specified in
-	 * /etc/fstab; otherwise, don't allow the mount.
-	 */
-	if (uid != 0) {
-		struct mntentchn *mc;
-
-		if ((mc = getfsfile(mount_point)) == NULL ||
-		    strcmp(mc->m.mnt_fsname, spec) != 0 ||
-		    strcmp(mc->m.mnt_type, fs_type) != 0) {
-			nfs_error(_("%s: permission denied: no match for %s "
-				"found in /etc/fstab"), progname, mount_point);
-			goto out_usage;
-		}
-
-		/*
-		 * 'mount' munges the options from fstab before passing them
-		 * to us, so it is non-trivial to test that we have the correct
-		 * set of options and we don't want to trust what the user
-		 * gave us, so just take whatever is in /etc/fstab.
-		 */
-		mount_opts = strdup(mc->m.mnt_opts);
-	}
-
-	mount_point = canonicalize(mount_point);
-	if (!mount_point) {
-		nfs_error(_("%s: no mount point provided"), progname);
-		goto out_usage;
-	}
-	if (mount_point[0] != '/') {
-		nfs_error(_("%s: unrecognized mount point %s"),
-			progname, mount_point);
-		mnt_err = EX_USAGE;
-		goto out;
-	}
-	/*
-	 * Concatenate mount options from the configuration file
-	 */
-	mount_opts = mount_config_opts(spec, mount_point, mount_opts);
-
-	parse_opts(mount_opts, &flags, &extra_opts);
-
-	if (uid != 0) {
-		if (!(flags & (MS_USERS|MS_USER))) {
-			nfs_error(_("%s: permission denied"), progname);
-			mnt_err = EX_USAGE;
-			goto out;
-		}
-
-		if (geteuid() != 0) {
-			nfs_error(_("%s: not installed setuid - "
-				    "\"user\" NFS mounts not supported."), progname);
-			exit(EX_FAIL);
-		}
-	}
-
-	if (chk_mountpoint(mount_point)) {
-		mnt_err = EX_USAGE;
-		goto out;
-	}
-
-	mnt_err = try_mount(spec, mount_point, flags, fs_type, &extra_opts,
-				mount_opts, fake, FOREGROUND);
-	if (mnt_err == EX_BG) {
-		printf(_("%s: backgrounding \"%s\"\n"),
-			progname, spec);
-		printf(_("%s: mount options: \"%s\"\n"),
-			progname, extra_opts);
-
-		fflush(stdout);
-
-		/*
-		 * Parent exits immediately with success.
-		 */
-		if (daemon(0, 0)) {
-			nfs_error(_("%s: failed to start "
-					"background process: %s\n"),
-						progname, strerror(errno));
-			exit(EX_FAIL);
-		}
-
-		mnt_err = try_mount(spec, mount_point, flags, fs_type,
-					&extra_opts, mount_opts, fake,
-					BACKGROUND);
-		if (verbose && mnt_err)
-			printf(_("%s: giving up \"%s\"\n"),
-				progname, spec);
-	}
-
-out:
-	free(mount_opts);
-	free(extra_opts);
-	free(mount_point);
-	exit(mnt_err);
-
-out_usage:
-	free(mount_opts);
-	exit(EX_USAGE);
-}
 
=== removed directory '.pc/11-532048-reduce-verbosity.patch'
=== removed directory '.pc/11-532048-reduce-verbosity.patch/utils'
=== removed directory '.pc/11-532048-reduce-verbosity.patch/utils/gssd'
=== removed 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	1970-01-01 00:00:00 +0000
@@ -1,341 +0,0 @@
-/*
- *  Adapted in part from MIT Kerberos 5-1.2.1 slave/kprop.c and from
- *  http://docs.sun.com/?p=/doc/816-1331/6m7oo9sms&a=view
- *
- *  Copyright (c) 2002 The Regents of the University of Michigan.
- *  All rights reserved.
- *
- *  Andy Adamson <[e-mail]>
- *  J. Bruce Fields <[e-mail]>
- *  Marius Aamodt Eriksen <[e-mail]>
- */
-
-/*
- * slave/kprop.c
- *
- * Copyright 1990,1991 by the Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- *   require a specific license from the United States Government.
- *   It is the responsibility of any person or organization contemplating
- *   export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-/*
- * Copyright 1994 by OpenVision Technologies, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of OpenVision not be used
- * in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. OpenVision makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif	/* HAVE_CONFIG_H */
-
-#include <errno.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/file.h>
-#include <signal.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/param.h>
-#include <netdb.h>
-#include <fcntl.h>
-#include <gssapi/gssapi.h>
-#if defined(HAVE_KRB5) && !defined(GSS_C_NT_HOSTBASED_SERVICE)
-#include <gssapi/gssapi_generic.h>
-#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
-#endif
-#include "gss_util.h"
-#include "err_util.h"
-#include "gssd.h"
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdlib.h>
-#ifdef HAVE_COM_ERR_H
-#include <com_err.h>
-#endif
-
-/* Global gssd_credentials handle */
-gss_cred_id_t gssd_creds;
-
-gss_OID g_mechOid = GSS_C_NULL_OID;;
-
-#if 0
-static void
-display_status_1(char *m, u_int32_t code, int type, const gss_OID mech)
-{
-	u_int32_t maj_stat, min_stat;
-	gss_buffer_desc msg = GSS_C_EMPTY_BUFFER;
-	u_int32_t msg_ctx = 0;
-	char *typestr;
-
-	switch (type) {
-	case GSS_C_GSS_CODE:
-		typestr = "GSS";
-		break;
-	case GSS_C_MECH_CODE:
-		typestr = "mechanism";
-		break;
-	default:
-		return;
-		/* NOTREACHED */
-	}
-
-	for (;;) {
-		maj_stat = gss_display_status(&min_stat, code,
-		    type, mech, &msg_ctx, &msg);
-		if (maj_stat != GSS_S_COMPLETE) {
-			printerr(0, "ERROR: in call to "
-				"gss_display_status called from %s\n", m);
-			break;
-		} else {
-			printerr(0, "ERROR: GSS-API: (%s) error in %s(): %s\n",
-			    typestr, m, (char *)msg.value);
-		}
-
-		if (msg.length != 0)
-			(void) gss_release_buffer(&min_stat, &msg);
-
-		if (msg_ctx == 0)
-			break;
-	}
-}
-#endif
-static char *
-gss_display_error(OM_uint32 status)
-{
-		char *error = NULL;
-
-		switch(status) {
-		case GSS_S_COMPLETE: 
-			error = "GSS_S_COMPLETE";
-			break;
-		case GSS_S_CALL_INACCESSIBLE_READ: 
-			error = "GSS_S_CALL_INACCESSIBLE_READ";
-			break;
-		case GSS_S_CALL_INACCESSIBLE_WRITE:
-			error = "GSS_S_CALL_INACCESSIBLE_WRITE";
-			break;
-		case GSS_S_CALL_BAD_STRUCTURE:
-			error = "GSS_S_CALL_BAD_STRUCTURE";
-			break;
-		case  GSS_S_BAD_MECH:
-			error = "GSS_S_BAD_MECH";
-			break;
-		case  GSS_S_BAD_NAME:
-			error = "GSS_S_BAD_NAME";
-			break;
-		case  GSS_S_BAD_NAMETYPE:
-			error = "GSS_S_BAD_NAMETYPE";
-			break;
-		case  GSS_S_BAD_BINDINGS:
-			error = "GSS_S_BAD_BINDINGS";
-			break;
-		case  GSS_S_BAD_STATUS:
-			error = "GSS_S_BAD_STATUS";
-			break;
-		case  GSS_S_BAD_SIG:
-			error = "GSS_S_BAD_SIG";
-			break;
-		case  GSS_S_NO_CRED:
-			error = "GSS_S_NO_CRED";
-			break;
-		case  GSS_S_NO_CONTEXT:
-			error = "GSS_S_NO_CONTEXT";
-			break;
-		case  GSS_S_DEFECTIVE_TOKEN:
-			error = "GSS_S_DEFECTIVE_TOKEN";
-			break;
-		case  GSS_S_DEFECTIVE_CREDENTIAL:
-			error = "GSS_S_DEFECTIVE_CREDENTIAL";
-			break;
-		case  GSS_S_CREDENTIALS_EXPIRED:
-			error = "GSS_S_CREDENTIALS_EXPIRED";
-			break;
-		case  GSS_S_CONTEXT_EXPIRED:
-			error = "GSS_S_CONTEXT_EXPIRED";
-			break;
-		case  GSS_S_FAILURE:
-			error = "GSS_S_FAILURE";
-			break;
-		case  GSS_S_BAD_QOP:
-			error = "GSS_S_BAD_QOP";
-			break;
-		case  GSS_S_UNAUTHORIZED:
-			error = "GSS_S_UNAUTHORIZED";
-			break;
-		case  GSS_S_UNAVAILABLE:
-			error = "GSS_S_UNAVAILABLE";
-			break;
-		case  GSS_S_DUPLICATE_ELEMENT:
-			error = "GSS_S_DUPLICATE_ELEMENT";
-			break;
-		case  GSS_S_NAME_NOT_MN:
-			error = "GSS_S_NAME_NOT_MN";
-			break;
-		default:
-			error = "Not defined";
-		}
-	return error;
-}
-
-static void
-display_status_2(char *m, u_int32_t major, u_int32_t minor, const gss_OID mech)
-{
-	u_int32_t maj_stat1, min_stat1;
-	u_int32_t maj_stat2, min_stat2;
-	gss_buffer_desc maj_gss_buf = GSS_C_EMPTY_BUFFER;
-	gss_buffer_desc min_gss_buf = GSS_C_EMPTY_BUFFER;
-	char maj_buf[30], min_buf[30];
-	char *maj, *min;
-	u_int32_t msg_ctx = 0;
-	int msg_verbosity = 0;
-
-	/* Get major status message */
-	maj_stat1 = gss_display_status(&min_stat1, major,
-		GSS_C_GSS_CODE, mech, &msg_ctx, &maj_gss_buf);
-
-	if (maj_stat1 != GSS_S_COMPLETE) {
-		snprintf(maj_buf, sizeof(maj_buf), "(0x%08x)", major);
-		maj = &maj_buf[0];
-	} else {
-		maj = maj_gss_buf.value;
-	}
-
-	/* Get minor status message */
-	maj_stat2 = gss_display_status(&min_stat2, minor,
-		GSS_C_MECH_CODE, mech, &msg_ctx, &min_gss_buf);
-
-	if (maj_stat2 != GSS_S_COMPLETE) {
-		snprintf(min_buf, sizeof(min_buf), "(0x%08x)", minor);
-		min = &min_buf[0];
-	} else {
-		min = min_gss_buf.value;
-	}
-
-	if (major == GSS_S_CREDENTIALS_EXPIRED)
-		msg_verbosity = 1;
-
-	printerr(msg_verbosity, "ERROR: GSS-API: error in %s(): %s (%s) - %s\n",
-		 m, gss_display_error(major), maj, min);
-
-	if (maj_gss_buf.length != 0)
-		(void) gss_release_buffer(&min_stat1, &maj_gss_buf);
-	if (min_gss_buf.length != 0)
-		(void) gss_release_buffer(&min_stat2, &min_gss_buf);
-}
-
-void
-pgsserr(char *msg, u_int32_t maj_stat, u_int32_t min_stat, const gss_OID mech)
-{
-	display_status_2(msg, maj_stat, min_stat, mech);
-}
-
-int
-gssd_acquire_cred(char *server_name, const gss_OID oid)
-{
-	gss_buffer_desc name;
-	gss_name_t target_name;
-	u_int32_t maj_stat, min_stat;
-	u_int32_t ignore_maj_stat, ignore_min_stat;
-	gss_buffer_desc pbuf;
-
-	/* If server_name is NULL, get cred for GSS_C_NO_NAME */
-	if (server_name == NULL) {
-		target_name = GSS_C_NO_NAME;
-	} else {
-		name.value = (void *)server_name;
-		name.length = strlen(server_name);
-
-		maj_stat = gss_import_name(&min_stat, &name,
-				oid,
-				&target_name);
-
-		if (maj_stat != GSS_S_COMPLETE) {
-			pgsserr("gss_import_name", maj_stat, min_stat, g_mechOid);
-			return (FALSE);
-		}
-	}
-
-	maj_stat = gss_acquire_cred(&min_stat, target_name, GSS_C_INDEFINITE,
-			GSS_C_NO_OID_SET, GSS_C_ACCEPT,
-			&gssd_creds, NULL, NULL);
-
-	if (maj_stat != GSS_S_COMPLETE) {
-		pgsserr("gss_acquire_cred", maj_stat, min_stat, g_mechOid);
-		ignore_maj_stat = gss_display_name(&ignore_min_stat,
-				target_name, &pbuf, NULL);
-		if (ignore_maj_stat == GSS_S_COMPLETE) {
-			printerr(1, "Unable to obtain credentials for '%.*s'\n",
-				 pbuf.length, pbuf.value);
-			ignore_maj_stat = gss_release_buffer(&ignore_min_stat,
-							     &pbuf);
-		}
-	}
-
-	ignore_maj_stat = gss_release_name(&ignore_min_stat, &target_name);
-
-	return (maj_stat == GSS_S_COMPLETE);
-}
-
-int gssd_check_mechs(void)
-{
-	u_int32_t maj_stat, min_stat;
-	gss_OID_set supported_mechs = GSS_C_NO_OID_SET;
-	int retval = -1;
-
-	maj_stat = gss_indicate_mechs(&min_stat, &supported_mechs);
-	if (maj_stat != GSS_S_COMPLETE) {
-		printerr(0, "Unable to obtain list of supported mechanisms. "
-			 "Check that gss library is properly configured.\n");
-		goto out;
-	}
-	if (supported_mechs == GSS_C_NO_OID_SET ||
-	    supported_mechs->count == 0) {
-		printerr(0, "Unable to obtain list of supported mechanisms. "
-			 "Check that gss library is properly configured.\n");
-		goto out;
-	}
-	maj_stat = gss_release_oid_set(&min_stat, &supported_mechs);
-	retval = 0;
-out:
-	return retval;
-}
-
 
=== removed 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	1970-01-01 00:00:00 +0000
@@ -1,1241 +0,0 @@
-/*
-  gssd_proc.c
-
-  Copyright (c) 2000-2004 The Regents of the University of Michigan.
-  All rights reserved.
-
-  Copyright (c) 2000 Dug Song <[e-mail]>.
-  Copyright (c) 2001 Andy Adamson <[e-mail]>.
-  Copyright (c) 2002 Marius Aamodt Eriksen <[e-mail]>.
-  Copyright (c) 2002 Bruce Fields <[e-mail]>
-  Copyright (c) 2004 Kevin Coffman <[e-mail]>
-  All rights reserved, all wrongs reversed.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. Neither the name of the University nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif	/* HAVE_CONFIG_H */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include <sys/param.h>
-#include <rpc/rpc.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <sys/fsuid.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <grp.h>
-#include <string.h>
-#include <dirent.h>
-#include <poll.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
-#include <errno.h>
-#include <gssapi/gssapi.h>
-#include <netdb.h>
-
-#include "gssd.h"
-#include "err_util.h"
-#include "gss_util.h"
-#include "krb5_util.h"
-#include "context.h"
-#include "nfsrpc.h"
-#include "nfslib.h"
-
-/*
- * pollarray:
- *      array of struct pollfd suitable to pass to poll. initialized to
- *      zero - a zero struct is ignored by poll() because the events mask is 0.
- *
- * clnt_list:
- *      linked list of struct clnt_info which associates a clntXXX directory
- *	with an index into pollarray[], and other basic data about that client.
- *
- * Directory structure: created by the kernel
- *      {rpc_pipefs}/{dir}/clntXX         : one per rpc_clnt struct in the kernel
- *      {rpc_pipefs}/{dir}/clntXX/krb5    : read uid for which kernel wants
- *					    a context, write the resulting context
- *      {rpc_pipefs}/{dir}/clntXX/info    : stores info such as server name
- *      {rpc_pipefs}/{dir}/clntXX/gssd    : pipe for all gss mechanisms using
- *					    a text-based string of parameters
- *
- * Algorithm:
- *      Poll all {rpc_pipefs}/{dir}/clntXX/YYYY files.  When data is ready,
- *      read and process; performs rpcsec_gss context initialization protocol to
- *      get a cred for that user.  Writes result to corresponding krb5 file
- *      in a form the kernel code will understand.
- *      In addition, we make sure we are notified whenever anything is
- *      created or destroyed in {rpc_pipefs} or in any of the clntXX directories,
- *      and rescan the whole {rpc_pipefs} when this happens.
- */
-
-struct pollfd * pollarray;
-
-int pollsize;  /* the size of pollaray (in pollfd's) */
-
-/*
- * convert a presentation address string to a sockaddr_storage struct. Returns
- * true on success or false on failure.
- *
- * Note that we do not populate the sin6_scope_id field here for IPv6 addrs.
- * gssd nececessarily relies on hostname resolution and DNS AAAA records
- * do not generally contain scope-id's. This means that GSSAPI auth really
- * can't work with IPv6 link-local addresses.
- *
- * We *could* consider changing this if we did something like adopt the
- * Microsoft "standard" of using the ipv6-literal.net domainname, but it's
- * not really feasible at present.
- */
-static int
-addrstr_to_sockaddr(struct sockaddr *sa, const char *node, const char *port)
-{
-	int rc;
-	struct addrinfo *res;
-	struct addrinfo hints = { .ai_flags = AI_NUMERICHOST | AI_NUMERICSERV };
-
-#ifndef IPV6_SUPPORTED
-	hints.ai_family = AF_INET;
-#endif /* IPV6_SUPPORTED */
-
-	rc = getaddrinfo(node, port, &hints, &res);
-	if (rc) {
-		printerr(0, "ERROR: unable to convert %s|%s to sockaddr: %s\n",
-			 node, port, rc == EAI_SYSTEM ? strerror(errno) :
-						gai_strerror(rc));
-		return 0;
-	}
-
-#ifdef IPV6_SUPPORTED
-	/*
-	 * getnameinfo ignores the scopeid. If the address turns out to have
-	 * a non-zero scopeid, we can't use it -- the resolved host might be
-	 * completely different from the one intended.
-	 */
-	if (res->ai_addr->sa_family == AF_INET6) {
-		struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)res->ai_addr;
-		if (sin6->sin6_scope_id) {
-			printerr(0, "ERROR: address %s has non-zero "
-				    "sin6_scope_id!\n", node);
-			freeaddrinfo(res);
-			return 0;
-		}
-	}
-#endif /* IPV6_SUPPORTED */
-
-	memcpy(sa, res->ai_addr, res->ai_addrlen);
-	freeaddrinfo(res);
-	return 1;
-}
-
-/*
- * convert a sockaddr to a hostname
- */
-static char *
-sockaddr_to_hostname(const struct sockaddr *sa, const char *addr)
-{
-	socklen_t		addrlen;
-	int			err;
-	char 			*hostname;
-	char			hbuf[NI_MAXHOST];
-
-	switch (sa->sa_family) {
-	case AF_INET:
-		addrlen = sizeof(struct sockaddr_in);
-		break;
-#ifdef IPV6_SUPPORTED
-	case AF_INET6:
-		addrlen = sizeof(struct sockaddr_in6);
-		break;
-#endif /* IPV6_SUPPORTED */
-	default:
-		printerr(0, "ERROR: unrecognized addr family %d\n",
-			 sa->sa_family);
-		return NULL;
-	}
-
-	err = getnameinfo(sa, addrlen, hbuf, sizeof(hbuf), NULL, 0,
-			  NI_NAMEREQD);
-	if (err) {
-		printerr(0, "ERROR: unable to resolve %s to hostname: %s\n",
-			 addr, err == EAI_SYSTEM ? strerror(err) :
-						   gai_strerror(err));
-		return NULL;
-	}
-
-	hostname = strdup(hbuf);
-
-	return hostname;
-}
-
-/* XXX buffer problems: */
-static int
-read_service_info(char *info_file_name, char **servicename, char **servername,
-		  int *prog, int *vers, char **protocol,
-		  struct sockaddr *addr) {
-#define INFOBUFLEN 256
-	char		buf[INFOBUFLEN + 1];
-	static char	dummy[128];
-	int		nbytes;
-	static char	service[128];
-	static char	address[128];
-	char		program[16];
-	char		version[16];
-	char		protoname[16];
-	char		port[128];
-	char		*p;
-	int		fd = -1;
-	int		numfields;
-
-	*servicename = *servername = *protocol = NULL;
-
-	if ((fd = open(info_file_name, O_RDONLY)) == -1) {
-		printerr(0, "ERROR: can't open %s: %s\n", info_file_name,
-			 strerror(errno));
-		goto fail;
-	}
-	if ((nbytes = read(fd, buf, INFOBUFLEN)) == -1)
-		goto fail;
-	close(fd);
-	buf[nbytes] = '\0';
-
-	numfields = sscanf(buf,"RPC server: %127s\n"
-		   "service: %127s %15s version %15s\n"
-		   "address: %127s\n"
-		   "protocol: %15s\n",
-		   dummy,
-		   service, program, version,
-		   address,
-		   protoname);
-
-	if (numfields == 5) {
-		strcpy(protoname, "tcp");
-	} else if (numfields != 6) {
-		goto fail;
-	}
-
-	port[0] = '\0';
-	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;
-	*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);
-	if (*servername == NULL)
-		goto fail;
-
-	nbytes = snprintf(buf, INFOBUFLEN, "%s@%s", service, *servername);
-	if (nbytes > INFOBUFLEN)
-		goto fail;
-
-	if (!(*servicename = calloc(strlen(buf) + 1, 1)))
-		goto fail;
-	memcpy(*servicename, buf, strlen(buf));
-
-	if (!(*protocol = strdup(protoname)))
-		goto fail;
-	return 0;
-fail:
-	printerr(0, "ERROR: failed to read service info\n");
-	if (fd != -1) close(fd);
-	free(*servername);
-	free(*servicename);
-	free(*protocol);
-	*servicename = *servername = *protocol = NULL;
-	return -1;
-}
-
-static void
-destroy_client(struct clnt_info *clp)
-{
-	if (clp->krb5_poll_index != -1)
-		memset(&pollarray[clp->krb5_poll_index], 0,
-					sizeof(struct pollfd));
-	if (clp->gssd_poll_index != -1)
-		memset(&pollarray[clp->gssd_poll_index], 0,
-					sizeof(struct pollfd));
-	if (clp->dir_fd != -1) close(clp->dir_fd);
-	if (clp->krb5_fd != -1) close(clp->krb5_fd);
-	if (clp->gssd_fd != -1) close(clp->gssd_fd);
-	free(clp->dirname);
-	free(clp->servicename);
-	free(clp->servername);
-	free(clp->protocol);
-	free(clp);
-}
-
-static struct clnt_info *
-insert_new_clnt(void)
-{
-	struct clnt_info	*clp = NULL;
-
-	if (!(clp = (struct clnt_info *)calloc(1,sizeof(struct clnt_info)))) {
-		printerr(0, "ERROR: can't malloc clnt_info: %s\n",
-			 strerror(errno));
-		goto out;
-	}
-	clp->krb5_poll_index = -1;
-	clp->gssd_poll_index = -1;
-	clp->krb5_fd = -1;
-	clp->gssd_fd = -1;
-	clp->dir_fd = -1;
-
-	TAILQ_INSERT_HEAD(&clnt_list, clp, list);
-out:
-	return clp;
-}
-
-static int
-process_clnt_dir_files(struct clnt_info * clp)
-{
-	char	name[PATH_MAX];
-	char	gname[PATH_MAX];
-	char	info_file_name[PATH_MAX];
-
-	if (clp->gssd_fd == -1) {
-		snprintf(gname, sizeof(gname), "%s/gssd", clp->dirname);
-		clp->gssd_fd = open(gname, O_RDWR);
-	}
-	if (clp->gssd_fd == -1) {
-		if (clp->krb5_fd == -1) {
-			snprintf(name, sizeof(name), "%s/krb5", clp->dirname);
-			clp->krb5_fd = open(name, O_RDWR);
-		}
-
-		/* If we opened a gss-specific pipe, let's try opening
-		 * the new upcall pipe again. If we succeed, close
-		 * gss-specific pipe(s).
-		 */
-		if (clp->krb5_fd != -1) {
-			clp->gssd_fd = open(gname, O_RDWR);
-			if (clp->gssd_fd != -1) {
-				if (clp->krb5_fd != -1)
-					close(clp->krb5_fd);
-				clp->krb5_fd = -1;
-			}
-		}
-	}
-
-	if ((clp->krb5_fd == -1) && (clp->gssd_fd == -1))
-		return -1;
-	snprintf(info_file_name, sizeof(info_file_name), "%s/info",
-			clp->dirname);
-	if ((clp->servicename == NULL) &&
-	     read_service_info(info_file_name, &clp->servicename,
-				&clp->servername, &clp->prog, &clp->vers,
-				&clp->protocol, (struct sockaddr *) &clp->addr))
-		return -1;
-	return 0;
-}
-
-static int
-get_poll_index(int *ind)
-{
-	int i;
-
-	*ind = -1;
-	for (i=0; i<FD_ALLOC_BLOCK; i++) {
-		if (pollarray[i].events == 0) {
-			*ind = i;
-			break;
-		}
-	}
-	if (*ind == -1) {
-		printerr(0, "ERROR: No pollarray slots open\n");
-		return -1;
-	}
-	return 0;
-}
-
-
-static int
-insert_clnt_poll(struct clnt_info *clp)
-{
-	if ((clp->gssd_fd != -1) && (clp->gssd_poll_index == -1)) {
-		if (get_poll_index(&clp->gssd_poll_index)) {
-			printerr(0, "ERROR: Too many gssd clients\n");
-			return -1;
-		}
-		pollarray[clp->gssd_poll_index].fd = clp->gssd_fd;
-		pollarray[clp->gssd_poll_index].events |= POLLIN;
-	}
-
-	if ((clp->krb5_fd != -1) && (clp->krb5_poll_index == -1)) {
-		if (get_poll_index(&clp->krb5_poll_index)) {
-			printerr(0, "ERROR: Too many krb5 clients\n");
-			return -1;
-		}
-		pollarray[clp->krb5_poll_index].fd = clp->krb5_fd;
-		pollarray[clp->krb5_poll_index].events |= POLLIN;
-	}
-
-	return 0;
-}
-
-static void
-process_clnt_dir(char *dir, char *pdir)
-{
-	struct clnt_info *	clp;
-
-	if (!(clp = insert_new_clnt()))
-		goto fail_destroy_client;
-
-	/* An extra for the '/', and an extra for the null */
-	if (!(clp->dirname = calloc(strlen(dir) + strlen(pdir) + 2, 1))) {
-		goto fail_destroy_client;
-	}
-	sprintf(clp->dirname, "%s/%s", pdir, dir);
-	if ((clp->dir_fd = open(clp->dirname, O_RDONLY)) == -1) {
-		printerr(0, "ERROR: can't open %s: %s\n",
-			 clp->dirname, strerror(errno));
-		goto fail_destroy_client;
-	}
-	fcntl(clp->dir_fd, F_SETSIG, DNOTIFY_SIGNAL);
-	fcntl(clp->dir_fd, F_NOTIFY, DN_CREATE | DN_DELETE | DN_MULTISHOT);
-
-	if (process_clnt_dir_files(clp))
-		goto fail_keep_client;
-
-	if (insert_clnt_poll(clp))
-		goto fail_destroy_client;
-
-	return;
-
-fail_destroy_client:
-	if (clp) {
-		TAILQ_REMOVE(&clnt_list, clp, list);
-		destroy_client(clp);
-	}
-fail_keep_client:
-	/* We couldn't find some subdirectories, but we keep the client
-	 * around in case we get a notification on the directory when the
-	 * subdirectories are created. */
-	return;
-}
-
-void
-init_client_list(void)
-{
-	TAILQ_INIT(&clnt_list);
-	/* Eventually plan to grow/shrink poll array: */
-	pollsize = FD_ALLOC_BLOCK;
-	pollarray = calloc(pollsize, sizeof(struct pollfd));
-}
-
-/*
- * This is run after a DNOTIFY signal, and should clear up any
- * directories that are no longer around, and re-scan any existing
- * directories, since the DNOTIFY could have been in there.
- */
-static void
-update_old_clients(struct dirent **namelist, int size, char *pdir)
-{
-	struct clnt_info *clp;
-	void *saveprev;
-	int i, stillhere;
-	char fname[PATH_MAX];
-
-	for (clp = clnt_list.tqh_first; clp != NULL; clp = clp->list.tqe_next) {
-		/* only compare entries in the global list that are from the
-		 * same pipefs parent directory as "pdir"
-		 */
-		if (strncmp(clp->dirname, pdir, strlen(pdir)) != 0) continue;
-
-		stillhere = 0;
-		for (i=0; i < size; i++) {
-			snprintf(fname, sizeof(fname), "%s/%s",
-				 pdir, namelist[i]->d_name);
-			if (strcmp(clp->dirname, fname) == 0) {
-				stillhere = 1;
-				break;
-			}
-		}
-		if (!stillhere) {
-			printerr(2, "destroying client %s\n", clp->dirname);
-			saveprev = clp->list.tqe_prev;
-			TAILQ_REMOVE(&clnt_list, clp, list);
-			destroy_client(clp);
-			clp = saveprev;
-		}
-	}
-	for (clp = clnt_list.tqh_first; clp != NULL; clp = clp->list.tqe_next) {
-		if (!process_clnt_dir_files(clp))
-			insert_clnt_poll(clp);
-	}
-}
-
-/* Search for a client by directory name, return 1 if found, 0 otherwise */
-static int
-find_client(char *dirname, char *pdir)
-{
-	struct clnt_info	*clp;
-	char fname[PATH_MAX];
-
-	for (clp = clnt_list.tqh_first; clp != NULL; clp = clp->list.tqe_next) {
-		snprintf(fname, sizeof(fname), "%s/%s", pdir, dirname);
-		if (strcmp(clp->dirname, fname) == 0)
-			return 1;
-	}
-	return 0;
-}
-
-static int
-process_pipedir(char *pipe_name)
-{
-	struct dirent **namelist;
-	int i, j;
-
-	if (chdir(pipe_name) < 0) {
-		printerr(0, "ERROR: can't chdir to %s: %s\n",
-			 pipe_name, strerror(errno));
-		return -1;
-	}
-
-	j = scandir(pipe_name, &namelist, NULL, alphasort);
-	if (j < 0) {
-		printerr(0, "ERROR: can't scandir %s: %s\n",
-			 pipe_name, strerror(errno));
-		return -1;
-	}
-
-	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))
-			process_clnt_dir(namelist[i]->d_name, pipe_name);
-		free(namelist[i]);
-	}
-
-	free(namelist);
-
-	return 0;
-}
-
-/* Used to read (and re-read) list of clients, set up poll array. */
-int
-update_client_list(void)
-{
-	int retval = -1;
-	struct topdirs_info *tdi;
-
-	TAILQ_FOREACH(tdi, &topdirs_list, list) {
-		retval = process_pipedir(tdi->dirname);
-		if (retval)
-			printerr(1, "WARNING: error processing %s\n",
-				 tdi->dirname);
-
-	}
-	return retval;
-}
-
-/* Encryption types supported by the kernel rpcsec_gss code */
-int num_krb5_enctypes = 0;
-krb5_enctype *krb5_enctypes = NULL;
-
-/*
- * Parse the supported encryption type information
- */
-static int
-parse_enctypes(char *enctypes)
-{
-	int n = 0;
-	char *curr, *comma;
-	int i;
-	static char *cached_types;
-
-	if (cached_types && strcmp(cached_types, enctypes) == 0)
-		return 0;
-	free(cached_types);
-
-	if (krb5_enctypes != NULL) {
-		free(krb5_enctypes);
-		krb5_enctypes = NULL;
-		num_krb5_enctypes = 0;
-	}
-
-	/* count the number of commas */
-	for (curr = enctypes; curr && *curr != '\0'; curr = ++comma) {
-		comma = strchr(curr, ',');
-		if (comma != NULL)
-			n++;
-		else
-			break;
-	}
-	/* If no more commas and we're not at the end, there's one more value */
-	if (*curr != '\0')
-		n++;
-
-	/* Empty string, return an error */
-	if (n == 0)
-		return ENOENT;
-
-	/* Allocate space for enctypes array */
-	if ((krb5_enctypes = (int *) calloc(n, sizeof(int))) == NULL) {
-		return ENOMEM;
-	}
-
-	/* Now parse each value into the array */
-	for (curr = enctypes, i = 0; curr && *curr != '\0'; curr = ++comma) {
-		krb5_enctypes[i++] = atoi(curr);
-		comma = strchr(curr, ',');
-		if (comma == NULL)
-			break;
-	}
-
-	num_krb5_enctypes = n;
-	if ((cached_types = malloc(strlen(enctypes)+1)))
-		strcpy(cached_types, enctypes);
-
-	return 0;
-}
-
-static int
-do_downcall(int k5_fd, uid_t uid, struct authgss_private_data *pd,
-	    gss_buffer_desc *context_token)
-{
-	char    *buf = NULL, *p = NULL, *end = NULL;
-	unsigned int timeout = context_timeout;
-	unsigned int buf_size = 0;
-
-	printerr(1, "doing downcall\n");
-	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;
-
-	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;
-	if (write_buffer(&p, end, &pd->pd_ctx_hndl)) goto out_err;
-	if (write_buffer(&p, end, context_token)) goto out_err;
-
-	if (write(k5_fd, buf, p - buf) < p - buf) goto out_err;
-	if (buf) free(buf);
-	return 0;
-out_err:
-	if (buf) free(buf);
-	printerr(1, "Failed to write downcall!\n");
-	return -1;
-}
-
-static int
-do_error_downcall(int k5_fd, uid_t uid, int err)
-{
-	char	buf[1024];
-	char	*p = buf, *end = buf + 1024;
-	unsigned int timeout = 0;
-	int	zero = 0;
-
-	printerr(1, "doing error downcall\n");
-
-	if (WRITE_BYTES(&p, end, uid)) goto out_err;
-	if (WRITE_BYTES(&p, end, timeout)) goto out_err;
-	/* use seq_win = 0 to indicate an error: */
-	if (WRITE_BYTES(&p, end, zero)) goto out_err;
-	if (WRITE_BYTES(&p, end, err)) goto out_err;
-
-	if (write(k5_fd, buf, p - buf) < p - buf) goto out_err;
-	return 0;
-out_err:
-	printerr(1, "Failed to write error downcall!\n");
-	return -1;
-}
-
-/*
- * If the port isn't already set, do an rpcbind query to the remote server
- * 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
- * of the port= option or '2049'. The port field in a new sockaddr should
- * reflect the value that was sent by the kernel.
- */
-static int
-populate_port(struct sockaddr *sa, const socklen_t salen,
-	      const rpcprog_t program, const rpcvers_t version,
-	      const unsigned short protocol)
-{
-	struct sockaddr_in	*s4 = (struct sockaddr_in *) sa;
-#ifdef IPV6_SUPPORTED
-	struct sockaddr_in6	*s6 = (struct sockaddr_in6 *) sa;
-#endif /* IPV6_SUPPORTED */
-	unsigned short		port;
-
-	/*
-	 * Newer kernels send the port in the upcall. If we already have
-	 * the port, there's no need to look it up.
-	 */
-	switch (sa->sa_family) {
-	case AF_INET:
-		if (s4->sin_port != 0) {
-			printerr(2, "DEBUG: port already set to %d\n",
-				 ntohs(s4->sin_port));
-			return 1;
-		}
-		break;
-#ifdef IPV6_SUPPORTED
-	case AF_INET6:
-		if (s6->sin6_port != 0) {
-			printerr(2, "DEBUG: port already set to %d\n",
-				 ntohs(s6->sin6_port));
-			return 1;
-		}
-		break;
-#endif /* IPV6_SUPPORTED */
-	default:
-		printerr(0, "ERROR: unsupported address family %d\n",
-			    sa->sa_family);
-		return 0;
-	}
-
-	/*
-	 * Newer kernels that send the port in the upcall set the value to
-	 * 2049 for NFSv4 mounts when one isn't specified. The check below is
-	 * only for kernels that don't send the port in the upcall. For those
-	 * we either have to do an rpcbind query or set it to the standard
-	 * port. Doing a query could be problematic (firewalls, etc), so take
-	 * the latter approach.
-	 */
-	if (program == 100003 && version == 4) {
-		port = 2049;
-		goto set_port;
-	}
-
-	port = nfs_getport(sa, salen, program, version, protocol);
-	if (!port) {
-		printerr(0, "ERROR: unable to obtain port for prog %ld "
-			    "vers %ld\n", program, version);
-		return 0;
-	}
-
-set_port:
-	printerr(2, "DEBUG: setting port to %hu for prog %lu vers %lu\n", port,
-		 program, version);
-
-	switch (sa->sa_family) {
-	case AF_INET:
-		s4->sin_port = htons(port);
-		break;
-#ifdef IPV6_SUPPORTED
-	case AF_INET6:
-		s6->sin6_port = htons(port);
-		break;
-#endif /* IPV6_SUPPORTED */
-	}
-
-	return 1;
-}
-
-/*
- * 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)
-{
-	CLIENT			*rpc_clnt = NULL;
-	struct rpc_gss_sec	sec;
-	AUTH			*auth = NULL;
-	uid_t			save_uid = -1;
-	int			retval = -1;
-	OM_uint32		min_stat;
-	char			rpc_errmsg[1024];
-	int			protocol;
-	struct timeval		timeout = {5, 0};
-	struct sockaddr		*addr = (struct sockaddr *) &clp->addr;
-	socklen_t		salen;
-
-	/* Create the context as the user (not as root) */
-	save_uid = geteuid();
-	if (setfsuid(uid) != 0) {
-		printerr(0, "WARNING: Failed to setfsuid for "
-			    "user with uid %d\n", uid);
-		goto out_fail;
-	}
-	printerr(2, "creating context using fsuid %d (save_uid %d)\n",
-			uid, save_uid);
-
-	sec.qop = GSS_C_QOP_DEFAULT;
-	sec.svc = RPCSEC_GSS_SVC_NONE;
-	sec.cred = GSS_C_NO_CREDENTIAL;
-	sec.req_flags = 0;
-	if (authtype == AUTHTYPE_KRB5) {
-		sec.mech = (gss_OID)&krb5oid;
-		sec.req_flags = GSS_C_MUTUAL_FLAG;
-	}
-	else {
-		printerr(0, "ERROR: Invalid authentication type (%d) "
-			"in create_auth_rpc_client\n", authtype);
-		goto out_fail;
-	}
-
-
-	if (authtype == AUTHTYPE_KRB5) {
-#ifdef HAVE_SET_ALLOWABLE_ENCTYPES
-		/*
-		 * Do this before creating rpc connection since we won't need
-		 * rpc connection if it fails!
-		 */
-		if (limit_krb5_enctypes(&sec)) {
-			printerr(1, "WARNING: Failed while limiting krb5 "
-				    "encryption types for user with uid %d\n",
-				 uid);
-			goto out_fail;
-		}
-#endif
-	}
-
-	/* create an rpc connection to the nfs server */
-
-	printerr(2, "creating %s client for server %s\n", clp->protocol,
-			clp->servername);
-
-	if ((strcmp(clp->protocol, "tcp")) == 0) {
-		protocol = IPPROTO_TCP;
-	} else if ((strcmp(clp->protocol, "udp")) == 0) {
-		protocol = IPPROTO_UDP;
-	} else {
-		printerr(0, "WARNING: unrecognized protocol, '%s', requested "
-			 "for connection to server %s for user with uid %d\n",
-			 clp->protocol, clp->servername, uid);
-		goto out_fail;
-	}
-
-	switch (addr->sa_family) {
-	case AF_INET:
-		salen = sizeof(struct sockaddr_in);
-		break;
-#ifdef IPV6_SUPPORTED
-	case AF_INET6:
-		salen = sizeof(struct sockaddr_in6);
-		break;
-#endif /* IPV6_SUPPORTED */
-	default:
-		printerr(1, "ERROR: Unknown address family %d\n",
-			 addr->sa_family);
-		goto out_fail;
-	}
-
-	if (!populate_port(addr, salen, clp->prog, clp->vers, protocol))
-		goto out_fail;
-
-	rpc_clnt = nfs_get_rpcclient(addr, salen, protocol, clp->prog,
-				     clp->vers, &timeout);
-	if (!rpc_clnt) {
-		snprintf(rpc_errmsg, sizeof(rpc_errmsg),
-			 "WARNING: can't create %s rpc_clnt to server %s for "
-			 "user with uid %d",
-			 protocol == IPPROTO_TCP ? "tcp" : "udp",
-			 clp->servername, uid);
-		printerr(0, "%s\n",
-			 clnt_spcreateerror(rpc_errmsg));
-		goto out_fail;
-	}
-
-	printerr(2, "creating context with server %s\n", clp->servicename);
-	auth = authgss_create_default(rpc_clnt, clp->servicename, &sec);
-	if (!auth) {
-		/* Our caller should print appropriate message */
-		printerr(2, "WARNING: Failed to create krb5 context for "
-			    "user with uid %d for server %s\n",
-			 uid, clp->servername);
-		goto out_fail;
-	}
-
-	/* Success !!! */
-	rpc_clnt->cl_auth = auth;
-	*clnt_return = rpc_clnt;
-	*auth_return = auth;
-	retval = 0;
-
-  out:
-	if (sec.cred != GSS_C_NO_CREDENTIAL)
-		gss_release_cred(&min_stat, &sec.cred);
-	/* Restore euid to original value */
-	if (((int)save_uid != -1) && (setfsuid(save_uid) != (int)uid)) {
-		printerr(0, "WARNING: Failed to restore fsuid"
-			    " to uid %d from %d\n", save_uid, uid);
-	}
-	return retval;
-
-  out_fail:
-	/* Only destroy here if failure.  Otherwise, caller is responsible */
-	if (rpc_clnt) clnt_destroy(rpc_clnt);
-
-	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
- */
-static void
-process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,
-		    char *service)
-{
-	CLIENT			*rpc_clnt = NULL;
-	AUTH			*auth = NULL;
-	struct authgss_private_data pd;
-	gss_buffer_desc		token;
-	char			**credlist = NULL;
-	char			**ccname;
-	char			**dirname, *dir, *userdir;
-	int			create_resp = -1;
-	int			err, downcall_err = -EACCES;
-
-	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));
-
-	/*
-	 * If "service" is specified, then the kernel is indicating that
-	 * we must use machine credentials for this request.  (Regardless
-	 * of the uid value or the setting of root_uses_machine_creds.)
-	 * If the service value is "*", then any service name can be used.
-	 * Otherwise, it specifies the service name that should be used.
-	 * (For now, the values of service will only be "*" or "nfs".)
-	 *
-	 * Restricting gssd to use "nfs" service name is needed for when
-	 * the NFS server is doing a callback to the NFS client.  In this
-	 * case, the NFS server has to authenticate itself as "nfs" --
-	 * even if there are other service keys such as "host" or "root"
-	 * in the keytab.
-	 *
-	 * Another case when the kernel may specify the service attribute
-	 * is when gssd is being asked to create the context for a
-	 * SETCLIENT_ID operation.  In this case, machine credentials
-	 * must be used for the authentication.  However, the service name
-	 * used for this case is not important.
-	 *
-	 */
-	printerr(2, "%s: service is '%s'\n", __func__,
-		 service ? service : "<null>");
-	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;
-			}
-			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;
-		}
-	}
-	if (create_resp != 0) {
-		if (uid == 0 && (root_uses_machine_creds == 1 ||
-				service != NULL)) {
-			int nocache = 0;
-			int success = 0;
-			do {
-				gssd_refresh_krb5_machine_credential(clp->servername,
-								     NULL, service);
-				/*
-				 * Get a list of credential cache names and try each
-				 * of them until one works or we've tried them all
-				 */
-				if (gssd_get_krb5_machine_cred_list(&credlist)) {
-					printerr(0, "ERROR: No credentials found "
-						 "for connection to server %s\n",
-						 clp->servername);
-						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) {
-						/* 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);			
-				if (!success) {
-					if(nocache == 0) {
-						nocache++;
-						printerr(2, "WARNING: Machine cache is prematurely expired or corrupted "
-						            "trying to recreate cache for server %s\n", clp->servername);
-					} else {
-						printerr(1, "WARNING: Failed to create machine krb5 context "
-						 "with any credentials cache for server %s\n",
-						 clp->servername);
-						goto out_return_error;
-					}
-				}
-			} while(!success);
-		} else {
-			printerr(1, "WARNING: Failed to create krb5 context "
-				 "for user with uid %d for server %s\n",
-				 uid, clp->servername);
-			goto out_return_error;
-		}
-	}
-
-	if (!authgss_get_private_data(auth, &pd)) {
-		printerr(1, "WARNING: Failed to obtain authentication "
-			    "data for user with uid %d for server %s\n",
-			 uid, clp->servername);
-		goto out_return_error;
-	}
-
-	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);
-
-out:
-	if (token.value)
-		free(token.value);
-#ifndef HAVE_LIBTIRPC
-	if (pd.pd_ctx_hndl.length != 0)
-		authgss_free_private_data(&pd);
-#endif
-	if (auth)
-		AUTH_DESTROY(auth);
-	if (rpc_clnt)
-		clnt_destroy(rpc_clnt);
-	return;
-
-out_return_error:
-	do_error_downcall(fd, uid, downcall_err);
-	goto out;
-}
-
-void
-handle_krb5_upcall(struct clnt_info *clp)
-{
-	uid_t			uid;
-
-	if (read(clp->krb5_fd, &uid, sizeof(uid)) < (ssize_t)sizeof(uid)) {
-		printerr(0, "WARNING: failed reading uid from krb5 "
-			    "upcall pipe: %s\n", strerror(errno));
-		return;
-	}
-
-	return process_krb5_upcall(clp, uid, clp->krb5_fd, NULL, NULL);
-}
-
-void
-handle_gssd_upcall(struct clnt_info *clp)
-{
-	uid_t			uid;
-	char			*lbuf = NULL;
-	int			lbuflen = 0;
-	char			*p;
-	char			*mech = NULL;
-	char			*target = NULL;
-	char			*service = NULL;
-	char			*enctypes = NULL;
-
-	printerr(1, "handling gssd upcall (%s)\n", clp->dirname);
-
-	if (readline(clp->gssd_fd, &lbuf, &lbuflen) != 1) {
-		printerr(0, "WARNING: handle_gssd_upcall: "
-			    "failed reading request\n");
-		return;
-	}
-	printerr(2, "%s: '%s'\n", __func__, lbuf);
-
-	/* find the mechanism name */
-	if ((p = strstr(lbuf, "mech=")) != NULL) {
-		mech = malloc(lbuflen);
-		if (!mech)
-			goto out;
-		if (sscanf(p, "mech=%s", mech) != 1) {
-			printerr(0, "WARNING: handle_gssd_upcall: "
-				    "failed to parse gss mechanism name "
-				    "in upcall string '%s'\n", lbuf);
-			goto out;
-		}
-	} else {
-		printerr(0, "WARNING: handle_gssd_upcall: "
-			    "failed to find gss mechanism name "
-			    "in upcall string '%s'\n", lbuf);
-		goto out;
-	}
-
-	/* read uid */
-	if ((p = strstr(lbuf, "uid=")) != NULL) {
-		if (sscanf(p, "uid=%d", &uid) != 1) {
-			printerr(0, "WARNING: handle_gssd_upcall: "
-				    "failed to parse uid "
-				    "in upcall string '%s'\n", lbuf);
-			goto out;
-		}
-	} else {
-		printerr(0, "WARNING: handle_gssd_upcall: "
-			    "failed to find uid "
-			    "in upcall string '%s'\n", lbuf);
-		goto out;
-	}
-
-	/* read supported encryption types if supplied */
-	if ((p = strstr(lbuf, "enctypes=")) != NULL) {
-		enctypes = malloc(lbuflen);
-		if (!enctypes)
-			goto out;
-		if (sscanf(p, "enctypes=%s", enctypes) != 1) {
-			printerr(0, "WARNING: handle_gssd_upcall: "
-				    "failed to parse encryption types "
-				    "in upcall string '%s'\n", lbuf);
-			goto out;
-		}
-		if (parse_enctypes(enctypes) != 0) {
-			printerr(0, "WARNING: handle_gssd_upcall: "
-				"parsing encryption types failed: errno %d\n", errno);
-		}
-	}
-
-	/* read target name */
-	if ((p = strstr(lbuf, "target=")) != NULL) {
-		target = malloc(lbuflen);
-		if (!target)
-			goto out;
-		if (sscanf(p, "target=%s", target) != 1) {
-			printerr(0, "WARNING: handle_gssd_upcall: "
-				    "failed to parse target name "
-				    "in upcall string '%s'\n", lbuf);
-			goto out;
-		}
-	}
-
-	/*
-	 * read the service name
-	 *
-	 * The presence of attribute "service=" indicates that machine
-	 * credentials should be used for this request.  If the value
-	 * is "*", then any machine credentials available can be used.
-	 * If the value is anything else, then machine credentials for
-	 * the specified service name (always "nfs" for now) should be
-	 * used.
-	 */
-	if ((p = strstr(lbuf, "service=")) != NULL) {
-		service = malloc(lbuflen);
-		if (!service)
-			goto out;
-		if (sscanf(p, "service=%s", service) != 1) {
-			printerr(0, "WARNING: handle_gssd_upcall: "
-				    "failed to parse service type "
-				    "in upcall string '%s'\n", lbuf);
-			goto out;
-		}
-	}
-
-	if (strcmp(mech, "krb5") == 0)
-		process_krb5_upcall(clp, uid, clp->gssd_fd, target, service);
-	else
-		printerr(0, "WARNING: handle_gssd_upcall: "
-			    "received unknown gss mech '%s'\n", mech);
-
-out:
-	free(lbuf);
-	free(mech);
-	free(enctypes);
-	free(target);
-	free(service);
-	return;	
-}
-
 
=== removed directory '.pc/16-mount.nfs.man-update-distinction-between-fstype.patch'
=== removed directory '.pc/16-mount.nfs.man-update-distinction-between-fstype.patch/utils'
=== removed directory '.pc/16-mount.nfs.man-update-distinction-between-fstype.patch/utils/mount'
=== removed file '.pc/16-mount.nfs.man-update-distinction-between-fstype.patch/utils/mount/mount.nfs.man'
--- .pc/16-mount.nfs.man-update-distinction-between-fstype.patch/utils/mount/mount.nfs.man	2011-03-27 18:54:45 +0000
+++ .pc/16-mount.nfs.man-update-distinction-between-fstype.patch/utils/mount/mount.nfs.man	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-.\"@(#)mount.nfs.8"
-.TH MOUNT.NFS 8 "5 Jun 2006"
-.SH NAME
-mount.nfs, mount.nfs4 \- mount a Network File System
-.SH SYNOPSIS
-.BI "mount.nfs" " remotetarget dir" " [\-rvVwfnsh ] [\-o " options "]
-.SH DESCRIPTION
-.BR mount.nfs
-is a part of 
-.BR nfs (5)
-utilities package, which provides NFS client functionality.
-
-.BR mount.nfs 
-is meant to be used by the
-.BR mount (8)
-command for mounting NFS shares. This subcommand, however, can also be used as a standalone command with limited functionality.
-
-.BR mount.nfs4 
-is used for mounting NFSv4 file system, while 
-.BR mount.nfs 
-is used to mount NFS file systems versions 3 or 2.
-.I remotetarget 
-is a server share usually in the form of 
-.BR servername:/path/to/share.
-.I dir 
-is the directory on which the file system is to be mounted.
-
-.SH OPTIONS
-.TP
-.BI "\-r"
-Mount file system readonly.
-.TP
-.BI "\-v"
-Be verbose.
-.TP
-.BI "\-V"
-Print version.
-.TP
-.BI "\-w"
-Mount file system read-write.
-.TP
-.BI "\-f"
-Fake mount. Don't actually call the mount system call.
-.TP
-.BI "\-n"
-Do not update 
-.I /etc/mtab. 
-By default, an entry is created in 
-.I /etc/mtab 
-for every mounted file system. Use this option to skip making an entry.
-.TP
-.BI "\-s"
-Tolerate sloppy mount options rather than fail.
-.TP
-.BI "\-h"
-Print help message.
-.TP
-.BI "nfsoptions"
-Refer to 
-.BR nfs (5)
-or
-.BR mount (8) 
-manual pages.
-
-.SH NOTE
-For further information please refer 
-.BR nfs (5)
-and
-.BR mount (8)
-manual pages.
-
-.SH FILES
-.TP 18n
-.I /etc/fstab
-file system table
-.TP
-.I /etc/mtab
-table of mounted file systems
-
-.PD
-.SH "SEE ALSO"
-.BR nfs (5),
-.BR mount (8),
-
-.SH "AUTHOR"
-Amit Gud <[e-mail]>
 
=== removed directory '.pc/17-multiarch-kerberos-paths.patch'
=== removed directory '.pc/17-multiarch-kerberos-paths.patch/aclocal'
=== removed 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	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-dnl Checks for Kerberos
-dnl NOTE: while we intend to do generic gss-api, currently we
-dnl have a requirement to get an initial Kerberos machine
-dnl credential.  Thus, the requirement for Kerberos.
-dnl The Kerberos gssapi library will be dynamically loaded?
-AC_DEFUN([AC_KERBEROS_V5],[
-  AC_MSG_CHECKING(for Kerberos v5)
-  AC_ARG_WITH(krb5,
-  [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])],
-  [ case "$withval" in
-    yes|no)
-       krb5_with=""
-       ;;
-    *)
-       krb5_with="$withval"
-       ;;
-    esac ]
-  )
-
-  for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \
-  	     /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do
-    dnl This ugly hack brought on by the split installation of
-    dnl MIT Kerberos on Fedora Core 1
-    K5CONFIG=""
-    if test -f $dir/bin/krb5-config; then
-      K5CONFIG=$dir/bin/krb5-config
-    elif test -f "/usr/kerberos/bin/krb5-config"; then
-      K5CONFIG="/usr/kerberos/bin/krb5-config"
-    elif test -f "/usr/lib/mit/bin/krb5-config"; then
-      K5CONFIG="/usr/lib/mit/bin/krb5-config"
-    fi
-    if test "$K5CONFIG" != ""; then
-      KRBCFLAGS=`$K5CONFIG --cflags`
-      KRBLIBS=`$K5CONFIG --libs`
-      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 \
-                \( -f $dir/lib/libgssapi_krb5.a -o \
-                   -f $dir/lib64/libgssapi_krb5.a -o \
-                   -f $dir/lib64/libgssapi_krb5.so -o \
-                   -f $dir/lib/libgssapi_krb5.so \) ; then
-         AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
-         KRBDIR="$dir"
-  dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the
-  dnl private function (gss_krb5_ccache_name) to get correct
-  dnl behavior of changing the ccache used by gssapi.
-  dnl Starting in 1.3.2, we *DO NOT* want to use
-  dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME
-  dnl to get gssapi to use a different ccache
-         if test $K5VERS -le 131; then
-           AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private function, gss_krb5_cache_name, must be used to tell the Kerberos library which credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME environment variable])
-         fi
-         gssapi_lib=gssapi_krb5
-         break
-      dnl The following ugly hack brought on by the split installation
-      dnl of Heimdal Kerberos on SuSe
-      elif test \( -f $dir/include/heim_err.h -o\
-      		 -f $dir/include/heimdal/heim_err.h \) -a \
-                -f $dir/lib/libroken.a; then
-         AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
-         KRBDIR="$dir"
-         gssapi_lib=gssapi
-        break
-      fi
-    fi
-  done
-  dnl We didn't find a usable Kerberos environment
-  if test "x$KRBDIR" = "x"; then
-    if test "x$krb5_with" = "x"; then
-      AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=)
-    else
-      AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with)
-    fi
-  fi
-  AC_MSG_RESULT($KRBDIR)
-
-  dnl Check if -rpath=$(KRBDIR)/lib is needed
-  echo "The current KRBDIR is $KRBDIR"
-  if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \
-       -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then
-    KRBLDFLAGS="";
-  elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then
-    KRBLDFLAGS="";
-  else
-    KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib"
-  fi
-
-  dnl Now check for functions within gssapi library
-  AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context,
-    AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS)
-  AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes,
-    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)
-
-  dnl Check for newer error message facility
-  AC_CHECK_LIB($gssapi_lib, krb5_get_error_message,
-    AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS)
-
-  dnl Check for function to specify addressless tickets
-  AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless,
-    AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS)
-
-  dnl If they specified a directory and it didn't work, give them a warning
-  if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then
-    AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!)
-  fi
-
-  AC_SUBST([KRBDIR])
-  AC_SUBST([KRBLIBS])
-  AC_SUBST([KRBCFLAGS])
-  AC_SUBST([KRBLDFLAGS])
-  AC_SUBST([K5VERS])
-
-])
 
=== 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
 
=== removed directory '.pc/19-iscsiadm-path.patch'
=== removed directory '.pc/19-iscsiadm-path.patch/utils'
=== removed directory '.pc/19-iscsiadm-path.patch/utils/osd_login'
=== removed file '.pc/19-iscsiadm-path.patch/utils/osd_login/osd_login'
--- .pc/19-iscsiadm-path.patch/utils/osd_login/osd_login	2012-06-22 15:04:56 +0000
+++ .pc/19-iscsiadm-path.patch/utils/osd_login/osd_login	1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-#!/bin/bash
-#
-# osd_login : This script is part of the autologin feature
-#             mandated by the pnfs-objects standard.
-# It is called from objlayoutdriver.ko in the kernel.
-
-# Copyright (C) 2012, Sachin Bhamare <[e-mail]>
-# Copyright (C) 2012, Boaz Harrosh <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301 USA
-
-umask 022
-
-PATH="/sbin:/usr/sbin:/bin:/usr/bin"
-
-iscsiadm=/sbin/iscsiadm
-
-PARENT_PID=$BASHPID
-WATCHDOG_TIMEOUT=15
-
-protocol=""
-portal=""
-uri=""
-osdname=""
-systemid=""
-
-usage()
-{
-	echo "Usage: $0 -u <URI> -o <OSDNAME> -s <SYSTEMID>"
-	echo "Options:"
-	echo  "-u		target uri e.g. iscsi://<ip>:<port>"
-	echo  "-o		osdname of the target OSD"
-	echo  "-s		systemid of the target OSD"
-}
-
-parse_cmdline()
-{
-	argc=$#
-	if [ $# -lt 3 ]; then
-		usage
-		exit 1
-	fi
-
-	# parse the input arguments
-	while getopts "u:o:s:" options; do
-	    case $options in
-		u ) uri=$OPTARG;;
-		o ) osdname=$OPTARG;;
-		s ) systemid=$OPTARG;;
-		\? ) usage
-			exit 1;;
-		* )  usage
-			exit 1;;
-	    esac
-	done
-
-	echo "-u : $uri"
-	echo "-o : $osdname"
-	echo "-s : $systemid"
-
-	protocol=`echo $uri | awk -F ':' '{print $1}'`
-	portal=`echo $uri | awk -F '//' '{print $2}'`
-}
-
-watchdog()
-{
-	timeout=$1
-	portal=$2
-
-	sleep $timeout
-	if kill -9 $PARENT_PID; then
-	    echo "watchdog : Timed out (>$timeout seconds) while login into $portal" | logger -t "osd_login"
-	fi
-	echo "watchdog: exiting .."
-	exit 2
-}
-
-login_iscsi_osd()
-{
-	echo "login into: $1"
-	if ! $iscsiadm -m discovery -o nonpersistent -t sendtargets -p $1 --login; then
-		echo "$iscsiadm -m discovery -t sendtargets -p $1 --login returned error $? !"
-		sleep 1;
-	fi
-}
-
-echo "============= osd_login ========="
-echo "progname : $0"
-parse_cmdline "$@"
-echo "protocol: $protocol"
-echo "portal: $portal"
-
-watchdog $WATCHDOG_TIMEOUT $portal &
-watchdog_pid=$!
-
-case $protocol in
-iscsi)
-	login_iscsi_osd $portal |& logger -t "osd_login"
-	;;
-*)
-	echo "Error: protocol $protocol not supported !" | logger -t "osd_login"
-	;;
-esac
-
-kill -9 $watchdog_pid
-exit 0
 
=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-06-22 15:04:56 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-01-sm-notify-in-sbin.patch
-02-524255-manpages.patch
-03-handle-mtab-symlink.patch
-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
 
=== modified file 'aclocal/kerberos5.m4'
--- aclocal/kerberos5.m4	2012-06-22 15:04:56 +0000
+++ aclocal/kerberos5.m4	2012-08-05 05:01:18 +0000
@@ -29,7 +29,6 @@
     elif test -f "/usr/lib/mit/bin/krb5-config"; then
       K5CONFIG="/usr/lib/mit/bin/krb5-config"
     fi
-    MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null || true`
     if test "$K5CONFIG" != ""; then
       KRBCFLAGS=`$K5CONFIG --cflags`
       KRBLIBS=`$K5CONFIG --libs`
@@ -39,7 +38,6 @@
                 \( -f $dir/lib/libgssapi_krb5.a -o \
                    -f $dir/lib64/libgssapi_krb5.a -o \
                    -f $dir/lib64/libgssapi_krb5.so -o \
-                   -f $dir/lib/$MULTIARCH/libgssapi_krb5.so -o \
                    -f $dir/lib/libgssapi_krb5.so \) ; then
          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
          KRBDIR="$dir"
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-06-22 18:25:32 +0000
+++ debian/changelog	2012-08-05 05:01:18 +0000
@@ -1,3 +1,30 @@
+nfs-utils (1:1.2.6-3ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart,
+      debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm},
+      debian/rules: drop nfs-common init script in favor of upstart jobs,
+      and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart
+      init handling.
+    - Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support.
+    - debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common"
+      in the postinst, this is redundant anyway and the nfs-common init script
+      is gone now.
+    - nfs-kernel-server.init: Unmount nfsd fs when init script stops
+    - Allow issuing options to rpc.nfsd
+    - debian/nfs-common.defaults: always start idmapd automatically; drop
+      the configuration option.
+    - Move /var/lib/nfs/rpc_pipefs to /run/rpc_pipefs.  This does not belong
+      in /var/lib.
+
+ -- Logan Rosen <[e-mail]>  Sun, 05 Aug 2012 00:56:05 -0400
+
+nfs-utils (1:1.2.6-3) unstable; urgency=low
+
+  * Iterate through exports.d to look for expors (Closes: #676604).
+
+ -- Luk Claes <[e-mail]>  Tue, 10 Jul 2012 19:38:22 +0200
+
 nfs-utils (1:1.2.6-2ubuntu1) quantal; urgency=low
 
   * Merge from Debian unstable, remaining changes:
 
=== modified file 'debian/nfs-kernel-server.init'
--- debian/nfs-kernel-server.init	2012-06-22 15:04:56 +0000
+++ debian/nfs-kernel-server.init	2012-08-05 05:01:18 +0000
@@ -61,7 +61,13 @@
 # See how we were called.
 case "$1" in
   start)
-	if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports
+	export_files="/etc/exports"
+	for file in /etc/exports.d/*.exports ; do
+		if [ -f "$file" ]; then
+			export_files="$export_files $file"
+		fi
+	done
+	if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' $export_files
 	then
 		do_modprobe nfsd
 
 
=== modified file 'utils/exportfs/nfsd.man'
--- utils/exportfs/nfsd.man	2012-05-25 20:41:58 +0000
+++ utils/exportfs/nfsd.man	2012-08-05 05:01:18 +0000
@@ -196,7 +196,6 @@
 find out what number correspond to what tracing.
 
 .SH SEE ALSO
-.BR nfsd (8),
 .BR rpc.nfsd (8),
 .BR exports (5),
 .BR nfsstat (8),
 
=== modified file 'utils/gssd/gss_util.c'
--- utils/gssd/gss_util.c	2011-07-09 16:28:32 +0000
+++ utils/gssd/gss_util.c	2012-08-05 05:01:18 +0000
@@ -126,7 +126,7 @@
 				"gss_display_status called from %s\n", m);
 			break;
 		} else {
-			printerr(2, "ERROR: GSS-API: (%s) error in %s(): %s\n",
+			printerr(0, "ERROR: GSS-API: (%s) error in %s(): %s\n",
 			    typestr, m, (char *)msg.value);
 		}
 
 
=== modified file 'utils/gssd/gssd_proc.c'
--- utils/gssd/gssd_proc.c	2012-05-25 20:41:58 +0000
+++ utils/gssd/gssd_proc.c	2012-08-05 05:01:18 +0000
@@ -676,7 +676,7 @@
 	unsigned int timeout = 0;
 	int	zero = 0;
 
-	printerr(2, "doing error downcall\n");
+	printerr(1, "doing error downcall\n");
 
 	if (WRITE_BYTES(&p, end, uid)) goto out_err;
 	if (WRITE_BYTES(&p, end, timeout)) goto out_err;
@@ -953,7 +953,7 @@
 	int			create_resp = -1;
 	int			err, downcall_err = -EACCES;
 
-	printerr(2, "handling krb5 upcall (%s)\n", clp->dirname);
+	printerr(1, "handling krb5 upcall (%s)\n", clp->dirname);
 
 	if (tgtname) {
 		if (clp->servicename) {
@@ -1071,7 +1071,7 @@
 	}
 
 	if (!authgss_get_private_data(auth, &pd)) {
-		printerr(2, "WARNING: Failed to obtain authentication "
+		printerr(1, "WARNING: Failed to obtain authentication "
 			    "data for user with uid %d for server %s\n",
 			 uid, clp->servername);
 		goto out_return_error;
 
=== modified file 'utils/mount/fstab.c'
--- utils/mount/fstab.c	2011-10-02 18:29:53 +0000
+++ utils/mount/fstab.c	2012-08-05 05:01:18 +0000
@@ -57,7 +57,7 @@
 	return var_mtab_does_not_exist;
 }
 
-int
+static int
 mtab_is_a_symlink(void) {
         get_mtab_info();
         return var_mtab_is_a_symlink;
 
=== modified file 'utils/mount/fstab.h'
--- utils/mount/fstab.h	2011-10-02 18:29:53 +0000
+++ utils/mount/fstab.h	2012-08-05 05:01:18 +0000
@@ -7,7 +7,6 @@
 #define _PATH_FSTAB "/etc/fstab"
 #endif
 
-int mtab_is_a_symlink(void);
 int mtab_is_writable(void);
 int mtab_does_not_exist(void);
 void reset_mtab_info(void);
 
=== modified file 'utils/mount/mount.c'
--- utils/mount/mount.c	2011-07-09 16:28:32 +0000
+++ utils/mount/mount.c	2012-08-05 05:01:18 +0000
@@ -203,13 +203,6 @@
 	int flags;
 	mntFILE *mfp;
 
-	/* Avoid writing if the mtab is a symlink to /proc/mounts, since
-	   that would create a file /proc/mounts in case the proc filesystem
-	   is not mounted, and the fchmod below would also fail. */
-	if (mtab_is_a_symlink()) {
-		return EX_SUCCESS;
-	}
-
 	lock_mtab();
 
 	mfp = nfs_setmntent (MOUNTED, "a+");
 
=== modified file 'utils/mount/mount.nfs.man'
--- utils/mount/mount.nfs.man	2011-03-16 23:10:15 +0000
+++ utils/mount/mount.nfs.man	2012-08-05 05:01:18 +0000
@@ -15,20 +15,16 @@
 .BR mount (8)
 command for mounting NFS shares. This subcommand, however, can also be used as a standalone command with limited functionality.
 
+.BR mount.nfs4 
+is used for mounting NFSv4 file system, while 
+.BR mount.nfs 
+is used to mount NFS file systems versions 3 or 2.
 .I remotetarget 
 is a server share usually in the form of 
 .BR servername:/path/to/share.
 .I dir 
 is the directory on which the file system is to be mounted.
 
-Under Linux 2.6.32 and later kernel versions,
-.BR mount.nfs
-can mount all NFS file system versions.  Under earlier Linux kernel versions,
-.BR mount.nfs4
-must be used for mounting NFSv4 file systems while
-.BR mount.nfs
-must be used for NFSv3 and v2.
-
 .SH OPTIONS
 .TP
 .BI "\-r"
 
=== modified file 'utils/nfsd/nfsd.man'
--- utils/nfsd/nfsd.man	2012-05-25 20:41:58 +0000
+++ utils/nfsd/nfsd.man	2012-08-05 05:01:18 +0000
@@ -94,7 +94,6 @@
 database.
 
 .SH SEE ALSO
-.BR nfsd (7),
 .BR rpc.mountd (8),
 .BR exports (5),
 .BR exportfs (8),
 
=== modified file 'utils/osd_login/Makefile.am'
--- utils/osd_login/Makefile.am	2012-05-25 20:41:58 +0000
+++ utils/osd_login/Makefile.am	2012-08-05 05:01:18 +0000
@@ -1,9 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-# These binaries go in /sbin (not /usr/sbin), and that cannot be
-# overridden at config time.
-sbindir = /sbin
-
-sbin_SCRIPTS = osd_login
+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
 
=== modified file 'utils/osd_login/osd_login'
--- utils/osd_login/osd_login	2012-05-25 20:41:58 +0000
+++ utils/osd_login/osd_login	2012-08-05 05:01:18 +0000
@@ -25,6 +25,8 @@
 
 PATH="/sbin:/usr/sbin:/bin:/usr/bin"
 
+iscsiadm=/sbin/iscsiadm
+
 PARENT_PID=$BASHPID
 WATCHDOG_TIMEOUT=15
 
@@ -88,8 +90,8 @@
 login_iscsi_osd()
 {
 	echo "login into: $1"
-	if ! iscsiadm -m discovery -o nonpersistent -t sendtargets -p $1 --login; then
-		echo "iscsiadm -m discovery -t sendtargets -p $1 --login returned error $? !"
+	if ! $iscsiadm -m discovery -o nonpersistent -t sendtargets -p $1 --login; then
+		echo "$iscsiadm -m discovery -t sendtargets -p $1 --login returned error $? !"
 		sleep 1;
 	fi
 }
 
=== modified file 'utils/statd/statd.c'
--- utils/statd/statd.c	2010-04-06 16:11:22 +0000
+++ utils/statd/statd.c	2012-08-05 05:01:18 +0000
@@ -190,7 +190,7 @@
 	char *av[6];
 	int ac = 0;
 
-	av[ac++] = "/sbin/sm-notify";
+	av[ac++] = "/usr/sbin/sm-notify";
 	if (run_mode & MODE_NODAEMON)
 		av[ac++] = "-d";
 	if (outport) {