diff options
| author | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2008-01-16 00:45:06 +0000 |
|---|---|---|
| committer | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2008-01-16 00:45:06 +0000 |
| commit | 6e94cbdc30afc3c9b5d2504aa8649fa9c87af7aa (patch) | |
| tree | 6d6f4fbb0d3a4a4763c178e32d220c76f3deae0d /source3/utils/net_ads.c | |
| parent | 9788383a6c08189564cd18a824aab4ccdbe57a21 (diff) | |
| parent | 9a6a5fff9ca387ec698eaae2b3abc6a1937f2bab (diff) | |
| download | samba-6e94cbdc30afc3c9b5d2504aa8649fa9c87af7aa.tar.gz samba-6e94cbdc30afc3c9b5d2504aa8649fa9c87af7aa.tar.bz2 samba-6e94cbdc30afc3c9b5d2504aa8649fa9c87af7aa.zip | |
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit f963d57096184dd9381fcc5f175150d27460ea7a)
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; |