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/nbt_server/dgram | |
| 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/nbt_server/dgram')
| -rw-r--r-- | source4/nbt_server/dgram/netlogon.c | 2 | ||||
| -rw-r--r-- | source4/nbt_server/dgram/ntlogon.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c index a3a7552f6a..e5c82280e3 100644 --- a/source4/nbt_server/dgram/netlogon.c +++ b/source4/nbt_server/dgram/netlogon.c @@ -161,7 +161,7 @@ void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot, { NTSTATUS status = NT_STATUS_NO_MEMORY; struct nbtd_interface *iface = - talloc_get_type(dgmslot->private, struct nbtd_interface); + talloc_get_type(dgmslot->private_data, struct nbtd_interface); struct nbt_netlogon_packet *netlogon = talloc(dgmslot, struct nbt_netlogon_packet); struct nbtd_iface_name *iname; diff --git a/source4/nbt_server/dgram/ntlogon.c b/source4/nbt_server/dgram/ntlogon.c index 352be34489..87e76e08ee 100644 --- a/source4/nbt_server/dgram/ntlogon.c +++ b/source4/nbt_server/dgram/ntlogon.c @@ -76,7 +76,7 @@ void nbtd_mailslot_ntlogon_handler(struct dgram_mailslot_handler *dgmslot, { NTSTATUS status = NT_STATUS_NO_MEMORY; struct nbtd_interface *iface = - talloc_get_type(dgmslot->private, struct nbtd_interface); + talloc_get_type(dgmslot->private_data, struct nbtd_interface); struct nbt_ntlogon_packet *ntlogon = talloc(dgmslot, struct nbt_ntlogon_packet); struct nbtd_iface_name *iname; |