summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
Diffstat (limited to 'usr')
-rw-r--r--usr/src/cmd/fs.d/Makefile4
-rw-r--r--usr/src/cmd/fs.d/nfs/lib/nfs_sec.c29
-rw-r--r--usr/src/cmd/fs.d/nfs/lib/smfcfg.c28
-rw-r--r--usr/src/cmd/fs.d/nfs/mountd/Makefile16
-rw-r--r--usr/src/cmd/fs.d/nfs/mountd/mountd.c48
-rw-r--r--usr/src/cmd/fs.d/nfs/mountd/nfs_cmd.c4
6 files changed, 52 insertions, 77 deletions
diff --git a/usr/src/cmd/fs.d/Makefile b/usr/src/cmd/fs.d/Makefile
index 054a67423d..8562ed1ed0 100644
--- a/usr/src/cmd/fs.d/Makefile
+++ b/usr/src/cmd/fs.d/Makefile
@@ -53,7 +53,6 @@ all:= TARGET= all
install:= TARGET= install
clean:= TARGET= clean
clobber:= TARGET= clobber
-lint:= TARGET= lint
_msg:= TARGET= catalog
USRSBINF= df clri fsck volcopy ff
@@ -66,6 +65,7 @@ USRBIN2USRSBIN= df
USRXPG4BIN2USRSBIN= df
FSLIB= fslib.o
+CLEANFILES += $(FSLIB)
ROOTSBINPROG = $(ROOTFS_PROG:%=$(ROOTSBIN)/%)
ROOTUSRSBINLINKS = $(ROOTFS_PROG:%=$(ROOTUSRSBIN)/%)
@@ -200,8 +200,6 @@ clobber_local: clean_local
$(RM) $(PROG) $(ROOTFS_PROG) $(SPPROG) $(MNTTAB) $(DEFAULTFILES) \
$(CLOBBERFILES)
-lint:
-
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/cmd/fs.d/nfs/lib/nfs_sec.c b/usr/src/cmd/fs.d/nfs/lib/nfs_sec.c
index 06dc44a12c..6b387ca674 100644
--- a/usr/src/cmd/fs.d/nfs/lib/nfs_sec.c
+++ b/usr/src/cmd/fs.d/nfs/lib/nfs_sec.c
@@ -86,8 +86,7 @@ extern bool_t rpc_gss_qop_to_num(char *, char *, uint_t *);
* blank() returns true if the line is a blank line, 0 otherwise
*/
static int
-blank(cp)
-char *cp;
+blank(char *cp)
{
while (*cp && isspace(*cp)) {
cp++;
@@ -99,8 +98,7 @@ char *cp;
* comment() returns true if the line is a comment, 0 otherwise.
*/
static int
-comment(cp)
-char *cp;
+comment(char *cp)
{
while (*cp && isspace(*cp)) {
cp++;
@@ -114,9 +112,7 @@ char *cp;
* and returns the integer value associated with the string.
*/
static unsigned long
-getvalue(cp, sc_data)
-char *cp;
-struct sc_data sc_data[];
+getvalue(char *cp, struct sc_data sc_data[])
{
int i; /* used to index through the given struct sc_data array */
@@ -133,8 +129,7 @@ struct sc_data sc_data[];
* the left.
*/
static void
-shift1left(p)
-char *p;
+shift1left(char *p)
{
for (; *p; p++)
*p = *(p + 1);
@@ -149,9 +144,7 @@ char *p;
* XXX We should make this MT-hot by making it more like strtok_r().
*/
static char *
-gettoken(cp, skip)
-char *cp;
-int skip;
+gettoken(char *cp, int skip)
{
static char *savep; /* the place where we left off */
register char *p; /* the beginning of the new token */
@@ -703,7 +696,7 @@ nfs_sec_nego(rpcprog_t vers, CLIENT *clnt, char *fspath, struct snego_t *snego)
/* ARGSUSED */
static int
get_seconfig(int whichway, char *name, int num,
- rpc_gss_service_t service, seconfig_t *entryp)
+ rpc_gss_service_t service, seconfig_t *entryp)
{
char line[BUFSIZ]; /* holds each line of NFSSEC_CONF */
FILE *fp; /* file stream for NFSSEC_CONF */
@@ -860,7 +853,7 @@ nfs_free_secdata(sec_data_t *secdata)
*/
sec_data_t *
nfs_clnt_secdata(seconfig_t *secp, char *hostname, struct knetconfig *knconf,
- struct netbuf *syncaddr, int flags)
+ struct netbuf *syncaddr, int flags)
{
char netname[MAXNETNAMELEN+1];
sec_data_t *secdata;
@@ -1058,16 +1051,16 @@ nfs_syslog_scerr(int scerror, char msg[])
{
switch (scerror) {
case SC_NOMEM :
- sprintf(msg, "%s : no memory", NFSSEC_CONF);
+ (void) sprintf(msg, "%s : no memory", NFSSEC_CONF);
return (0);
case SC_OPENFAIL :
- sprintf(msg, "can not open %s", NFSSEC_CONF);
+ (void) sprintf(msg, "can not open %s", NFSSEC_CONF);
return (0);
case SC_NOTFOUND :
- sprintf(msg, "has no entry in %s", NFSSEC_CONF);
+ (void) sprintf(msg, "has no entry in %s", NFSSEC_CONF);
return (0);
case SC_BADENTRIES :
- sprintf(msg, "bad entry in %s", NFSSEC_CONF);
+ (void) sprintf(msg, "bad entry in %s", NFSSEC_CONF);
return (0);
default:
msg[0] = '\0';
diff --git a/usr/src/cmd/fs.d/nfs/lib/smfcfg.c b/usr/src/cmd/fs.d/nfs/lib/smfcfg.c
index 892f0cd052..40922c895b 100644
--- a/usr/src/cmd/fs.d/nfs/lib/smfcfg.c
+++ b/usr/src/cmd/fs.d/nfs/lib/smfcfg.c
@@ -40,7 +40,7 @@ fs_smf_init(char *fmri, char *instance)
* svc name is of the form svc://network/fs/server:instance1
* FMRI portion is /network/fs/server
*/
- snprintf(srv, MAXPATHLEN, "%s", fmri + strlen("svc:/"));
+ (void) snprintf(srv, MAXPATHLEN, "%s", fmri + strlen("svc:/"));
svcname = strrchr(srv, ':');
if (svcname != NULL)
*svcname = '\0';
@@ -96,7 +96,7 @@ fs_smf_fini(fs_smfhandle_t *handle)
scf_property_destroy(handle->fs_property);
scf_value_destroy(handle->fs_value);
if (handle->fs_handle != NULL) {
- scf_handle_unbind(handle->fs_handle);
+ (void) scf_handle_unbind(handle->fs_handle);
scf_handle_destroy(handle->fs_handle);
}
free(handle);
@@ -125,15 +125,15 @@ fs_smf_set_prop(smf_fstype_t fstype, char *prop_name, char *valbuf,
* The SVC names we are using currently are already
* appended by default. Fix this for instances project.
*/
- snprintf(srv, MAXPATHLEN, "%s", fmri);
+ (void) snprintf(srv, MAXPATHLEN, "%s", fmri);
p = strstr(fmri, ":default");
if (p == NULL) {
- strcat(srv, ":");
+ (void) strcat(srv, ":");
if (instance == NULL)
instance = "default";
if (strlen(srv) + strlen(instance) > MAXPATHLEN)
goto out;
- strncat(srv, instance, strlen(instance));
+ (void) strncat(srv, instance, strlen(instance));
}
svcname = srv;
phandle = fs_smf_init(fmri, instance);
@@ -223,9 +223,11 @@ fs_smf_set_prop(smf_fstype_t fstype, char *prop_name, char *valbuf,
ret = SMF_SYSTEM_ERR;
}
break;
+ default:
+ break;
}
if (ret != SMF_SYSTEM_ERR)
- scf_transaction_commit(tran);
+ (void) scf_transaction_commit(tran);
}
out:
if (tran != NULL)
@@ -256,15 +258,15 @@ fs_smf_get_prop(smf_fstype_t fstype, char *prop_name, char *cbuf,
* The SVC names we are using currently are already
* appended by default. Fix this for instances project.
*/
- snprintf(srv, MAXPATHLEN, "%s", fmri);
+ (void) snprintf(srv, MAXPATHLEN, "%s", fmri);
p = strstr(fmri, ":default");
if (p == NULL) {
- strcat(srv, ":");
+ (void) strcat(srv, ":");
if (instance == NULL)
instance = "default";
if (strlen(srv) + strlen(instance) > MAXPATHLEN)
goto out;
- strncat(srv, instance, strlen(instance));
+ (void) strncat(srv, instance, strlen(instance));
}
svcname = srv;
phandle = fs_smf_init(fmri, instance);
@@ -312,7 +314,7 @@ fs_smf_get_prop(smf_fstype_t fstype, char *prop_name, char *cbuf,
}
ret = 0;
*bufsz = len;
- break;
+ break;
case SCF_TYPE_INTEGER:
if (scf_value_get_integer(val, &valint) != 0) {
ret = scf_error();
@@ -324,7 +326,7 @@ fs_smf_get_prop(smf_fstype_t fstype, char *prop_name, char *cbuf,
goto out;
}
ret = 0;
- break;
+ break;
case SCF_TYPE_BOOLEAN:
if (scf_value_get_boolean(val, &bval) != 0) {
ret = scf_error();
@@ -339,7 +341,9 @@ fs_smf_get_prop(smf_fstype_t fstype, char *prop_name, char *cbuf,
ret = SA_BAD_VALUE;
goto out;
}
- break;
+ break;
+ default:
+ break;
}
} else {
ret = scf_error();
diff --git a/usr/src/cmd/fs.d/nfs/mountd/Makefile b/usr/src/cmd/fs.d/nfs/mountd/Makefile
index 2daa3f38ba..505ab301e3 100644
--- a/usr/src/cmd/fs.d/nfs/mountd/Makefile
+++ b/usr/src/cmd/fs.d/nfs/mountd/Makefile
@@ -31,10 +31,10 @@ ATTMK = $(TYPEPROG)
include ../../Makefile.fstype
-COMMON = $(FSLIB) nfs_sec.o sharetab.o daemon.o smfcfg.o
+COMMON = nfs_sec.o sharetab.o daemon.o smfcfg.o
LOCAL = mountd.o netgroup.o rmtab.o nfsauth.o \
nfsauth_xdr.o exportlist.o hashset.o nfs_cmd.o
-OBJS = $(LOCAL) $(COMMON)
+OBJS = $(FSLIB) $(LOCAL) $(COMMON)
SRCS = $(LOCAL:%.o=%.c) $(FSLIBSRC) ../lib/nfs_sec.c \
../lib/sharetab.c ../lib/daemon.c ../lib/smfcfg.c
DSRC = mountd_dt.d
@@ -43,10 +43,9 @@ LDLIBS += -lrpcsvc -lnsl -lbsm -lsocket -ltsnet -ltsol -lnvpair -lscf -lumem
CPPFLAGS += -D_REENTRANT -I../lib
CERRWARN += $(CNOWARN_UNINIT)
-CERRWARN += -_gcc=-Wno-switch
-# not linted
-SMATCH=off
+# unreachable code in mountd.c is to please the C compiler.
+mountd.o := SMOFF += check_unreachable
$(TYPEPROG): $(OBJS)
$(COMPILE.d) -s $(DSRC) -o $(DOBJ) $(OBJS)
@@ -65,8 +64,5 @@ daemon.o: ../lib/daemon.c
smfcfg.o: ../lib/smfcfg.c
$(COMPILE.c) ../lib/smfcfg.c
-lint:
- $(LINT.c) $(SRCS) $(LDLIBS)
-
-clean:
- $(RM) $(OBJS) $(DOBJ)
+clean:
+ $(RM) $(COMMON) $(LOCAL) $(DOBJ)
diff --git a/usr/src/cmd/fs.d/nfs/mountd/mountd.c b/usr/src/cmd/fs.d/nfs/mountd/mountd.c
index 4ccc82f4a0..1816deabc6 100644
--- a/usr/src/cmd/fs.d/nfs/mountd/mountd.c
+++ b/usr/src/cmd/fs.d/nfs/mountd/mountd.c
@@ -26,7 +26,7 @@
*/
/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
+/* All Rights Reserved */
/*
* Portions of this source code were derived from Berkeley 4.3 BSD
@@ -150,9 +150,8 @@ static logging_data *logging_tail = NULL;
static long ngroups_max; /* _SC_NGROUPS_MAX */
static long pw_size; /* _SC_GETPW_R_SIZE_MAX */
-/* ARGSUSED */
static void *
-nfsauth_svc(void *arg)
+nfsauth_svc(void *arg __unused)
{
int doorfd = -1;
uint_t darg;
@@ -327,7 +326,7 @@ do_logging_queue(logging_data *lq)
}
static void *
-logging_svc(void *arg)
+logging_svc(void *arg __unused)
{
logging_data *lq;
@@ -349,22 +348,6 @@ logging_svc(void *arg)
return (NULL);
}
-static int
-convert_int(int *val, char *str)
-{
- long lval;
-
- if (str == NULL || !isdigit(*str))
- return (-1);
-
- lval = strtol(str, &str, 10);
- if (*str != '\0' || lval > INT_MAX)
- return (-2);
-
- *val = (int)lval;
- return (0);
-}
-
/*
* This function is called for each configured network type to
* bind and register our RPC service programs.
@@ -396,7 +379,7 @@ md_svc_tp_create(struct netconfig *nconf)
strcmp(nconf->nc_protofmly, NC_INET6) == 0)) {
int err;
- snprintf(port_str, sizeof (port_str), "%u",
+ (void) snprintf(port_str, sizeof (port_str), "%u",
(unsigned short)mountd_port);
hs.h_host = HOST_SELF_BIND;
@@ -460,7 +443,7 @@ main(int argc, char *argv[])
int tmp;
struct netconfig *nconf;
NCONF_HANDLE *nc;
-
+ const char *errstr;
int pipe_fd = -1;
/*
@@ -523,19 +506,20 @@ main(int argc, char *argv[])
rejecting = 1;
break;
case 'm':
- if (convert_int(&tmp, optarg) != 0 || tmp < 1) {
+ tmp = strtonum(optarg, 1, INT_MAX, &errstr);
+ if (errstr != NULL) {
(void) fprintf(stderr, "%s: invalid "
- "max_threads option, using defaults\n",
- argv[0]);
+ "max_threads option: %s, using defaults\n",
+ argv[0], errstr);
break;
}
max_threads = tmp;
break;
case 'p':
- if (convert_int(&tmp, optarg) != 0 || tmp < 1 ||
- tmp > UINT16_MAX) {
+ tmp = strtonum(optarg, 1, UINT16_MAX, &errstr);
+ if (errstr != NULL) {
(void) fprintf(stderr, "%s: invalid port "
- "number\n", argv[0]);
+ "number: %s\n", argv[0], errstr);
break;
}
mountd_port = tmp;
@@ -939,7 +923,7 @@ done:
if (!svc_sendreply(transp, xdr_ppathcnf, (char *)&p))
log_cant_reply(transp);
if (path != NULL)
- svc_freeargs(transp, xdr_dirpath, (caddr_t)&path);
+ (void) svc_freeargs(transp, xdr_dirpath, (caddr_t)&path);
}
/*
@@ -1572,7 +1556,7 @@ reply:
}
if (path != NULL)
- svc_freeargs(transp, xdr_dirpath, (caddr_t)&path);
+ (void) svc_freeargs(transp, xdr_dirpath, (caddr_t)&path);
if (sh)
sharefree(sh);
@@ -3230,7 +3214,7 @@ umount(struct svc_req *rqstp)
* Without the hostname we can't do audit or delete
* this host from the mount entries.
*/
- svc_freeargs(transp, xdr_dirpath, (caddr_t)&path);
+ (void) svc_freeargs(transp, xdr_dirpath, (caddr_t)&path);
return;
}
@@ -3250,7 +3234,7 @@ umount(struct svc_req *rqstp)
cln_fini(&cln);
- svc_freeargs(transp, xdr_dirpath, (caddr_t)&path);
+ (void) svc_freeargs(transp, xdr_dirpath, (caddr_t)&path);
}
/*
diff --git a/usr/src/cmd/fs.d/nfs/mountd/nfs_cmd.c b/usr/src/cmd/fs.d/nfs/mountd/nfs_cmd.c
index b92a862d91..6bc35072f3 100644
--- a/usr/src/cmd/fs.d/nfs/mountd/nfs_cmd.c
+++ b/usr/src/cmd/fs.d/nfs/mountd/nfs_cmd.c
@@ -185,7 +185,7 @@ nfscmd_charmap_lookup(door_desc_t *dp, nfscmd_arg_t *args)
name = charmap_search(&nb, sh->sh_opts);
if (name != NULL) {
- strcpy(res.result.charmap.codeset, name);
+ (void) strcpy(res.result.charmap.codeset, name);
res.result.charmap.apply = B_TRUE;
res.error = NFSCMD_ERR_SUCCESS;
free(name);
@@ -231,7 +231,7 @@ nfscmd_vers_1(door_desc_t *dp, nfscmd_arg_t *args, size_t size)
void
nfscmd_func(void *cookie, char *dataptr, size_t arg_size,
- door_desc_t *dp, uint_t n_desc)
+ door_desc_t *dp, uint_t n_desc)
{
nfscmd_arg_t *args;
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-21 12:46:59 +0000