diff options
| author | Jeremy Allison <jra@samba.org> | 2008-01-15 10:19:47 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-01-15 10:19:47 -0800 |
| commit | 9c63e1820bab51a7cc09878d78ddce061c3292ec (patch) | |
| tree | 9e88fcb9ad8012e26c1e70b9e0a07b1f23f9e39f /source3/utils/net_rpc_join.c | |
| parent | 19e4e99bfb02b8fa722883b04237ad714d402cb3 (diff) | |
| parent | ee8cf0ce40820b3e1ec025339f2b25c0001fda13 (diff) | |
| download | samba-9c63e1820bab51a7cc09878d78ddce061c3292ec.tar.gz samba-9c63e1820bab51a7cc09878d78ddce061c3292ec.tar.bz2 samba-9c63e1820bab51a7cc09878d78ddce061c3292ec.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 6e17a56039be13ac1ef7004f15d154141bad7196)
Diffstat (limited to 'source3/utils/net_rpc_join.c')
| -rw-r--r-- | source3/utils/net_rpc_join.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index 0c25a53365..6e37f3c84c 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -155,7 +155,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) NTSTATUS result; int retval = 1; - char *domain = NULL; + const char *domain = NULL; uint32 num_rids, *name_types, *user_rids; uint32 flags = 0x3e8; char *acct_name; @@ -413,7 +413,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) /* Now store the secret in the secrets database */ - strupper_m(domain); + strupper_m(CONST_DISCARD(char *, domain)); if (!secrets_store_domain_sid(domain, domain_sid)) { DEBUG(0, ("error storing domain sid for %s\n", domain)); |