Changeset 745 for trunk/server/libgpo/gpo_ldap.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)
• libgpo/gpo_ldap.c (modified) (8 diffs)

trunk/server/libgpo/gpo_ldap.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "libgpo/gpo.h"
+#include "auth.h"
 #if _SAMBA_BUILD_ == 4
-#include "libgpo/gpo.h"
 #include "libgpo/gpo_s4.h"
 #include "source4/libgpo/ads_convenience.h"
 #endif
+#include "../libcli/security/security.h"
 
 /****************************************************************
@@ -486 +488 @@
                 "versionNumber",
                 NULL};
-        uint32_t sd_flags = DACL_SECURITY_INFORMATION;
+        uint32_t sd_flags = SECINFO_DACL;
 
         ZERO_STRUCTP(gpo);
@@ -553 +555 @@
                                          enum GPO_LINK_TYPE link_type,
                                          bool only_add_forced_gpos,
-                                         const NT_USER_TOKEN *token)
+                                         const struct security_token *token)
 {
         ADS_STATUS status;
@@ -620 +622 @@
                              TALLOC_CTX *mem_ctx,
                              const char *dn,
-                             NT_USER_TOKEN **token)
+                             struct security_token **token)
 {
         ADS_STATUS status;
-        DOM_SID object_sid;
-        DOM_SID primary_group_sid;
-        DOM_SID *ad_token_sids;
+        struct dom_sid object_sid;
+        struct dom_sid primary_group_sid;
+        struct dom_sid *ad_token_sids;
         size_t num_ad_token_sids = 0;
-        DOM_SID *token_sids;
-        size_t num_token_sids = 0;
-        NT_USER_TOKEN *new_token = NULL;
+        struct dom_sid *token_sids;
+        uint32_t num_token_sids = 0;
+        struct security_token *new_token = NULL;
         int i;
 
@@ -639 +641 @@
         }
 
-        token_sids = TALLOC_ARRAY(mem_ctx, DOM_SID, 1);
+        token_sids = TALLOC_ARRAY(mem_ctx, struct dom_sid, 1);
         ADS_ERROR_HAVE_NO_MEMORY(token_sids);
 
@@ -671 +673 @@
         *token = new_token;
 
-        debug_nt_user_token(DBGC_CLASS, 5, *token);
+        security_token_debug(DBGC_CLASS, 5, *token);
 
         return ADS_ERROR_LDAP(LDAP_SUCCESS);
@@ -711 +713 @@
                             const char *dn,
                             uint32_t flags,
-                            const NT_USER_TOKEN *token,
+                            const struct security_token *token,
                             struct GROUP_POLICY_OBJECT **gpo_list)
 {
@@ -725 +727 @@
         if (!dn) {
                 return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+        }
+
+        if (!ads_set_sasl_wrap_flags(ads, ADS_AUTH_SASL_SIGN)) {
+                return ADS_ERROR(LDAP_INVALID_CREDENTIALS);
         }