diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 04:34:54 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 04:34:54 +0200 |
| commit | 4b942c2a7298987bbc596e89197ba76617580221 (patch) | |
| tree | 3dd5b4ec259f09f32f2d9aaacc3d1433194420f1 /source3/winbindd/idmap_adex | |
| parent | 6a689c23e83fef71a562a9009b92983d750f63cc (diff) | |
| parent | b7d2ff38f54250db52c495d26a2b2923e5dcc83e (diff) | |
| download | samba-4b942c2a7298987bbc596e89197ba76617580221.tar.gz samba-4b942c2a7298987bbc596e89197ba76617580221.tar.bz2 samba-4b942c2a7298987bbc596e89197ba76617580221.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/winbindd/idmap_adex')
| -rw-r--r-- | source3/winbindd/idmap_adex/gc_util.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_adex/idmap_adex.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_adex/idmap_adex.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/winbindd/idmap_adex/gc_util.c b/source3/winbindd/idmap_adex/gc_util.c index 87dd3c058d..6dc02336d5 100644 --- a/source3/winbindd/idmap_adex/gc_util.c +++ b/source3/winbindd/idmap_adex/gc_util.c @@ -101,7 +101,7 @@ done: ADS_STRUCT *ads = NULL; ADS_STATUS ads_status; NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL; - struct nbt_cldap_netlogon_5 cldap_reply; + struct NETLOGON_SAM_LOGON_RESPONSE_EX cldap_reply; TALLOC_CTX *frame = talloc_stackframe(); if (!gc || !domain) { diff --git a/source3/winbindd/idmap_adex/idmap_adex.c b/source3/winbindd/idmap_adex/idmap_adex.c index 23ab843e95..7596b1cbd8 100644 --- a/source3/winbindd/idmap_adex/idmap_adex.c +++ b/source3/winbindd/idmap_adex/idmap_adex.c @@ -454,7 +454,7 @@ NTSTATUS idmap_adex_init(void) return NT_STATUS_OK; } -NTSTATUS nss_info_adex_init(void) +static NTSTATUS nss_info_adex_init(void) { return idmap_adex_init(); } diff --git a/source3/winbindd/idmap_adex/idmap_adex.h b/source3/winbindd/idmap_adex/idmap_adex.h index f91bba8d07..e068d5c340 100644 --- a/source3/winbindd/idmap_adex/idmap_adex.h +++ b/source3/winbindd/idmap_adex/idmap_adex.h @@ -167,7 +167,7 @@ struct likewise_cell *cell_list_head(void); bool cell_list_add(struct likewise_cell *cell); bool cell_list_remove(struct likewise_cell * cell); -void cell_list_destroy(); +void cell_list_destroy(void); void cell_destroy(struct likewise_cell *c); void cell_set_forest_searches(struct likewise_cell *c, bool search); |