Create wrappers of Winbind utility functions used by smbd.
authorGerald (Jerry) Carter <jerry@samba.org>
Sun, 21 Oct 2007 01:05:39 +0000 (20:05 -0500)
committerGerald (Jerry) Carter <jerry@samba.org>
Sun, 21 Oct 2007 01:05:39 +0000 (20:05 -0500)
The original implementations from wb_client.c were removed.
Wrapper functions to call into libwbclient are as follows:

  bool winbind_lookup_name()
  bool winbind_lookup_sid()
  bool winbind_ping()
  bool winbind_sid_to_uid()
  bool winbind_uid_to_sid()
  bool winbind_sid_to_gid()
  bool winbind_gid_to_sid()
  wbcErr wb_is_trusted_domain()
  bool winbind_lookup_rids()
  bool winbind_allocate_uid()
  bool winbind_allocate_gid()

source/lib/winbind_util.c [new file with mode: 0644]
source/nsswitch/wb_client.c

diff --git a/source/lib/winbind_util.c b/source/lib/winbind_util.c
new file mode 100644 (file)
index 0000000..3ad953d
--- /dev/null
@@ -0,0 +1,236 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Winbind Utility functions
+
+   Copyright (C) Gerald (Jerry) Carter   2007
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "nsswitch/libwbclient/wbclient.h"
+
+/* Call winbindd to convert a name to a sid */
+
+bool winbind_lookup_name(const char *dom_name, const char *name, DOM_SID *sid, 
+                         enum lsa_SidType *name_type)
+{
+       struct wbcDomainSid dom_sid;
+       wbcErr result;
+       enum wbcSidType type;   
+
+       result = wbcLookupName(dom_name, name, &dom_sid, &type);
+       if (result != WBC_ERR_SUCCESS)
+               return False;
+
+       memcpy(sid, &dom_sid, sizeof(DOM_SID)); 
+       *name_type = (enum lsa_SidType)type;    
+
+       return True;    
+}
+
+/* Call winbindd to convert sid to name */
+
+bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid, 
+                       const char **domain, const char **name,
+                        enum lsa_SidType *name_type)
+{
+       struct wbcDomainSid dom_sid;
+       wbcErr result;
+       enum wbcSidType type;
+       char *domain_name = NULL;
+       char *account_name = NULL;
+
+       memcpy(&dom_sid, sid, sizeof(dom_sid)); 
+
+       result = wbcLookupSid(&dom_sid, &domain_name, &account_name, &type);
+       if (result != WBC_ERR_SUCCESS)
+               return False;
+
+       /* Copy out result */
+
+       if (domain) {           
+               *domain = talloc_strdup(mem_ctx, domain_name);
+       }
+       if (name) {
+               *name = talloc_strdup(mem_ctx, account_name);
+       }
+       *name_type = (enum lsa_SidType)type;
+
+       DEBUG(10, ("winbind_lookup_sid: SUCCESS: SID %s -> %s %s\n", 
+                  sid_string_static(sid), domain_name, account_name));
+
+       SAFE_FREE(domain_name);
+       SAFE_FREE(account_name);
+       
+       if ((domain && !*domain) || (name && !*name)) {         
+               DEBUG(0,("winbind_lookup_sid: talloc() failed!\n"));
+               return False;
+       }       
+
+
+       return True;
+}
+
+/* Ping winbindd to see it is alive */
+
+bool winbind_ping(void)
+{
+       wbcErr result = wbcPing();
+
+       return (result == WBC_ERR_SUCCESS);
+}
+
+/* Call winbindd to convert SID to uid */
+
+bool winbind_sid_to_uid(uid_t *puid, const DOM_SID *sid)
+{
+       struct wbcDomainSid dom_sid;
+       wbcErr result;
+
+       memcpy(&dom_sid, sid, sizeof(dom_sid)); 
+
+       result = wbcSidToUid(&dom_sid, puid);   
+       if (result != WBC_ERR_SUCCESS)
+               return False;
+
+       return (result == WBC_ERR_SUCCESS);     
+}
+
+/* Call winbindd to convert uid to sid */
+
+bool winbind_uid_to_sid(DOM_SID *sid, uid_t uid)
+{
+       struct wbcDomainSid dom_sid;
+       wbcErr result;
+
+       result = wbcUidToSid(uid, &dom_sid);
+       if (result == WBC_ERR_SUCCESS) {
+               memcpy(sid, &dom_sid, sizeof(DOM_SID));
+       } else {
+               sid_copy(sid, &global_sid_NULL);
+       }
+
+       return (result == WBC_ERR_SUCCESS);
+}
+
+/* Call winbindd to convert SID to gid */
+
+bool winbind_sid_to_gid(gid_t *pgid, const DOM_SID *sid)
+{
+       struct wbcDomainSid dom_sid;
+       wbcErr result;
+
+       memcpy(&dom_sid, sid, sizeof(dom_sid)); 
+
+       result = wbcSidToGid(&dom_sid, pgid);   
+       if (result != WBC_ERR_SUCCESS)
+               return False;
+
+       return (result == WBC_ERR_SUCCESS);     
+}
+
+/* Call winbindd to convert gid to sid */
+
+bool winbind_gid_to_sid(DOM_SID *sid, gid_t gid)
+{
+       struct wbcDomainSid dom_sid;
+       wbcErr result;
+
+       result = wbcGidToSid(gid, &dom_sid);
+       if (result == WBC_ERR_SUCCESS) {
+               memcpy(sid, &dom_sid, sizeof(DOM_SID));
+       } else {
+               sid_copy(sid, &global_sid_NULL);
+       }
+
+       return (result == WBC_ERR_SUCCESS);
+}
+
+/* Check for a trusted domain */
+
+wbcErr wb_is_trusted_domain(const char *domain)
+{
+       wbcErr result;
+       struct wbcDomainInfo info;      
+       
+       result = wbcDomainInfo(domain, &info);
+
+       if (result == WBC_ERR_SUCCESS) {
+               SAFE_FREE(info.short_name);
+               SAFE_FREE(info.dns_name);
+       }
+
+       return result;  
+}
+
+/* Lookup a set of rids in a given domain */
+
+bool winbind_lookup_rids(TALLOC_CTX *mem_ctx,
+                        const DOM_SID *domain_sid,
+                        int num_rids, uint32 *rids,
+                        const char **domain_name,
+                        const char ***names, enum lsa_SidType **types)
+{
+       const char *dom_name = NULL;
+       const char **namelist = NULL;
+       enum wbcSidType *name_types = NULL;
+       struct wbcDomainSid dom_sid;
+       wbcErr ret;
+       int i;  
+       
+       memcpy(&dom_sid, domain_sid, sizeof(struct wbcDomainSid));
+       
+       ret = wbcLookupRids(&dom_sid, num_rids, rids,
+                           &dom_name, &namelist, &name_types);
+       if (ret != WBC_ERR_SUCCESS)
+               return False;
+       
+       *domain_name = talloc_strdup(mem_ctx, dom_name);
+       *names       = TALLOC_ARRAY(mem_ctx, const char*, num_rids);
+       *types       = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
+
+       for(i=0; i<num_rids; i++) {
+               (*names)[i] = talloc_strdup(names, namelist[i]);
+               (*types)[i] = (enum lsa_SidType)name_types[i];
+
+               free(namelist[i]);              
+       }
+       free(namelist);
+       free(name_types);
+       
+       return True;    
+}
+
+/* Ask Winbind to allocate a new uid for us */
+
+bool winbind_allocate_uid(uid_t *uid)
+{
+       wbcErr ret;
+       
+       ret = wbcAllocateUid(uid);
+       
+       return (ret == WBC_ERR_SUCCESS);
+}
+
+/* Ask Winbind to allocate a new gid for us */
+
+bool winbind_allocate_gid(gid_t *gid)
+{
+       wbcErr ret;
+       
+       ret = wbcAllocateGid(gid);
+       
+       return (ret == WBC_ERR_SUCCESS);
+}
index 3e3c140fae85534e8eb72eabadb761ee91eee362..5dd3cee57943564ddead8f99d390f7484432c354 100644 (file)
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "nsswitch/winbind_nss.h"
+#include "libwbclient/wbclient.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
@@ -30,331 +31,6 @@ NSS_STATUS winbindd_request_response(int req_type,
                                  struct winbindd_request *request,
                                  struct winbindd_response *response);
 
-/* Call winbindd to convert a name to a sid */
-
-bool winbind_lookup_name(const char *dom_name, const char *name, DOM_SID *sid, 
-                         enum lsa_SidType *name_type)
-{
-       struct winbindd_request request;
-       struct winbindd_response response;
-       NSS_STATUS result;
-       
-       if (!sid || !name_type)
-               return False;
-
-       /* Send off request */
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
-
-       fstrcpy(request.data.name.dom_name, dom_name);
-       fstrcpy(request.data.name.name, name);
-
-       if ((result = winbindd_request_response(WINBINDD_LOOKUPNAME, &request, 
-                                      &response)) == NSS_STATUS_SUCCESS) {
-               if (!string_to_sid(sid, response.data.sid.sid))
-                       return False;
-               *name_type = (enum lsa_SidType)response.data.sid.type;
-       }
-
-       return result == NSS_STATUS_SUCCESS;
-}
-
-/* Call winbindd to convert sid to name */
-
-bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid, 
-                       const char **domain, const char **name,
-                        enum lsa_SidType *name_type)
-{
-       struct winbindd_request request;
-       struct winbindd_response response;
-       NSS_STATUS result;
-       
-       /* Initialise request */
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
-
-       fstrcpy(request.data.sid, sid_string_static(sid));
-       
-       /* Make request */
-
-       result = winbindd_request_response(WINBINDD_LOOKUPSID, &request,
-                                          &response);
-
-       if (result != NSS_STATUS_SUCCESS) {
-               return False;
-       }
-
-       /* Copy out result */
-
-       if (domain != NULL) {
-               *domain = talloc_strdup(mem_ctx, response.data.name.dom_name);
-               if (*domain == NULL) {
-                       DEBUG(0, ("talloc failed\n"));
-                       return False;
-               }
-       }
-       if (name != NULL) {
-               *name = talloc_strdup(mem_ctx, response.data.name.name);
-               if (*name == NULL) {
-                       DEBUG(0, ("talloc failed\n"));
-                       return False;
-               }
-       }
-
-       *name_type = (enum lsa_SidType)response.data.name.type;
-
-       DEBUG(10, ("winbind_lookup_sid: SUCCESS: SID %s -> %s %s\n", 
-                  sid_string_static(sid), response.data.name.dom_name,
-                  response.data.name.name));
-       return True;
-}
-
-bool winbind_lookup_rids(TALLOC_CTX *mem_ctx,
-                        const DOM_SID *domain_sid,
-                        int num_rids, uint32 *rids,
-                        const char **domain_name,
-                        const char ***names, enum lsa_SidType **types)
-{
-       size_t i, buflen;
-       ssize_t len;
-       char *ridlist;
-       char *p;
-       struct winbindd_request request;
-       struct winbindd_response response;
-       NSS_STATUS result;
-
-       if (num_rids == 0) {
-               return False;
-       }
-
-       /* Initialise request */
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
-
-       fstrcpy(request.data.sid, sid_string_static(domain_sid));
-       
-       len = 0;
-       buflen = 0;
-       ridlist = NULL;
-
-       for (i=0; i<num_rids; i++) {
-               sprintf_append(mem_ctx, &ridlist, &len, &buflen,
-                              "%ld\n", rids[i]);
-       }
-
-       if (ridlist == NULL) {
-               return False;
-       }
-
-       request.extra_data.data = ridlist;
-       request.extra_len = strlen(ridlist)+1;
-
-       result = winbindd_request_response(WINBINDD_LOOKUPRIDS,
-                                          &request, &response);
-
-       TALLOC_FREE(ridlist);
-
-       if (result != NSS_STATUS_SUCCESS) {
-               return False;
-       }
-
-       *domain_name = talloc_strdup(mem_ctx, response.data.domain_name);
-
-       *names = TALLOC_ARRAY(mem_ctx, const char *, num_rids);
-       *types = TALLOC_ARRAY(mem_ctx, enum lsa_SidType, num_rids);
-
-       if ((*names == NULL) || (*types == NULL)) {
-               goto fail;
-       }
-
-       p = (char *)response.extra_data.data;
-
-       for (i=0; i<num_rids; i++) {
-               char *q;
-
-               if (*p == '\0') {
-                       DEBUG(10, ("Got invalid reply: %s\n",
-                                  (char *)response.extra_data.data));
-                       goto fail;
-               }
-                       
-               (*types)[i] = (enum lsa_SidType)strtoul(p, &q, 10);
-
-               if (*q != ' ') {
-                       DEBUG(10, ("Got invalid reply: %s\n",
-                                  (char *)response.extra_data.data));
-                       goto fail;
-               }
-
-               p = q+1;
-
-               q = strchr(p, '\n');
-               if (q == NULL) {
-                       DEBUG(10, ("Got invalid reply: %s\n",
-                                  (char *)response.extra_data.data));
-                       goto fail;
-               }
-
-               *q = '\0';
-
-               (*names)[i] = talloc_strdup(*names, p);
-
-               p = q+1;
-       }
-
-       if (*p != '\0') {
-               DEBUG(10, ("Got invalid reply: %s\n",
-                          (char *)response.extra_data.data));
-               goto fail;
-       }
-
-       SAFE_FREE(response.extra_data.data);
-
-       return True;
-
- fail:
-       TALLOC_FREE(*names);
-       TALLOC_FREE(*types);
-       return False;
-}
-
-/* Call winbindd to convert SID to uid */
-
-bool winbind_sid_to_uid(uid_t *puid, const DOM_SID *sid)
-{
-       struct winbindd_request request;
-       struct winbindd_response response;
-       int result;
-       fstring sid_str;
-
-       if (!puid)
-               return False;
-
-       /* Initialise request */
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
-
-       sid_to_string(sid_str, sid);
-       fstrcpy(request.data.sid, sid_str);
-       
-       /* Make request */
-
-       result = winbindd_request_response(WINBINDD_SID_TO_UID, &request, &response);
-
-       /* Copy out result */
-
-       if (result == NSS_STATUS_SUCCESS) {
-               *puid = response.data.uid;
-       }
-
-       return (result == NSS_STATUS_SUCCESS);
-}
-
-/* Call winbindd to convert uid to sid */
-
-bool winbind_uid_to_sid(DOM_SID *sid, uid_t uid)
-{
-       struct winbindd_request request;
-       struct winbindd_response response;
-       int result;
-
-       if (!sid)
-               return False;
-
-       /* Initialise request */
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
-
-       request.data.uid = uid;
-
-       /* Make request */
-
-       result = winbindd_request_response(WINBINDD_UID_TO_SID, &request, &response);
-
-       /* Copy out result */
-
-       if (result == NSS_STATUS_SUCCESS) {
-               if (!string_to_sid(sid, response.data.sid.sid))
-                       return False;
-       } else {
-               sid_copy(sid, &global_sid_NULL);
-       }
-
-       return (result == NSS_STATUS_SUCCESS);
-}
-
-/* Call winbindd to convert SID to gid */
-
-bool winbind_sid_to_gid(gid_t *pgid, const DOM_SID *sid)
-{
-       struct winbindd_request request;
-       struct winbindd_response response;
-       int result;
-       fstring sid_str;
-
-       if (!pgid)
-               return False;
-
-       /* Initialise request */
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
-
-       sid_to_string(sid_str, sid);
-       fstrcpy(request.data.sid, sid_str);
-       
-       /* Make request */
-
-       result = winbindd_request_response(WINBINDD_SID_TO_GID, &request, &response);
-
-       /* Copy out result */
-
-       if (result == NSS_STATUS_SUCCESS) {
-               *pgid = response.data.gid;
-       }
-
-       return (result == NSS_STATUS_SUCCESS);
-}
-
-/* Call winbindd to convert gid to sid */
-
-bool winbind_gid_to_sid(DOM_SID *sid, gid_t gid)
-{
-       struct winbindd_request request;
-       struct winbindd_response response;
-       int result;
-
-       if (!sid)
-               return False;
-
-       /* Initialise request */
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
-
-       request.data.gid = gid;
-
-       /* Make request */
-
-       result = winbindd_request_response(WINBINDD_GID_TO_SID, &request, &response);
-
-       /* Copy out result */
-
-       if (result == NSS_STATUS_SUCCESS) {
-               if (!string_to_sid(sid, response.data.sid.sid))
-                       return False;
-       } else {
-               sid_copy(sid, &global_sid_NULL);
-       }
-
-       return (result == NSS_STATUS_SUCCESS);
-}
-
 /* Call winbindd to convert SID to uid */
 
 bool winbind_sids_to_unixids(struct id_map *ids, int num_ids)
@@ -423,56 +99,6 @@ bool winbind_idmap_dump_maps(TALLOC_CTX *memctx, const char *file)
        return (result == NSS_STATUS_SUCCESS);
 }
 
-bool winbind_allocate_uid(uid_t *uid)
-{
-       struct winbindd_request request;
-       struct winbindd_response response;
-       int result;
-
-       /* Initialise request */
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
-
-       /* Make request */
-
-       result = winbindd_request_response(WINBINDD_ALLOCATE_UID,
-                                          &request, &response);
-
-       if (result != NSS_STATUS_SUCCESS)
-               return False;
-
-       /* Copy out result */
-       *uid = response.data.uid;
-
-       return True;
-}
-
-bool winbind_allocate_gid(gid_t *gid)
-{
-       struct winbindd_request request;
-       struct winbindd_response response;
-       int result;
-
-       /* Initialise request */
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
-
-       /* Make request */
-
-       result = winbindd_request_response(WINBINDD_ALLOCATE_GID,
-                                          &request, &response);
-
-       if (result != NSS_STATUS_SUCCESS)
-               return False;
-
-       /* Copy out result */
-       *gid = response.data.gid;
-
-       return True;
-}
-
 bool winbind_set_mapping(const struct id_map *map)
 {
        struct winbindd_request request;
@@ -536,49 +162,3 @@ bool winbind_set_gid_hwm(unsigned long id)
 
        return (result == NSS_STATUS_SUCCESS);
 }
