diff options
| author | Gerald (Jerry) Carter <jerry@samba.org> | 2008-01-15 10:47:07 -0600 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2008-01-15 10:47:07 -0600 |
| commit | 43ddf12ef9ed400a3116c169700244ea137e593f (patch) | |
| tree | b1a128d74c7db4883f196ef8f1f79644a64cf43f /source3/utils/net_rpc_join.c | |
| parent | 64e5f2fd8033b14d84d468fde32ac220d82aedb8 (diff) | |
| parent | ee8cf0ce40820b3e1ec025339f2b25c0001fda13 (diff) | |
| download | samba-43ddf12ef9ed400a3116c169700244ea137e593f.tar.gz samba-43ddf12ef9ed400a3116c169700244ea137e593f.tar.bz2 samba-43ddf12ef9ed400a3116c169700244ea137e593f.zip | |
Merge commit 'samba/v3-2-test' into v3-2-stable
(This used to be commit 5a527476a07ea43178dc5afeaf8ad78da8a4080c)
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)); |