use new Samba4 public dce_call functions

diff --git a/trunk/mapiproxy/dcesrv_mapiproxy.c b/trunk/mapiproxy/dcesrv_mapiproxy.c
index d7630db439093fc8cda8de2f6d5e3edafbe6049e..2300db546959916286c4749630fc547b6d41c955 100644 (file)
--- a/trunk/mapiproxy/dcesrv_mapiproxy.c
+++ b/trunk/mapiproxy/dcesrv_mapiproxy.c
@@ -101,9 +101,9 @@ static NTSTATUS mapiproxy_op_connect(struct dcesrv_call_state *dce_call,
                if (!NT_STATUS_IS_OK(status)) {
                        return status;
                }
-       } else if (dce_call->conn->auth_state.session_info->credentials) {
+       } else if (dcesrv_call_credentials(dce_call)) {
                DEBUG(5, ("dcerpc_mapiproxy: RPC proxy: Using delegated credentials\n"));
-               credentials = dce_call->conn->auth_state.session_info->credentials;
+               credentials = dcesrv_call_credentials(dce_call);
                acquired_creds = true;
        } else if (private_data->credentials) {
                DEBUG(5, ("dcerpc_mapiproxy: RPC proxy: Using acquired deletegated credentials\n"));
@@ -191,8 +191,8 @@ static NTSTATUS mapiproxy_op_bind_proxy(struct dcesrv_call_state *dce_call, cons
                return NT_STATUS_NET_WRITE_FAULT;
        }
 
-       if (dce_call->conn->auth_state.session_info->credentials) {
-               private_data->credentials = dce_call->conn->auth_state.session_info->credentials;
+       if (dcesrv_call_credentials(dce_call)) {
+               private_data->credentials = dcesrv_call_credentials(dce_call);
                DEBUG(5, ("dcerpc_mapiproxy: Delegated credentials acquired\n"));
        }
 

diff --git a/trunk/mapiproxy/libmapiproxy/libmapiproxy.h b/trunk/mapiproxy/libmapiproxy/libmapiproxy.h
index b7596bc69643341526f3de495d21af05001aba2b..66bdd02206be0599be1f29efb3a83cac70ef8d14 100644 (file)
--- a/trunk/mapiproxy/libmapiproxy/libmapiproxy.h
+++ b/trunk/mapiproxy/libmapiproxy/libmapiproxy.h
@@ -149,8 +149,7 @@ static const uint8_t GUID_NSPI[] = {
 
 #define        OPENCHANGE_LDB_NAME     "openchange.ldb"
 
-#define        NTLM_AUTH_IS_OK(dce_call) \
-(dce_call->conn->auth_state.session_info->info->authenticated == true)
+#define        NTLM_AUTH_IS_OK(dce_call) dcesrv_call_authenticated(dce_call)
 
 #ifndef __BEGIN_DECLS
 #ifdef __cplusplus