Renamed a parameter in init_request() function.

Initialise response structure correctly.

diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
index 5d1f3431ccf1e830041d2366ceb4fb89e4d1b1f3..42712d68da8b019d2c6a6b10e6bc599f94aa089d 100644 (file)
--- a/source/nsswitch/wb_common.c
+++ b/source/nsswitch/wb_common.c
@@ -30,18 +30,16 @@
 
 static int established_socket = -1;           /* fd for winbindd socket */
 
 
 static int established_socket = -1;           /* fd for winbindd socket */
 

-/*
- * Utility and helper functions
- */
+/* Initialise a request structure */

 
 

-void init_request(struct winbindd_request *req,int rq_type)
+void init_request(struct winbindd_request *request, int request_type)

 {
         static char *domain_env;
         static BOOL initialised;
 
 {
         static char *domain_env;
         static BOOL initialised;
 

-       req->cmd = rq_type;
-       req->pid = getpid();
-       req->domain[0] = '\0';
+       request->cmd = request_type;
+       request->pid = getpid();
+       request->domain[0] = '\0';

 
        if (!initialised) {
                initialised = True;
 
        if (!initialised) {
                initialised = True;


@@ -49,12 +47,21 @@ void init_request(struct winbindd_request *req,int rq_type)
        }
 
        if (domain_env) {
        }
 
        if (domain_env) {

-               strncpy(req->domain, domain_env,
-                       sizeof(req->domain) - 1);
-               req->domain[sizeof(req->domain) - 1] = '\0';
+               strncpy(request->domain, domain_env,
+                       sizeof(request->domain) - 1);
+               request->domain[sizeof(request->domain) - 1] = '\0';

        }
 }
 
        }
 }
 

+/* Initialise a response structure */
+
+void init_response(struct winbindd_response *response)
+{
+       /* Initialise return value */
+
+       response->result = NSS_STATUS_UNAVAIL;
+}
+

 /* Close established socket */
 
 void close_sock(void)
 /* Close established socket */
 
 void close_sock(void)


@@ -322,7 +329,9 @@ enum nss_status winbindd_request(int req_type,
        }
        
        /* Fill in request and send down pipe */
        }
        
        /* Fill in request and send down pipe */

+

        init_request(request, req_type);
        init_request(request, req_type);

+       init_response(response);

        
        if (write_sock(request, sizeof(*request)) == -1) {
                return NSS_STATUS_UNAVAIL;
        
        if (write_sock(request, sizeof(*request)) == -1) {
                return NSS_STATUS_UNAVAIL;