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/smb_server/management.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/smb_server/management.c')
| -rw-r--r-- | source4/smb_server/management.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/smb_server/management.c b/source4/smb_server/management.c index 4306b22c30..e58c278613 100644 --- a/source4/smb_server/management.c +++ b/source4/smb_server/management.c @@ -32,7 +32,8 @@ static NTSTATUS smbsrv_session_information(struct irpc_message *msg, struct smbsrv_information *r) { - struct smbsrv_connection *smb_conn = talloc_get_type(msg->private, struct smbsrv_connection); + struct smbsrv_connection *smb_conn = talloc_get_type(msg->private_data, + struct smbsrv_connection); int i=0, count=0; struct smbsrv_session *sess; @@ -75,7 +76,8 @@ static NTSTATUS smbsrv_session_information(struct irpc_message *msg, static NTSTATUS smbsrv_tcon_information(struct irpc_message *msg, struct smbsrv_information *r) { - struct smbsrv_connection *smb_conn = talloc_get_type(msg->private, struct smbsrv_connection); + struct smbsrv_connection *smb_conn = talloc_get_type(msg->private_data, + struct smbsrv_connection); int i=0, count=0; struct smbsrv_tcon *tcon; |