X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fl_getidentity.c;h=ff7bb26ab827a4020f3f8c29b88fa6da8c04a507;hb=5b468e20ecc0b77460444393d1bb41867d99899d;hp=46bd22ccef1ee3697956d557c369ce860258c928;hpb=a8012629fa66bfeab28b41e23130d020d2367001;p=fs%2Flustre-release.git diff --git a/lustre/utils/l_getidentity.c b/lustre/utils/l_getidentity.c index 46bd22c..ff7bb26 100644 --- a/lustre/utils/l_getidentity.c +++ b/lustre/utils/l_getidentity.c @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,13 +23,14 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2014, Intel Corporation. + * Copyright (c) 2011, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ * Lustre is a trademark of Sun Microsystems, Inc. */ +#include #include #include #include @@ -48,10 +45,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #define PERM_PATHNAME "/etc/lustre/perm.conf" @@ -62,8 +59,8 @@ * '*' nid means any nid * '*' uid means any uid * the valid values for perms are: - * setuid/setgid/setgrp/rmtacl -- enable corresponding perm - * nosetuid/nosetgid/nosetgrp/normtacl -- disable corresponding perm + * setuid/setgid/setgrp -- enable corresponding perm + * nosetuid/nosetgid/nosetgrp -- disable corresponding perm * they can be listed together, separated by ',', * when perm and noperm are in the same line (item), noperm is preferential, * when they are in different lines (items), the latter is preferential, @@ -74,11 +71,12 @@ static char *progname; static void usage(void) { - fprintf(stderr, - "\nusage: %s {mdtname} {uid}\n" - "Normally invoked as an upcall from Lustre, set via:\n" - "/proc/fs/lustre/mdt/${mdtname}/identity_upcall\n", - progname); + fprintf(stderr, + "\nusage: %s {-d|mdtname} {uid}\n" + "Normally invoked as an upcall from Lustre, set via:\n" + "lctl set_param mdt.${mdtname}.identity_upcall={path to upcall}\n" + "\t-d: debug, print values to stdout instead of Lustre\n", + progname); } static int compare_u32(const void *v1, const void *v2) @@ -88,15 +86,15 @@ static int compare_u32(const void *v1, const void *v2) static void errlog(const char *fmt, ...) { - va_list args; + va_list args; - openlog(progname, LOG_PERROR | LOG_PID, LOG_AUTHPRIV); + openlog(progname, LOG_PERROR | LOG_PID, LOG_AUTHPRIV); - va_start(args, fmt); - vsyslog(LOG_NOTICE, fmt, args); - va_end(args); + va_start(args, fmt); + vsyslog(LOG_WARNING, fmt, args); + va_end(args); - closelog(); + closelog(); } int get_groups_local(struct identity_downcall_data *data, @@ -106,8 +104,6 @@ int get_groups_local(struct identity_downcall_data *data, unsigned int ngroups = 0; int ngroups_tmp; struct passwd *pw; - char *pw_name; - int namelen; int i; pw = getpwuid(data->idd_uid); @@ -118,25 +114,13 @@ int get_groups_local(struct identity_downcall_data *data, } data->idd_gid = pw->pw_gid; - namelen = sysconf(_SC_LOGIN_NAME_MAX); - if (namelen < _POSIX_LOGIN_NAME_MAX) - namelen = _POSIX_LOGIN_NAME_MAX; - - pw_name = malloc(namelen); - if (!pw_name) { - errlog("malloc error\n"); - data->idd_err = errno; - return -1; - } - strlcpy(pw_name, pw->pw_name, namelen); groups = data->idd_groups; /* Allocate array of size maxgroups instead of handling two * consecutive and potentially racy getgrouplist() calls. */ groups_tmp = malloc(maxgroups * sizeof(gid_t)); if (groups_tmp == NULL) { - free(pw_name); data->idd_err = errno ? errno : ENOMEM; errlog("malloc error=%u\n",data->idd_err); return -1; @@ -145,7 +129,6 @@ int get_groups_local(struct identity_downcall_data *data, ngroups_tmp = maxgroups; if (getgrouplist(pw->pw_name, pw->pw_gid, groups_tmp, &ngroups_tmp) < 0) { - free(pw_name); free(groups_tmp); data->idd_err = errno ? errno : EIDRM; errlog("getgrouplist() error for uid %u: error=%u\n", @@ -162,7 +145,6 @@ int get_groups_local(struct identity_downcall_data *data, qsort(groups, ngroups, sizeof(*groups), compare_u32); data->idd_ngroups = ngroups; - free(pw_name); free(groups_tmp); return 0; } @@ -198,21 +180,21 @@ typedef struct { } perm_type_t; static perm_type_t perm_types[] = { - { "setuid", CFS_SETUID_PERM }, - { "setgid", CFS_SETGID_PERM }, - { "setgrp", CFS_SETGRP_PERM }, - { "rmtacl", CFS_RMTACL_PERM }, - { "rmtown", CFS_RMTOWN_PERM }, - { 0 } + { "setuid", CFS_SETUID_PERM }, + { "setgid", CFS_SETGID_PERM }, + { "setgrp", CFS_SETGRP_PERM }, + { "rmtacl", 0 }, + { "rmtown", 0 }, + { 0 } }; static perm_type_t noperm_types[] = { - { "nosetuid", CFS_SETUID_PERM }, - { "nosetgid", CFS_SETGID_PERM }, - { "nosetgrp", CFS_SETGRP_PERM }, - { "normtacl", CFS_RMTACL_PERM }, - { "normtown", CFS_RMTOWN_PERM }, - { 0 } + { "nosetuid", CFS_SETUID_PERM }, + { "nosetgid", CFS_SETGID_PERM }, + { "nosetgrp", CFS_SETGRP_PERM }, + { "normtacl", 0 }, + { "normtown", 0 }, + { 0 } }; int parse_perm(__u32 *perm, __u32 *noperm, char *str) @@ -411,18 +393,19 @@ static void show_result(struct identity_downcall_data *data) pdd = &data->idd_perms[i]; - printf(" "LPX64"\t0x%x\n", pdd->pdd_nid, pdd->pdd_perm); + printf(" %#jx\t0x%x\n", (uintmax_t)pdd->pdd_nid, + pdd->pdd_perm); } printf("\n"); } int main(int argc, char **argv) { - char *end; - struct identity_downcall_data *data = NULL; - char procname[1024]; - unsigned long uid; - int fd, rc = -EINVAL, size, maxgroups; + char *end; + struct identity_downcall_data *data = NULL; + glob_t path; + unsigned long uid; + int fd, rc = -EINVAL, size, maxgroups; progname = basename(argv[0]); if (argc != 3) { @@ -466,32 +449,39 @@ int main(int argc, char **argv) rc = get_perms(data); downcall: - if (getenv("L_GETIDENTITY_TEST")) { - show_result(data); - rc = 0; - goto out; - } + if (strcmp(argv[1], "-d") == 0 || getenv("L_GETIDENTITY_TEST")) { + show_result(data); + rc = 0; + goto out; + } - snprintf(procname, sizeof(procname), - "/proc/fs/lustre/mdt/%s/identity_info", argv[1]); - fd = open(procname, O_WRONLY); - if (fd < 0) { - errlog("can't open file %s: %s\n", procname, strerror(errno)); - rc = -1; - goto out; - } + rc = cfs_get_param_paths(&path, "mdt/%s/identity_info", argv[1]); + if (rc != 0) { + rc = -errno; + goto out; + } - rc = write(fd, data, size); - close(fd); - if (rc != size) { - errlog("partial write ret %d: %s\n", rc, strerror(errno)); - rc = -1; - } else { - rc = 0; - } + fd = open(path.gl_pathv[0], O_WRONLY); + if (fd < 0) { + errlog("can't open file '%s':%s\n", path.gl_pathv[0], + strerror(errno)); + rc = -errno; + goto out_params; + } + + rc = write(fd, data, size); + close(fd); + if (rc != size) { + errlog("partial write ret %d: %s\n", rc, strerror(errno)); + rc = -1; + } else { + rc = 0; + } +out_params: + cfs_free_param_data(&path); out: - if (data != NULL) - free(data); - return rc; + if (data != NULL) + free(data); + return rc; }