Merge branch 'master' of ssh://git.samba.org/data/git/samba into talloc-next

diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index a1cfad90031c796a7c46b6611a9ba8f4414bff97..4bf0d9cb9d6d4c525a625acb44290035d0bf523b 100644 (file)
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -39,9 +39,6 @@
 #define        SEC_RIGHTS_RESET_PASSWD         SEC_RIGHTS_EXTENDED
 #define SEC_RIGHTS_FULL_CTRL           0xf01ff
 
-#define SEC_ACE_OBJECT_PRESENT           0x00000001 /* thanks for Jim McDonough <jmcd@us.ibm.com> */
-#define SEC_ACE_OBJECT_INHERITED_PRESENT 0x00000002
-
 /*
  * New Windows 2000 bits.
  */

diff --git a/source3/lib/display_sec.c b/source3/lib/display_sec.c
index 636639c11d8e36c94b572b7b9e2d14bba4e9df77..fe1ae77eddfe111a1638c37cafa0cd4e66a44369 100644 (file)
--- a/source3/lib/display_sec.c
+++ b/source3/lib/display_sec.c
@@ -155,13 +155,13 @@ void display_sec_ace_flags(uint8_t flags)
  ****************************************************************************/
 static void disp_sec_ace_object(struct security_ace_object *object)
 {
-       if (object->flags & SEC_ACE_OBJECT_PRESENT) {
-               printf("Object type: SEC_ACE_OBJECT_PRESENT\n");
+       if (object->flags & SEC_ACE_OBJECT_TYPE_PRESENT) {
+               printf("Object type: SEC_ACE_OBJECT_TYPE_PRESENT\n");
                printf("Object GUID: %s\n", GUID_string(talloc_tos(),
                        &object->type.type));
        }
-       if (object->flags & SEC_ACE_OBJECT_INHERITED_PRESENT) {
-               printf("Object type: SEC_ACE_OBJECT_INHERITED_PRESENT\n");
+       if (object->flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) {
+               printf("Object type: SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT\n");
                printf("Object GUID: %s\n", GUID_string(talloc_tos(), 
                        &object->inherited_type.inherited_type));
        }

diff --git a/source3/libads/disp_sec.c b/source3/libads/disp_sec.c
index a5e04a4a6c49e3b72e62ea80bb97bc17175f8324..3bf0b6f7a7d9cff1926048510e35216fa392a15e 100644 (file)
--- a/source3/libads/disp_sec.c
+++ b/source3/libads/disp_sec.c
@@ -112,15 +112,15 @@ static void ads_disp_sec_ace_object(ADS_STRUCT *ads,
                                    TALLOC_CTX *mem_ctx, 
                                    struct security_ace_object *object)
 {
-       if (object->flags & SEC_ACE_OBJECT_PRESENT) {
-               printf("Object type: SEC_ACE_OBJECT_PRESENT\n");
+       if (object->flags & SEC_ACE_OBJECT_TYPE_PRESENT) {
+               printf("Object type: SEC_ACE_OBJECT_TYPE_PRESENT\n");
                printf("Object GUID: %s (%s)\n", GUID_string(mem_ctx, 
                        &object->type.type), 
                        ads_interprete_guid_from_object(ads, mem_ctx, 
                                &object->type.type));
        }
-       if (object->flags & SEC_ACE_OBJECT_INHERITED_PRESENT) {
-               printf("Object type: SEC_ACE_OBJECT_INHERITED_PRESENT\n");
+       if (object->flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) {
+               printf("Object type: SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT\n");
                printf("Object GUID: %s (%s)\n", GUID_string(mem_ctx,
                        &object->inherited_type.inherited_type),
                        ads_interprete_guid_from_object(ads, mem_ctx, 

diff --git a/source3/libgpo/gpo_sec.c b/source3/libgpo/gpo_sec.c
index 42ab72a99bb3d59fc865957049da8e127873f874..c72bb2673240535461dfb7023eb4da3e7f1f49cc 100644 (file)
--- a/source3/libgpo/gpo_sec.c
+++ b/source3/libgpo/gpo_sec.c
@@ -38,12 +38,12 @@ static bool gpo_sd_check_agp_object_guid(const struct security_ace_object *objec
        }
 
        switch (object->flags) {
-               case SEC_ACE_OBJECT_PRESENT:
+               case SEC_ACE_OBJECT_TYPE_PRESENT:
                        if (GUID_equal(&object->type.type,
                                       &ext_right_apg_guid)) {
                                return True;
                        }
-               case SEC_ACE_OBJECT_INHERITED_PRESENT:
+               case SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT:
                        if (GUID_equal(&object->inherited_type.inherited_type,
                                       &ext_right_apg_guid)) {
                                return True;

diff --git a/source3/printing/printfsp.c b/source3/printing/printfsp.c
index b485711f910bd67203f80463e67c4780501c62ad..243b8ea03b7763538bcdb53427b1ca4daa624aba 100644 (file)
--- a/source3/printing/printfsp.c
+++ b/source3/printing/printfsp.c
@@ -88,7 +88,6 @@ NTSTATUS print_fsp_open(struct smb_request *req, connection_struct *conn,
 void print_fsp_end(files_struct *fsp, enum file_close_type close_type)
 {
        uint32 jobid;
-       fstring sharename;
 
        if (fsp->fh->private_options & FILE_DELETE_ON_CLOSE) {
                /*
@@ -102,7 +101,7 @@ void print_fsp_end(files_struct *fsp, enum file_close_type close_type)
                string_free(&fsp->fsp_name);
        }
 
-       if (!rap_to_pjobid(fsp->rap_print_jobid, sharename, &jobid)) {
+       if (!rap_to_pjobid(fsp->rap_print_jobid, NULL, &jobid)) {
                DEBUG(3,("print_fsp_end: Unable to convert RAP jobid %u to print jobid.\n",
                        (unsigned int)fsp->rap_print_jobid ));
                return;

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 49bd5ac8ba829cfe9143fad3b28b994d91658353..fc3667ea3a959ff5a0041ed28ab6a4d99be34d56 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -117,7 +117,9 @@ bool rap_to_pjobid(uint16 rap_jobid, fstring sharename, uint32 *pjobid)
        if ( data.dptr && data.dsize == sizeof(struct rap_jobid_key) )
        {
                struct rap_jobid_key *jinfo = (struct rap_jobid_key*)data.dptr;
-               fstrcpy( sharename, jinfo->sharename );
+               if (sharename != NULL) {
+                       fstrcpy( sharename, jinfo->sharename );
+               }
                *pjobid = jinfo->jobid;
                DEBUG(10,("rap_to_pjobid: jobid %u maps to RAP jobid %u\n",
                        (unsigned int)*pjobid, (unsigned int)rap_jobid));

diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c
index 23c96103811eb19cd77bbd01e5856d9da53cacba..91d8591a05d3dba41e98ab28b7b78e3c71a118c2 100644 (file)
--- a/source3/rpc_parse/parse_sec.c
+++ b/source3/rpc_parse/parse_sec.c
@@ -73,11 +73,11 @@ static bool sec_io_ace(const char *desc, SEC_ACE *psa, prs_struct *ps,
                if (!prs_uint32("obj_flags", ps, depth, &psa->object.object.flags))
                        return False;
 
-               if (psa->object.object.flags & SEC_ACE_OBJECT_PRESENT)
+               if (psa->object.object.flags & SEC_ACE_OBJECT_TYPE_PRESENT)
                        if (!smb_io_uuid("obj_guid", &psa->object.object.type.type, ps,depth))
                                return False;
 
-               if (psa->object.object.flags & SEC_ACE_OBJECT_INHERITED_PRESENT)
+               if (psa->object.object.flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT)
                        if (!smb_io_uuid("inh_guid", &psa->object.object.inherited_type.inherited_type, ps,depth))
                                return False;
 

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index a9a97a2d14a133759dff5f54778c2dca769b2bd5..adf664b3960301da1713a81589b8b8e75a6f9307 100644 (file)
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -256,10 +256,9 @@ ssize_t write_file(struct smb_request *req,
        int write_path = -1;
 
        if (fsp->print_file) {
-               fstring sharename;
                uint32 jobid;
 
-               if (!rap_to_pjobid(fsp->rap_print_jobid, sharename, &jobid)) {
+               if (!rap_to_pjobid(fsp->rap_print_jobid, NULL, &jobid)) {
                        DEBUG(3,("write_file: Unable to map RAP jobid %u to jobid.\n",
                                                (unsigned int)fsp->rap_print_jobid ));
                        errno = EBADF;