diff options
author | Kai Blin <kai@samba.org> | 2007-06-02 11:38:27 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:53:10 -0500 |
commit | 3fb4bd1c06a081f8f010ecfe66a9e18ed8413d66 (patch) | |
tree | b4689eeec25beb84f09cb9ad9104957d75e55cca /source4/nsswitch/wb_common.c | |
parent | e0f3a383b4aa15980e1b91a9355fd9e802be0c97 (diff) | |
download | samba-3fb4bd1c06a081f8f010ecfe66a9e18ed8413d66.tar.gz samba-3fb4bd1c06a081f8f010ecfe66a9e18ed8413d66.tar.bz2 samba-3fb4bd1c06a081f8f010ecfe66a9e18ed8413d66.zip |
r23311: Updating the samba4 winbind protocol to version 18.
nsswitch/winbindd_nss.h is just copied from SAMBA_3_0.
nsswitch/winbind_nss_config.h is copied from SAMBA_3_0, too, but I had to
drop some of the defines to make things build again.
Kai
(This used to be commit 553b7e146f52975b45941ba850140e312a280513)
Diffstat (limited to 'source4/nsswitch/wb_common.c')
-rw-r--r-- | source4/nsswitch/wb_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/nsswitch/wb_common.c b/source4/nsswitch/wb_common.c index e8c317b598..51f9deb5b0 100644 --- a/source4/nsswitch/wb_common.c +++ b/source4/nsswitch/wb_common.c @@ -38,7 +38,7 @@ void free_response(struct winbindd_response *response) /* Free any allocated extra_data */ if (response) - SAFE_FREE(response->extra_data); + SAFE_FREE(response->extra_data.data); } /* Initialise a request structure */ @@ -324,13 +324,13 @@ int winbind_open_pipe_sock(void) if (winbindd_request(WINBINDD_PRIV_PIPE_DIR, &request, &response) == NSS_STATUS_SUCCESS) { int fd; - if ((fd = winbind_named_pipe_sock(response.extra_data)) != -1) { + if ((fd = winbind_named_pipe_sock(response.extra_data.data)) != -1) { close(winbindd_fd); winbindd_fd = fd; } } - SAFE_FREE(response.extra_data); + SAFE_FREE(response.extra_data.data); return winbindd_fd; #else @@ -488,7 +488,7 @@ int read_reply(struct winbindd_response *response) the server. This has no meaning in the client's address space so we clear it out. */ - response->extra_data = NULL; + response->extra_data.data = NULL; /* Read variable length response */ @@ -498,11 +498,11 @@ int read_reply(struct winbindd_response *response) /* Mallocate memory for extra data */ - if (!(response->extra_data = malloc(extra_data_len))) { + if (!(response->extra_data.data = malloc(extra_data_len))) { return -1; } - if ((result2 = read_sock(response->extra_data, extra_data_len)) + if ((result2 = read_sock(response->extra_data.data, extra_data_len)) == -1) { free_response(response); return -1; |