diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /source4/libnet/libnet_samdump_keytab.c | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'source4/libnet/libnet_samdump_keytab.c')
| -rw-r--r-- | source4/libnet/libnet_samdump_keytab.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/libnet/libnet_samdump_keytab.c b/source4/libnet/libnet_samdump_keytab.c index 2218d20f6b..a1846b81da 100644 --- a/source4/libnet/libnet_samdump_keytab.c +++ b/source4/libnet/libnet_samdump_keytab.c @@ -74,14 +74,14 @@ struct libnet_samdump_keytab_data { struct loadparm_context *lp_ctx; }; -static NTSTATUS libnet_samdump_keytab_fn(TALLOC_CTX *mem_ctx, - void *private, +static NTSTATUS libnet_samdump_keytab_fn(TALLOC_CTX *mem_ctx, + void *private_data, enum netr_SamDatabaseID database, struct netr_DELTA_ENUM *delta, char **error_string) { NTSTATUS nt_status = NT_STATUS_OK; - struct libnet_samdump_keytab_data *data = private; + struct libnet_samdump_keytab_data *data = private_data; *error_string = NULL; switch (delta->delta_type) { case NETR_DELTA_USER: |