summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
authorGerald (Jerry) Carter <jerry@samba.org>2008-01-15 10:47:07 -0600
committerGerald (Jerry) Carter <jerry@samba.org>2008-01-15 10:47:07 -0600
commit43ddf12ef9ed400a3116c169700244ea137e593f (patch)
treeb1a128d74c7db4883f196ef8f1f79644a64cf43f /source3/winbindd
parent64e5f2fd8033b14d84d468fde32ac220d82aedb8 (diff)
parentee8cf0ce40820b3e1ec025339f2b25c0001fda13 (diff)
downloadsamba-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/winbindd')
-rw-r--r--source3/winbindd/winbindd_cm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index a9155a5763..908228717e 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1799,9 +1799,9 @@ static void set_dc_type_and_flags_connect( struct winbindd_domain *domain )
struct rpc_pipe_client *cli;
POLICY_HND pol;
- char *domain_name = NULL;
- char *dns_name = NULL;
- char *forest_name = NULL;
+ const char *domain_name = NULL;
+ const char *dns_name = NULL;
+ const char *forest_name = NULL;
DOM_SID *dom_sid = NULL;
ZERO_STRUCT( ctr );