Changeset 745 for trunk/server/source3/lib/winbind_util.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/winbind_util.c (modified) (21 diffs)

trunk/server/source3/lib/winbind_util.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "../libcli/security/security.h"
+#include "../lib/util/util_pw.h"
+#include "nsswitch/libwbclient/wbclient.h"
 
 #if defined(WITH_WINBIND)
 
-#include "nsswitch/libwbclient/wbclient.h"
+#include "lib/winbind_util.h"
 
 struct passwd * winbind_getpwnam(const char * name)
@@ -42 +45 @@
 }
 
-struct passwd * winbind_getpwsid(const DOM_SID *sid)
+struct passwd * winbind_getpwsid(const struct dom_sid *sid)
 {
         wbcErr result;
@@ -64 +67 @@
 /* Call winbindd to convert a name to a sid */
 
-bool winbind_lookup_name(const char *dom_name, const char *name, DOM_SID *sid, 
+bool winbind_lookup_name(const char *dom_name, const char *name, struct dom_sid *sid,
                          enum lsa_SidType *name_type)
 {
@@ -75 +78 @@
                 return false;
 
-        memcpy(sid, &dom_sid, sizeof(DOM_SID)); 
+        memcpy(sid, &dom_sid, sizeof(struct dom_sid));
         *name_type = (enum lsa_SidType)type;    
 
@@ -83 +86 @@
 /* Call winbindd to convert sid to name */
 
-bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid, 
+bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
                         const char **domain, const char **name,
                         enum lsa_SidType *name_type)
@@ -135 +138 @@
 /* Call winbindd to convert SID to uid */
 
-bool winbind_sid_to_uid(uid_t *puid, const DOM_SID *sid)
+bool winbind_sid_to_uid(uid_t *puid, const struct dom_sid *sid)
 {
         struct wbcDomainSid dom_sid;
@@ -149 +152 @@
 /* Call winbindd to convert uid to sid */
 
-bool winbind_uid_to_sid(DOM_SID *sid, uid_t uid)
+bool winbind_uid_to_sid(struct dom_sid *sid, uid_t uid)
 {
         struct wbcDomainSid dom_sid;
@@ -156 +159 @@
         result = wbcUidToSid(uid, &dom_sid);
         if (result == WBC_ERR_SUCCESS) {
-                memcpy(sid, &dom_sid, sizeof(DOM_SID));
+                memcpy(sid, &dom_sid, sizeof(struct dom_sid));
         } else {
                 sid_copy(sid, &global_sid_NULL);
@@ -166 +169 @@
 /* Call winbindd to convert SID to gid */
 
-bool winbind_sid_to_gid(gid_t *pgid, const DOM_SID *sid)
+bool winbind_sid_to_gid(gid_t *pgid, const struct dom_sid *sid)
 {
         struct wbcDomainSid dom_sid;
@@ -180 +183 @@
 /* Call winbindd to convert gid to sid */
 
-bool winbind_gid_to_sid(DOM_SID *sid, gid_t gid)
+bool winbind_gid_to_sid(struct dom_sid *sid, gid_t gid)
 {
         struct wbcDomainSid dom_sid;
@@ -187 +190 @@
         result = wbcGidToSid(gid, &dom_sid);
         if (result == WBC_ERR_SUCCESS) {
-                memcpy(sid, &dom_sid, sizeof(DOM_SID));
+                memcpy(sid, &dom_sid, sizeof(struct dom_sid));
         } else {
                 sid_copy(sid, &global_sid_NULL);
@@ -214 +217 @@
 
 bool winbind_lookup_rids(TALLOC_CTX *mem_ctx,
-                         const DOM_SID *domain_sid,
+                         const struct dom_sid *domain_sid,
                          int num_rids, uint32 *rids,
                          const char **domain_name,
@@ -296 +299 @@
 
 bool winbind_get_sid_aliases(TALLOC_CTX *mem_ctx,
-                             const DOM_SID *dom_sid,
-                             const DOM_SID *members,
+                             const struct dom_sid *dom_sid,
+                             const struct dom_sid *members,
                              size_t num_members,
                              uint32_t **pp_alias_rids,
@@ -347 +350 @@
 }
 
-struct passwd * winbind_getpwsid(const DOM_SID *sid)
+struct passwd * winbind_getpwsid(const struct dom_sid *sid)
 {
         return NULL;
 }
 
-bool winbind_lookup_name(const char *dom_name, const char *name, DOM_SID *sid, 
+bool winbind_lookup_name(const char *dom_name, const char *name, struct dom_sid *sid,
                          enum lsa_SidType *name_type)
 {
@@ -360 +363 @@
 /* Call winbindd to convert sid to name */
 
-bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid, 
+bool winbind_lookup_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
                         const char **domain, const char **name,
                         enum lsa_SidType *name_type)
@@ -376 +379 @@
 /* Call winbindd to convert SID to uid */
 
-bool winbind_sid_to_uid(uid_t *puid, const DOM_SID *sid)
+bool winbind_sid_to_uid(uid_t *puid, const struct dom_sid *sid)
 {
         return false;
@@ -383 +386 @@
 /* Call winbindd to convert uid to sid */
 
-bool winbind_uid_to_sid(DOM_SID *sid, uid_t uid)
+bool winbind_uid_to_sid(struct dom_sid *sid, uid_t uid)
 {
         return false;
@@ -390 +393 @@
 /* Call winbindd to convert SID to gid */
 
-bool winbind_sid_to_gid(gid_t *pgid, const DOM_SID *sid)
+bool winbind_sid_to_gid(gid_t *pgid, const struct dom_sid *sid)
 {
         return false;   
@@ -397 +400 @@
 /* Call winbindd to convert gid to sid */
 
-bool winbind_gid_to_sid(DOM_SID *sid, gid_t gid)
+bool winbind_gid_to_sid(struct dom_sid *sid, gid_t gid)
 {
         return false;
@@ -412 +415 @@
 
 bool winbind_lookup_rids(TALLOC_CTX *mem_ctx,
-                         const DOM_SID *domain_sid,
+                         const struct dom_sid *domain_sid,
                          int num_rids, uint32 *rids,
                          const char **domain_name,
@@ -440 +443 @@
 
 bool winbind_get_sid_aliases(TALLOC_CTX *mem_ctx,
-                             const DOM_SID *dom_sid,
-                             const DOM_SID *members,
+                             const struct dom_sid *dom_sid,
+                             const struct dom_sid *members,
                              size_t num_members,
                              uint32_t **pp_alias_rids,