Changeset 480 for trunk/server/nsswitch/libwbclient/wbclient.c

Timestamp:

Aug 2, 2010, 8:16:45 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: trunk update to 3.5.4

Location:

trunk/server

Files:

• . (modified) (1 prop)
• nsswitch/libwbclient/wbclient.c (modified) (4 diffs)

trunk/server/nsswitch/libwbclient/wbclient.c

@@ -33 +33 @@
                                      struct winbindd_request *request,
                                      struct winbindd_response *response);
+NSS_STATUS winbindd_priv_request_response(int req_type,
+                                          struct winbindd_request *request,
+                                          struct winbindd_response *response);
 
 /** @brief Wrapper around Winbind's send/receive API call
@@ -56 +59 @@
 **********************************************************************/
 
-wbcErr wbcRequestResponse(int cmd,
-                          struct winbindd_request *request,
-                          struct winbindd_response *response)
+static wbcErr wbcRequestResponseInt(
+        int cmd,
+        struct winbindd_request *request,
+        struct winbindd_response *response,
+        NSS_STATUS (*fn)(int req_type,
+                         struct winbindd_request *request,
+                         struct winbindd_response *response))
 {
         wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
@@ -65 +72 @@
         /* for some calls the request and/or response can be NULL */
 
-        nss_status = winbindd_request_response(cmd, request, response);
+        nss_status = fn(cmd, request, response);
 
         switch (nss_status) {
@@ -83 +90 @@
 
         return wbc_status;
+}
+
+wbcErr wbcRequestResponse(int cmd,
+                          struct winbindd_request *request,
+                          struct winbindd_response *response)
+{
+        return wbcRequestResponseInt(cmd, request, response,
+                                     winbindd_request_response);
+}
+
+wbcErr wbcRequestResponsePriv(int cmd,
+                              struct winbindd_request *request,
+                              struct winbindd_response *response)
+{
+        return wbcRequestResponseInt(cmd, request, response,
+                                     winbindd_priv_request_response);
 }