nfsidmap: Allow keys to be cleared from the keyring

Added the '-c' command line argument that will
clear all the keys from the keyring.

Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/nfsidmap/nfsidmap.c b/utils/nfsidmap/nfsidmap.c
index 6a09f38113b5adb6aab7ff481d4ec7873ec1e21d..cec2cb307e234092d80a8153414ca4ddac04a0cc 100644 (file)
--- a/utils/nfsidmap/nfsidmap.c
+++ b/utils/nfsidmap/nfsidmap.c
@@ -13,13 +13,19 @@
 #include "xlog.h"
 
 int verbose = 0;
 #include "xlog.h"
 
 int verbose = 0;

-char *usage="Usage: %s [-v] [-t timeout] key desc";
+char *usage="Usage: %s [-v] [-c || [-t timeout] key desc]";

 
 #define MAX_ID_LEN   11
 #define IDMAP_NAMESZ 128
 #define USER  1
 #define GROUP 0
 
 
 #define MAX_ID_LEN   11
 #define IDMAP_NAMESZ 128
 #define USER  1
 #define GROUP 0
 

+#define PROCKEYS "/proc/keys"
+#ifndef DEFAULT_KEYRING
+#define DEFAULT_KEYRING "id_resolver"
+#endif
+
+

 /*
  * Find either a user or group id based on the name@domain string
  */
 /*
  * Find either a user or group id based on the name@domain string
  */


@@ -87,6 +93,50 @@ int name_lookup(char *id, key_serial_t key, int type)
 out:
        return rc;
 }
 out:
        return rc;
 }

+/*
+ * Clear all the keys on the given keyring
+ */
+static int keyring_clear(char *keyring)
+{
+       FILE *fp;
+       char buf[BUFSIZ];
+       key_serial_t key;
+
+       xlog_syslog(0);
+       if (keyring == NULL)
+               keyring = DEFAULT_KEYRING;
+
+       if ((fp = fopen(PROCKEYS, "r")) == NULL) {
+               xlog_err("fopen(%s) failed: %m", PROCKEYS);
+               return 1;
+       }
+
+       while(fgets(buf, BUFSIZ, fp) != NULL) {
+               if (strstr(buf, "keyring") == NULL)
+                       continue;
+               if (strstr(buf, keyring) == NULL)
+                       continue;
+               if (verbose) {
+                       *(strchr(buf, '\n')) = '\0';
+                       xlog_warn("clearing '%s'", buf);
+               }
+               /*
+                * The key is the first arugment in the string
+                */
+               *(strchr(buf, ' ')) = '\0';
+               sscanf(buf, "%x", &key);
+               if (keyctl_clear(key) < 0) {
+                       xlog_err("keyctl_clear(0x%x) failed: %m", key);
+                       fclose(fp);
+                       return 1;
+               }
+               fclose(fp);
+               return 0;
+       }
+       xlog_err("'%s' keyring was not found.", keyring);
+       fclose(fp);
+       return 1;
+}

 
 int main(int argc, char **argv)
 {
 
 int main(int argc, char **argv)
 {


@@ -97,6 +147,7 @@ int main(int argc, char **argv)
        int timeout = 600;
        key_serial_t key;
        char *progname;
        int timeout = 600;
        key_serial_t key;
        char *progname;

+       int clearring;

 
        /* Set the basename */
        if ((progname = strrchr(argv[0], '/')) != NULL)
 
        /* Set the basename */
        if ((progname = strrchr(argv[0], '/')) != NULL)


@@ -105,11 +156,12 @@ int main(int argc, char **argv)
                progname = argv[0];
 
        xlog_open(progname);
                progname = argv[0];
 
        xlog_open(progname);

-       xlog_syslog(1);
-       xlog_stderr(0);

 
 

-       while ((opt = getopt(argc, argv, "t:v")) != -1) {
+       while ((opt = getopt(argc, argv, "ct:v")) != -1) {

                switch (opt) {
                switch (opt) {

+               case 'c':
+                       clearring++;
+                       break;

                case 'v':
                        verbose++;
                        break;
                case 'v':
                        verbose++;
                        break;


@@ -122,6 +174,12 @@ int main(int argc, char **argv)
                }
        }
 
                }
        }
 

+       if (clearring) {
+               rc = keyring_clear(DEFAULT_KEYRING);
+               return rc;              
+       }
+
+       xlog_stderr(0);

        if ((argc - optind) != 2) {
                xlog_err("Bad arg count. Check /etc/request-key.conf");
                xlog_warn(usage, progname);
        if ((argc - optind) != 2) {
                xlog_err("Bad arg count. Check /etc/request-key.conf");
                xlog_warn(usage, progname);

diff --git a/utils/nfsidmap/nfsidmap.man b/utils/nfsidmap/nfsidmap.man
index c67aab6087c8535796e2740b52d5148158a23e1c..9badb3f6f31f9c3b8ffc2ae170dec97c2fbb8eff 100644 (file)
--- a/utils/nfsidmap/nfsidmap.man
+++ b/utils/nfsidmap/nfsidmap.man
@@ -7,6 +7,8 @@
 nfsidmap \- The NFS idmapper upcall program
 .SH SYNOPSIS
 .B "nfsidmap [-v] [-t timeout] key desc"
 nfsidmap \- The NFS idmapper upcall program
 .SH SYNOPSIS
 .B "nfsidmap [-v] [-t timeout] key desc"

+.br
+.B "nfsidmap [-v] [-c]"

 .SH DESCRIPTION
 The file
 .I /usr/sbin/nfsidmap
 .SH DESCRIPTION
 The file
 .I /usr/sbin/nfsidmap


@@ -14,10 +16,18 @@ is used by the NFS idmapper to translate user and group ids into names, and to
 translate user and group names into ids. Idmapper uses request-key to perform
 the upcall and cache the result.
 .I /usr/sbin/nfsidmap
 translate user and group names into ids. Idmapper uses request-key to perform
 the upcall and cache the result.
 .I /usr/sbin/nfsidmap

-should only be called by request-key, and will perform the translation and
+is called by /sbin/request-key, and will perform the translation and

 initialize a key with the resulting information.
 initialize a key with the resulting information.

+.PP
+.I nfsidmap
+can also used to clear the keyring of all the keys.  
+This is useful when all the mappings have failed to due to an DNS outage
+or some other error resulting in all the cached uid/gid to be invalid.

 .SH OPTIONS
 .TP
 .SH OPTIONS
 .TP

+.B -c 
+Clear the keyring of all the keys.
+.TP

 .B -t timeout
 Set the expiration timer, in seconds, on the key.
 The default is 600 seconds (10 mins).
 .B -t timeout
 Set the expiration timer, in seconds, on the key.
 The default is 600 seconds (10 mins).