First working prototype of decoupling smbd from winbindd.

All client calls to winbindd now pass through the libwbclient
wrapper functions or have been replaced with the libwbclient
calls themeselves.

diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 99eea6cdd259d2975901df0ce7890b1dadc6e09a..b87af34890539530aa368ee99569a27212d9e7c7 100644 (file)
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -1707,17 +1707,17 @@ bool is_trusted_domain(const char* dom_name)
                        return True;
        }
        else {
-               NSS_STATUS result;
+               wbcErr result;
 
                /* If winbind is around, ask it */
 
                result = wb_is_trusted_domain(dom_name);
 
-               if (result == NSS_STATUS_SUCCESS) {
+               if (result == WBC_ERR_SUCCESS) {
                        return True;
                }
 
-               if (result == NSS_STATUS_NOTFOUND) {
+               if (result == WBC_ERR_DOMAIN_NOT_FOUND) {
                        /* winbind could not find the domain */
                        return False;
                }

diff --git a/source/include/includes.h b/source/include/includes.h
index 0d51c3d049cadbb23e60a071f6aad061171a99cd..5cb3e91ade53c5f45be13590ba8de1a498072ef4 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -772,6 +772,7 @@ enum flush_reason_enum {
     NUM_FLUSH_REASONS};
 
 #include "nss_info.h"
+#include "nsswitch/libwbclient/wbclient.h"
 
 /* generated rpc server implementation functions */
 #include "librpc/gen_ndr/srv_echo.h"