gssd: Switch to use standard GSSAPI by default

[nfs-utils.git] / support / nfs / exports.c

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index c250383a1b2fe2ada93bc5c8bf172fc02e3ad49b..6c08a2ba9ad54e2d4ce230dab71a6df9da8bab03 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -39,12 +39,6 @@ struct flav_info flav_map[] = {
        { "krb5",       RPC_AUTH_GSS_KRB5       },
        { "krb5i",      RPC_AUTH_GSS_KRB5I      },
        { "krb5p",      RPC_AUTH_GSS_KRB5P      },
-       { "lipkey",     RPC_AUTH_GSS_LKEY       },
-       { "lipkey-i",   RPC_AUTH_GSS_LKEYI      },
-       { "lipkey-p",   RPC_AUTH_GSS_LKEYP      },
-       { "spkm3",      RPC_AUTH_GSS_SPKM       },
-       { "spkm3i",     RPC_AUTH_GSS_SPKMI      },
-       { "spkm3p",     RPC_AUTH_GSS_SPKMP      },
        { "unix",       AUTH_UNIX               },
        { "sys",        AUTH_SYS                },
        { "null",       AUTH_NULL               },
@@ -649,6 +643,8 @@ bad_option:
                        cp++;
        }
 
+       if (ep->e_secinfo[0].flav == NULL)
+               secinfo_addflavor(find_flavor("sys"), ep);
        fix_pseudoflavor_flags(ep);
        ep->e_squids = squids;
        ep->e_sqgids = sqgids;
@@ -784,8 +780,9 @@ struct export_features *get_export_features(void)
        fd = open(path, O_RDONLY);
        if (fd == -1)
                goto good;
-       fd = read(fd, buf, 50);
-       if (fd == -1)
+       c = read(fd, buf, 50);
+       close(fd);
+       if (c == -1)
                goto err;
        c = sscanf(buf, "%x %x", &ef.flags, &ef.secinfo_flags);
        if (c != 2)