/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * Copyright (C) 2004-2006 Cluster File Systems, Inc.
+ * GPL HEADER START
*
- * This file is part of Lustre, http://www.lustre.org.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Lustre is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
*
- * Lustre 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.
+ * 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 version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
*
- * You should have received a copy of the GNU General Public License
- * along with Lustre; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
*/
#include <stdlib.h>
#include <liblustre.h>
#include <lustre/lustre_user.h>
#include <lustre/lustre_idl.h>
-#include <libcfs/kp30.h>
-#define SETXID_PATHNAME "/etc/lustre/setxid.conf"
+#define PERM_PATHNAME "/etc/lustre/perm.conf"
/*
- * setxid permission file format is like this:
+ * permission file format is like this:
* {nid} {uid} {perms}
*
* '*' nid means any nid
* '*' uid means any uid
* the valid values for perms are:
- * setuid/setgid/setgrp -- enable corresponding perm
- * nosetuid/nosetgid/nosetgrp -- disable corresponding perm
+ * setuid/setgid/setgrp/rmtacl -- enable corresponding perm
+ * nosetuid/nosetgid/nosetgrp/normtacl -- disable corresponding perm
* they can be listed together, seperated 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,
{
va_list args;
- openlog(progname, LOG_PERROR, LOG_AUTHPRIV);
+ openlog(progname, LOG_PERROR | LOG_PID, LOG_AUTHPRIV);
va_start(args, fmt);
vsyslog(LOG_NOTICE, fmt, args);
- fprintf(stderr, fmt, args);
va_end(args);
closelog();
typedef struct {
char *name;
__u32 bit;
-} setxid_perm_type_t;
-
-static setxid_perm_type_t setxid_perm_types[] = {
- { "setuid", LUSTRE_SETUID_PERM },
- { "setgid", LUSTRE_SETGID_PERM },
- { "setgrp", LUSTRE_SETGRP_PERM },
+} 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 }
};
-static setxid_perm_type_t setxid_noperm_types[] = {
- { "nosetuid", LUSTRE_SETUID_PERM },
- { "nosetgid", LUSTRE_SETGID_PERM },
- { "nosetgrp", LUSTRE_SETGRP_PERM },
+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 }
};
-int parse_setxid_perm(__u32 *perm, __u32 *noperm, char *str)
+int parse_perm(__u32 *perm, __u32 *noperm, char *str)
{
char *start, *end;
char name[64];
- setxid_perm_type_t *pt;
+ perm_type_t *pt;
*perm = 0;
*noperm = 0;
if (start >= end)
break;
strncpy(name, start, end - start);
- for (pt = setxid_perm_types; pt->name; pt++) {
+ for (pt = perm_types; pt->name; pt++) {
if (!strcasecmp(name, pt->name)) {
*perm |= pt->bit;
break;
}
if (!pt->name) {
- for (pt = setxid_noperm_types; pt->name; pt++) {
+ for (pt = noperm_types; pt->name; pt++) {
if (!strcasecmp(name, pt->name)) {
*noperm |= pt->bit;
break;
return 0;
}
-int parse_setxid_perm_line(struct identity_downcall_data *data, char *line)
+int parse_perm_line(struct identity_downcall_data *data, char *line)
{
char uid_str[256], nid_str[256], perm_str[256];
lnet_nid_t nid;
__u32 perm, noperm;
int rc, i;
- if (data->idd_nperms >= N_SETXID_PERMS_MAX) {
- errlog("setxid permission count %d > max %d\n",
- data->idd_nperms, N_SETXID_PERMS_MAX);
+ if (data->idd_nperms >= N_PERMS_MAX) {
+ errlog("permission count %d > max %d\n",
+ data->idd_nperms, N_PERMS_MAX);
return -1;
}
}
}
- if (parse_setxid_perm(&perm, &noperm, perm_str)) {
+ if (parse_perm(&perm, &noperm, perm_str)) {
errlog("invalid perm %s\n", perm_str);
return -1;
}
return 0;
}
-int get_setxid_perms(FILE *fp, struct identity_downcall_data *data)
+int get_perms(FILE *fp, struct identity_downcall_data *data)
{
char line[1024];
if (comment_line(line))
continue;
- if (parse_setxid_perm_line(data, line)) {
+ if (parse_perm_line(data, line)) {
errlog("parse line %s failed!\n", line);
return -1;
}
for (i = 0; i < data->idd_ngroups; i++)
printf("%s%u", i > 0 ? "," : "", data->idd_groups[i]);
printf("\n");
- printf("setxid permissions:\n"
+ printf("permissions:\n"
" nid\t\t\tperm\n");
for (i = 0; i < data->idd_nperms; i++) {
- struct setxid_perm_downcall_data *pdd;
+ struct perm_downcall_data *pdd;
pdd = &data->idd_perms[i];
- printf(" %#llx\t0x%x\n", pdd->pdd_nid, pdd->pdd_perm);
+ printf(" "LPX64"\t0x%x\n", pdd->pdd_nid, pdd->pdd_perm);
}
printf("\n");
}
goto downcall;
/* read permission database */
- perms_fp = fopen(SETXID_PATHNAME, "r");
+ perms_fp = fopen(PERM_PATHNAME, "r");
if (perms_fp) {
- get_setxid_perms(perms_fp, data);
+ get_perms(perms_fp, data);
fclose(perms_fp);
} else if (errno != ENOENT) {
errlog("open %s failed: %s\n",
- SETXID_PATHNAME, strerror(errno));
+ PERM_PATHNAME, strerror(errno));
}
downcall:
git://git.whamcloud.com / fs / lustre-release.git / blobdiff