Print this page
NEX-14666 Need to provide SMB 2.1 Client
NEX-17187 panic in smbfs_acl_store
NEX-17231 smbfs create xattr files finds wrong file
NEX-17224 smbfs lookup EINVAL should be ENOENT
NEX-17260 SMB1 client fails to list directory after NEX-14666
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
Reviewed by: Saso Kiselkov <saso.kiselkov@nexenta.com>
Reviewed by: Joyce McIntosh <joyce.mcintosh@nexenta.com>
and: (cleanup)
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/lib/libsmbfs/cflib.h
+++ new/usr/src/lib/libsmbfs/cflib.h
1 1 /*
2 2 * Copyright (c) 2000, Boris Popov
3 3 * All rights reserved.
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
7 7 * are met:
8 8 * 1. Redistributions of source code must retain the above copyright
9 9 * notice, this list of conditions and the following disclaimer.
10 10 * 2. Redistributions in binary form must reproduce the above copyright
11 11 * notice, this list of conditions and the following disclaimer in the
12 12 * documentation and/or other materials provided with the distribution.
13 13 * 3. All advertising materials mentioning features or use of this software
14 14 * must display the following acknowledgement:
15 15 * This product includes software developed by Boris Popov.
16 16 * 4. Neither the name of the author nor the names of any co-contributors
17 17 * may be used to endorse or promote products derived from this software
18 18 * without specific prior written permission.
19 19 *
20 20 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
21 21 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22 22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23 23 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
24 24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
↓ open down ↓ |
27 lines elided |
↑ open up ↑ |
28 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 30 * SUCH DAMAGE.
31 31 *
32 32 * $Id: cflib.h,v 1.1.1.1 2001/06/09 00:28:11 zarzycki Exp $
33 33 */
34 34
35 35 /*
36 36 * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
37 37 * Use is subject to license terms.
38 + *
39 + * Copyright 2018 Nexenta Systems, Inc. All rights reserved.
38 40 */
39 41
40 42 #ifndef _CFLIB_H_
41 43 #define _CFLIB_H_
42 44
43 45 struct rcfile;
44 46
45 47 /*
46 48 * A unified options parser
47 49 */
48 50 enum opt_argtype {OPTARG_STR, OPTARG_INT, OPTARG_BOOL};
49 51
50 52 struct opt_args;
51 53
52 54 typedef int opt_callback_t (struct opt_args *);
53 55
54 56 #define OPTFL_NONE 0x0000
55 57 #define OPTFL_HAVEMIN 0x0001
56 58 #define OPTFL_HAVEMAX 0x0002
57 59 #define OPTFL_MINMAX NAFL_HAVEMIN | NAFL_HAVEMAX
58 60
59 61 struct opt_args {
60 62 enum opt_argtype type;
61 63 int opt; /* command line option */
62 64 char *name; /* rc file equiv */
63 65 int flag; /* OPTFL_* */
64 66 int ival; /* int/bool values, or max len for str value */
65 67 char *str; /* string value */
66 68 int min; /* min for ival */
67 69 int max; /* max for ival */
68 70 opt_callback_t *fn; /* call back to validate */
69 71 };
70 72 typedef struct opt_args opt_args_t;
71 73
72 74 extern int cf_opterr, cf_optind, cf_optopt, cf_optreset;
73 75 extern const char *cf_optarg;
74 76 extern struct rcfile *smb_rc;
75 77
76 78 #ifdef __cplusplus
77 79 extern "C" {
|
↓ open down ↓ |
30 lines elided |
↑ open up ↑ |
78 80 #endif
79 81
80 82 int opt_args_parse(struct rcfile *, struct opt_args *, const char *,
81 83 opt_callback_t *);
82 84 int opt_args_parseopt(struct opt_args *, int, char *, opt_callback_t *);
83 85
84 86 int cf_getopt(int, char * const *, const char *);
85 87 void cf_opt_lock(void);
86 88 void cf_opt_unlock(void);
87 89
90 +char *cf_get_client_uuid(void);
91 +
88 92 int rc_getstringptr(struct rcfile *, const char *, const char *, char **);
89 93 int rc_getstring(struct rcfile *, const char *, const char *, size_t, char *);
90 94 int rc_getint(struct rcfile *, const char *, const char *, int *);
91 95 int rc_getbool(struct rcfile *, const char *, const char *, int *);
92 96
93 97 int smb_open_rcfile(char *);
94 98 void smb_close_rcfile(void);
95 99
96 100 #ifdef __cplusplus
97 101 }
98 102 #endif
99 103
100 104 #endif /* _CFLIB_H_ */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX