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_ads.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_ads.c')
| -rw-r--r-- | source3/utils/net_ads.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 0a9020bcfd..732ba8d8b6 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -817,7 +817,7 @@ static int net_ads_leave(int argc, const char **argv) struct cli_state *cli = NULL; TALLOC_CTX *ctx; DOM_SID *dom_sid = NULL; - char *short_domain_name = NULL; + const char *short_domain_name = NULL; if (!secrets_init()) { DEBUG(1,("Failed to initialise secrets database\n")); @@ -961,7 +961,8 @@ static NTSTATUS check_ads_config( void ) ********************************************************************/ static NTSTATUS net_join_domain(TALLOC_CTX *ctx, const char *servername, - struct sockaddr_storage *pss, char **domain, + struct sockaddr_storage *pss, + const char **domain, DOM_SID **dom_sid, const char *password) { @@ -1445,7 +1446,7 @@ int net_ads_join(int argc, const char **argv) ADS_STRUCT *ads = NULL; ADS_STATUS status; NTSTATUS nt_status; - char *short_domain_name = NULL; + const char *short_domain_name = NULL; char *tmp_password, *password; TALLOC_CTX *ctx = NULL; DOM_SID *domain_sid = NULL; |