diff options
Diffstat (limited to 'source4/winbind')
-rw-r--r-- | source4/winbind/wb_async_helpers.c | 9 | ||||
-rw-r--r-- | source4/winbind/wb_async_helpers.h | 4 | ||||
-rw-r--r-- | source4/winbind/wb_pam_auth.c | 3 | ||||
-rw-r--r-- | source4/winbind/wb_server.h | 1 |
4 files changed, 10 insertions, 7 deletions
diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c index cf4c83d767..c8611e6300 100644 --- a/source4/winbind/wb_async_helpers.c +++ b/source4/winbind/wb_async_helpers.c @@ -29,8 +29,7 @@ #include "librpc/gen_ndr/ndr_irpc.h" #include "libcli/auth/credentials.h" #include "libcli/security/proto.h" -#include "libcli/auth/proto.h" -#include "auth/credentials/credentials.h" +#include "libcli/auth/libcli_auth.h" #include "winbind/wb_helper.h" @@ -555,7 +554,7 @@ struct cmd_checkmachacc_state { static void cmd_checkmachacc_recv_init(struct composite_context *ctx); -struct composite_context *wb_cmd_checkmachacc_send(struct wbsrv_call *call) + struct composite_context *wb_cmd_checkmachacc_send(struct wbsrv_call *call) { struct composite_context *result, *ctx; struct cmd_checkmachacc_state *state; @@ -599,14 +598,14 @@ static void cmd_checkmachacc_recv_init(struct composite_context *ctx) composite_done(state->ctx); } -NTSTATUS wb_cmd_checkmachacc_recv(struct composite_context *c) + NTSTATUS wb_cmd_checkmachacc_recv(struct composite_context *c) { NTSTATUS status = composite_wait(c); talloc_free(c); return status; } -NTSTATUS wb_cmd_checkmachacc(struct wbsrv_call *call) + NTSTATUS wb_cmd_checkmachacc(struct wbsrv_call *call) { struct composite_context *c = wb_cmd_checkmachacc_send(call); return wb_cmd_checkmachacc_recv(c); diff --git a/source4/winbind/wb_async_helpers.h b/source4/winbind/wb_async_helpers.h index 2754a8acd6..af6a52b1d1 100644 --- a/source4/winbind/wb_async_helpers.h +++ b/source4/winbind/wb_async_helpers.h @@ -20,6 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __WB_ASYNC_HELPERS_H__ +#define __WB_ASYNC_HELPERS_H__ + #include "librpc/gen_ndr/lsa.h" struct wb_sid_object { @@ -29,3 +32,4 @@ struct wb_sid_object { const char *name; }; +#endif /* __WB_ASYNC_HELPERS_H__ */ diff --git a/source4/winbind/wb_pam_auth.c b/source4/winbind/wb_pam_auth.c index 97f0845467..2967414fec 100644 --- a/source4/winbind/wb_pam_auth.c +++ b/source4/winbind/wb_pam_auth.c @@ -26,8 +26,7 @@ #include "winbind/wb_server.h" #include "smbd/service_task.h" #include "libcli/auth/credentials.h" -#include "libcli/auth/proto.h" -#include "auth/credentials/credentials.h" +#include "libcli/auth/libcli_auth.h" /* Oh, there is so much to keep an eye on when authenticating a user. Oh my! */ struct pam_auth_crap_state { diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h index 7906e52de6..2a2aec20ea 100644 --- a/source4/winbind/wb_server.h +++ b/source4/winbind/wb_server.h @@ -146,4 +146,5 @@ struct wbsrv_samba3_call { struct netr_LMSessionKey; struct netr_UserSessionKey; +#include "winbind/wb_async_helpers.h" #include "winbind/wb_proto.h" |