Rebase against 885446556ce443b496e368b8f2c68807dcc7df0f.

patches/server-Stored_ACLs/0003-server-Add-a-helper-function-set_sd_from_token_inter.patch

@@ -1,4 +1,4 @@
-From 2b9d0c9e955f188d5e5ba2311ed96ff9821f7d44 Mon Sep 17 00:00:00 2001
+From 40a771ea3f017a017f949063e7fbe8d1c8d5cf0c Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 30 Mar 2015 12:32:34 +0200
 Subject: [PATCH] server: Add a helper function set_sd_from_token_internal to
@@ -10,10 +10,10 @@ Subject: [PATCH] server: Add a helper function set_sd_from_token_internal to
  2 files changed, 40 insertions(+), 22 deletions(-)
 
 diff --git a/server/object.c b/server/object.c
-index 1a3bff65969..d46dbf01b6f 100644
+index 4f34d2979dc..fe9df4b2882 100644
 --- a/server/object.c
 +++ b/server/object.c
-@@ -563,8 +563,9 @@ struct security_descriptor *default_get_sd( struct object *obj )
+@@ -652,8 +652,9 @@ struct security_descriptor *default_get_sd( struct object *obj )
      return obj->sd;
  }
  
@@ -25,7 +25,7 @@ index 1a3bff65969..d46dbf01b6f 100644
  {
      struct security_descriptor new_sd, *new_sd_ptr;
      int present;
-@@ -573,8 +574,6 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
+@@ -662,8 +663,6 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
      struct acl *replaced_sacl = NULL;
      char *ptr;
  
@@ -34,7 +34,7 @@ index 1a3bff65969..d46dbf01b6f 100644
      new_sd.control = sd->control & ~SE_SELF_RELATIVE;
  
      if (set_info & OWNER_SECURITY_INFORMATION && sd->owner_len)
-@@ -582,10 +581,10 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
+@@ -671,10 +670,10 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
          owner = sd_get_owner( sd );
          new_sd.owner_len = sd->owner_len;
      }
@@ -48,7 +48,7 @@ index 1a3bff65969..d46dbf01b6f 100644
      }
      else if (token)
      {
-@@ -599,10 +598,10 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
+@@ -688,10 +687,10 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
          group = sd_get_group( sd );
          new_sd.group_len = sd->group_len;
      }
@@ -62,7 +62,7 @@ index 1a3bff65969..d46dbf01b6f 100644
      }
      else if (token)
      {
-@@ -620,20 +619,20 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
+@@ -709,20 +708,20 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
      else if (set_info & LABEL_SECURITY_INFORMATION && present)
      {
          const struct acl *old_sacl = NULL;
@@ -88,7 +88,7 @@ index 1a3bff65969..d46dbf01b6f 100644
          }
          else
              new_sd.sacl_len = 0;
-@@ -647,12 +646,12 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
+@@ -736,12 +735,12 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
      }
      else
      {
@@ -104,7 +104,7 @@ index 1a3bff65969..d46dbf01b6f 100644
          }
          else if (token)
          {
-@@ -668,7 +667,7 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
+@@ -757,7 +756,7 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
      if (!ptr)
      {
          free( replaced_sacl );
@@ -113,7 +113,7 @@ index 1a3bff65969..d46dbf01b6f 100644
      }
      new_sd_ptr = (struct security_descriptor*)ptr;
  
-@@ -679,9 +678,25 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
+@@ -768,9 +767,25 @@ int set_sd_defaults_from_token( struct object *obj, const struct security_descri
      mem_append( ptr, dacl, new_sd.dacl_len );
  
      free( replaced_sacl );
@@ -143,7 +143,7 @@ index 1a3bff65969..d46dbf01b6f 100644
  
  /** Set the security descriptor using the current primary token for defaults. */
 diff --git a/server/object.h b/server/object.h
-index e38913d430d..e61d29d91ea 100644
+index ecdac2669e1..7cf84ed281e 100644
 --- a/server/object.h
 +++ b/server/object.h
 @@ -175,6 +175,9 @@ extern struct fd *no_get_fd( struct object *obj );
@@ -155,7 +155,7 @@ index e38913d430d..e61d29d91ea 100644
 +                                                               unsigned int set_info, struct token *token );
  extern int set_sd_defaults_from_token( struct object *obj, const struct security_descriptor *sd,
                                         unsigned int set_info, struct token *token );
- extern WCHAR *no_get_full_name( struct object *obj, data_size_t *ret_len );
+ extern WCHAR *no_get_full_name( struct object *obj, data_size_t max, data_size_t *ret_len );
 -- 
-2.45.2
+2.47.2
 

staging/upstream-commit

@@ -1 +1 @@
-19441ac8046556a0118d6b59838dfd408fa56fdd
+885446556ce443b496e368b8f2c68807dcc7df0f