summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/nsswitch/wb_common.c2
-rw-r--r--source3/nsswitch/winbindd.c27
-rw-r--r--source3/nsswitch/winbindd_nss.h13
3 files changed, 21 insertions, 21 deletions
diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c
index d3feaeb450..58b18ec458 100644
--- a/source3/nsswitch/wb_common.c
+++ b/source3/nsswitch/wb_common.c
@@ -58,6 +58,8 @@ void init_request(struct winbindd_request *request, int request_type)
static char *domain_env;
static BOOL initialised;
+ request->length = sizeof(struct winbindd_request);
+
request->cmd = (enum winbindd_cmd)request_type;
request->pid = getpid();
request->domain[0] = '\0';
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 0cbdb34033..01cd0eb55d 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -463,12 +463,14 @@ static void client_read(struct winbindd_cli_state *state)
/* Read data */
do {
- n = read(state->sock, state->read_buf_len + (char *)&state->request,
- sizeof(state->request) - state->read_buf_len);
+
+ n = read(state->sock, state->read_buf_len +
+ (char *)&state->request,
+ sizeof(state->request) - state->read_buf_len);
+
} while (n == -1 && errno == EINTR);
- DEBUG(10,("client_read: read %d bytes. Need %d more for a full request.\n", n,
- sizeof(state->request) - n - state->read_buf_len ));
+ DEBUG(10,("client_read: read %d bytes. Need %d more for a full request.\n", n, sizeof(state->request) - n - state->read_buf_len ));
/* Read failed, kill client */
@@ -664,8 +666,6 @@ static void process_loop(int accept_sock)
client_read(state);
-#if 0
- /* JRA - currently there's no length field in the request... */
/*
* If we have the start of a
* packet, then check the
@@ -674,19 +674,14 @@ static void process_loop(int accept_sock)
* Mock Swedish.
*/
- if (state->read_buf_len >= sizeof(int)
- && *(int *) state->buf != sizeof(state->request)) {
-
- struct winbindd_cli_state *rem_state = state;
-
+ if (state->read_buf_len >= sizeof(uint32)
+ && *(uint32 *) &state->request != sizeof(state->request)) {
DEBUG(0,("process_loop: Invalid request size (%d) send, should be (%d)\n",
- *(int *) rem_state->buf, sizeof(rem_state->request) ));
+ *(uint32 *) &state->request, sizeof(state->request)));
- state = state_next;
- remove_client(rem_state);
- continue;
+ remove_client(state);
+ break;
}
-#endif
/* A request packet might be
complete */
diff --git a/source3/nsswitch/winbindd_nss.h b/source3/nsswitch/winbindd_nss.h
index bac07fc42d..a88b1209ab 100644
--- a/source3/nsswitch/winbindd_nss.h
+++ b/source3/nsswitch/winbindd_nss.h
@@ -35,13 +35,16 @@
#define WINBINDD_DOMAIN_ENV "WINBINDD_DOMAIN" /* Environment variables */
#define WINBINDD_DONT_ENV "_NO_WINBINDD"
-/* Socket commands */
-
/* Update this when you change the interface. */
-#define WINBIND_INTERFACE_VERSION 1
+
+#define WINBIND_INTERFACE_VERSION 2
+
+/* Socket commands */
enum winbindd_cmd {
+ WINBINDD_INTERFACE_VERSION, /* Always a well known value */
+
/* Get users and groups */
WINBINDD_GETPWNAM,
@@ -88,7 +91,6 @@ enum winbindd_cmd {
WINBINDD_CHECK_MACHACC, /* Check machine account pw works */
WINBINDD_PING, /* Just tell me winbind is running */
WINBINDD_INFO, /* Various bit of info. Currently just tidbits */
- WINBINDD_INTERFACE_VERSION, /* *TRY* to keep this in the same place... */
/* Placeholder for end of cmd list */
@@ -98,6 +100,7 @@ enum winbindd_cmd {
/* Winbind request structure */
struct winbindd_request {
+ uint32 length;
enum winbindd_cmd cmd; /* Winbindd command to execute */
pid_t pid; /* pid of calling process */
@@ -144,7 +147,7 @@ struct winbindd_response {
/* Header information */
- int length; /* Length of response */
+ uint32 length; /* Length of response */
enum winbindd_result result; /* Result code */
/* Fixed length return data */