[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  0dac5d2... s3: Attempt to fix the build on AIX, shm_ptr seems to be 
a macro there
      from  ba74823... upgradeprovision: Fix formatting, syntax error.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0dac5d2ab362c128e184e06a73364bc48f748fd2
Author: Volker Lendecke <v...@samba.org>
Date:   Mon Mar 29 07:24:00 2010 +0200

    s3: Attempt to fix the build on AIX, shm_ptr seems to be a macro there

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/signing.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index 8365562..5370f57 100644
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -89,7 +89,7 @@ void srv_cancel_sign_response(struct smbd_server_connection 
*conn)
 
 struct smbd_shm_signing {
        size_t shm_size;
-       uint8_t *shm_ptr;
+       uint8_t *shm_pointer;
 
        /* we know the signing engine will only allocate 2 chunks */
        uint8_t *ptr1;
@@ -113,7 +113,7 @@ static void *smbd_shm_signing_alloc(TALLOC_CTX *mem_ctx, 
size_t len)
                        errno = ENOMEM;
                        return NULL;
                }
-               s->ptr1 = s->shm_ptr;
+               s->ptr1 = s->shm_pointer;
                return s->ptr1;
        }
 
@@ -124,7 +124,7 @@ static void *smbd_shm_signing_alloc(TALLOC_CTX *mem_ctx, 
size_t len)
                        errno = ENOMEM;
                        return NULL;
                }
-               s->ptr2 = s->shm_ptr + s->len1;
+               s->ptr2 = s->shm_pointer + s->len1;
                return s->ptr2;
        }
 
@@ -174,8 +174,9 @@ bool srv_init_signing(struct smbd_server_connection *conn)
                        return false;
                }
                s->shm_size = 4096;
-               s->shm_ptr = (uint8_t *)allocate_anonymous_shared(s->shm_size);
-               if (s->shm_ptr == NULL) {
+               s->shm_pointer =
+                       (uint8_t *)allocate_anonymous_shared(s->shm_size);
+               if (s->shm_pointer == NULL) {
                        talloc_free(s);
                        return false;
                }


-- 
Samba Shared Repository