-
-/**********************************************************************
- simple wrapper function to see if winbindd is alive
-**********************************************************************/
-
-bool winbind_ping( void )
-{
-       NSS_STATUS result;
-
-       result = winbindd_request_response(WINBINDD_PING, NULL, NULL);
-
-       return result == NSS_STATUS_SUCCESS;
-}
-
-/**********************************************************************
- Is a domain trusted?
-
- result == NSS_STATUS_UNAVAIL: winbind not around
- result == NSS_STATUS_NOTFOUND: winbind around, but domain missing
-
- Due to a bad API NSS_STATUS_NOTFOUND is returned both when winbind_off and
- when winbind return WINBINDD_ERROR. So the semantics of this routine depends
- on winbind_on. Grepping for winbind_off I just found 3 places where winbind
- is turned off, and this does not conflict (as far as I have seen) with the
- callers of is_trusted_domains.
-
- I *hate* global variables....
-
- Volker
-
-**********************************************************************/
-
-NSS_STATUS wb_is_trusted_domain(const char *domain)
-{
-       struct winbindd_request request;
-       struct winbindd_response response;
-
-       /* Call winbindd */
-
-       ZERO_STRUCT(request);
-       ZERO_STRUCT(response);
-
-       fstrcpy(request.domain_name, domain);
-
-       return winbindd_request_response(WINBINDD_DOMAIN_INFO, &request, &response);
-}