diff options
author | Andrew Bartlett <abartlet@samba.org> | 2003-01-02 09:07:17 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-02 09:07:17 +0000 |
commit | 6d66fb308ab85bd9691d541764e683e6040cf724 (patch) | |
tree | 10b705921665cb7bafdd332ca53b8a943e13f0e5 /source3/utils/smbcacls.c | |
parent | c105c12d122e599fe57dde8b2b73c52231f0c1d2 (diff) | |
download | samba-6d66fb308ab85bd9691d541764e683e6040cf724.tar.gz samba-6d66fb308ab85bd9691d541764e683e6040cf724.tar.bz2 samba-6d66fb308ab85bd9691d541764e683e6040cf724.zip |
BIG patch...
This patch makes Samba compile cleanly with -Wwrite-strings.
- That is, all string literals are marked as 'const'. These strings are
always read only, this just marks them as such for passing to other functions.
What is most supprising is that I didn't need to change more than a few lines of code (all
in 'net', which got a small cleanup of net.h and extern variables). The rest
is just adding a lot of 'const'.
As far as I can tell, I have not added any new warnings - apart from making all
of tdbutil.c's function const (so they warn for adding that const string to
struct).
Andrew Bartlett
(This used to be commit 92a777d0eaa4fb3a1c7835816f93c6bdd456816d)
Diffstat (limited to 'source3/utils/smbcacls.c')
-rw-r--r-- | source3/utils/smbcacls.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 07b2aa7fec..e41edcf6f8 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -43,13 +43,13 @@ enum chown_mode {REQUEST_NONE, REQUEST_CHOWN, REQUEST_CHGRP}; enum exit_values {EXIT_OK, EXIT_FAILED, EXIT_PARSE_ERROR}; struct perm_value { - char *perm; + const char *perm; uint32 mask; }; /* These values discovered by inspection */ -static struct perm_value special_values[] = { +static const struct perm_value special_values[] = { { "R", 0x00120089 }, { "W", 0x00120116 }, { "X", 0x001200a0 }, @@ -59,7 +59,7 @@ static struct perm_value special_values[] = { { NULL, 0 }, }; -static struct perm_value standard_values[] = { +static const struct perm_value standard_values[] = { { "READ", 0x001200a9 }, { "CHANGE", 0x001301bf }, { "FULL", 0x001f01ff }, @@ -70,7 +70,7 @@ static struct cli_state *global_hack_cli; static POLICY_HND pol; static BOOL got_policy_hnd; -static struct cli_state *connect_one(char *share); +static struct cli_state *connect_one(const char *share); /* Open cli connection and policy handle */ @@ -161,7 +161,7 @@ static BOOL StringToSid(DOM_SID *sid, const char *str) /* print an ACE on a FILE, using either numeric or ascii representation */ static void print_ace(FILE *f, SEC_ACE *ace) { - struct perm_value *v; + const struct perm_value *v; fstring sidstr; int do_print = 0; uint32 got_mask; @@ -234,7 +234,7 @@ static BOOL parse_ace(SEC_ACE *ace, char *str) unsigned atype, aflags, amask; DOM_SID sid; SEC_ACCESS mask; - struct perm_value *v; + const struct perm_value *v; ZERO_STRUCTP(ace); p = strchr_m(str,':'); @@ -708,7 +708,7 @@ static int cacl_set(struct cli_state *cli, char *filename, /***************************************************** return a connection to a server *******************************************************/ -static struct cli_state *connect_one(char *share) +static struct cli_state *connect_one(const char *share) { struct cli_state *c; struct in_addr ip; |